Quick settings quick pull down: use a simple list summary

Conflicts:
	res/values/ras_strings.xml
[2/2] settings: expandable volume panel and tweaks

Setting to disable volume adjust sounds (VOLUME_ADJUST_SOUNDS_ENABLED)
This is so annoying :)

Enhanced dialog to add checkbox for unlinking ringer and
notification volume (VOLUME_LINK_NOTIFICATION)

EDIT:
No idea why google changed the order
Media is now above ringer but in volume panel
its different. So which one to change? :)

Change-Id: Ia30bbb1c2f44d0c21cd08748bd552685810f960f

Conflicts:
	res/values/pa_strings.xml
	src/com/android/settings/SoundSettings.java
Move volume adjust sound option to more native place (2/2).

Our new UX concept includes saving more settings headers possible.
Move this into Volumes settings fragment. Also update description string.

PS2: Update description string.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>

Change-Id: I6243e27582dd0099da4b3b12b30a4e5cb8247dac

Conflicts:
	res/values/pa_strings.xml
	src/com/android/settings/SoundSettings.java
Allow changing theme to Holo.Light without crashing

Themes that attempt to change the settings theme's parent to
Holo.Light will end up crashing wifi settings.

Themers should override Theme.Settings.Base and leave Theme.Settings.Holo
alone.  Attempting to theme Theme.Settings.Holo will result in crashes
when accessing wifi settings.

This was patch was adapted from
https://github.com/tung91/android_packages_apps_Settings/commit/007f03b559c6d13115c63c4f601ebc4b9324d32d

Change-Id: I61951b892acac6304d2c3dd02668eb70af93eef9

Conflicts:
	res/values/themes.xml
Audio: make safe headset volume user configurable

Conflicts:
	res/values/ras_strings.xml
	res/xml/volume_rocker_settings.xml
	src/com/android/settings/simpleaosp/VolumeRocker.java
notification light clean up

Credits:@Altaf-Mahdi

Revert "Add back notification light settings."

This reverts commit 2d6bc93cb5f72086f5a1b60a159aa2aa5e989c8f

Revert " Fix: app icon sizes in notification lights "

This reverts commit 42d02a7e05ea8519d3491733d0d5265801a813da
Arranging Display Settings

Adding 'moresettings' Preference

Adding Lockscreen Settings

cleanup
Cleanup

Merge all Strings & Arrays in 1 file
[2/2] Prepare NotificationManagerService for new format

* Needed for blacklisting

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
PEEK [2/2]

Peek Checkbox had some issues..Settings were not sticking & kept on reverting back to default Settings...
Made some modification in original code to fix the checkbox problem
All working fine now..

Conflicts:
	res/values/ras_strings.xml
	res/xml/lockscreen_settings.xml
	src/com/android/settings/simpleaosp/LockscreenSettings.java
Apps: Add blacklist interface [2/2]

Now with 100% more hidden checkboxes

Signed-off-by: Evan Anderson <evan@thelinuxman.us>
Change-Id: Ied375cfe2ff6494c25acb9d80b19e824daed755d

Conflicts:
	res/values/pa_strings.xml

Conflicts:
	res/values/ras_strings.xml
HOVER [2/2]

Check framework commit for description. Needs our blacklist interface,
a similar implement or a removal of blacklist interface.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>

Conflicts:
	res/values/pa_strings.xml

Conflicts:
	res/values/ras_strings.xml
Allow disabling the IME selector notification (2/2)

Credit CM

Signed-off-by: Ricky Salinas <rsalinas1@mail.usf.edu>

Conflicts:
	res/values/pa_strings.xml

Conflicts:
	res/values/ras_strings.xml
[2/2] Add support for Peek app

Disable built in peek when Peek app is installed. Enable it again on app's unistall.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Conflicts:
	src/com/android/settings/DisplaySettings.java

Conflicts:
	src/com/android/settings/rascarlo/LockscreenSettings.java
Fix the icon size in app lists.

E.g. the "Select app" dialog in the profile group configuration uses
this layout to inflate the list dialog. However app icons can have
non-standard sizes so we enforce a consistent width and height.

Change-Id: I71731a9bb3548c699cc2e0e600a5ff371ceacbc3
Bleed keyguard widget picker list into translucent bars
Move Themes header to Personal Category and cleanup
Cleanup old TC cruft
settings: Enable location mode header switch

Change-Id: I347e769351bc15daa87d3b6d684afe4e80416ecc
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:
	src/com/android/settings/Settings.java
Settings : Switch state fix

Since the switch views are shared, we need to recreate them
in order to prevent from being reused as they don't share state.

Change-Id: I4d7038f37883e1791c8c2b0009f0adb85ebb2b88