first, dont merge yet please, let me finish
done, you can merge now, thanks :)
Fix
Settings: add quick pulldown listpreference

Conflicts:
	res/values/strings.xml
	src/com/android/settings/simpleaosp/StatusBarSettings.java

Conflicts:
	src/com/android/settings/simpleaosp/StatusBarSettings.java
Forward Port: Volume button seek on screen off [2/2]

Change-Id: I788fc4cfbb688d99de241991821ebf7e277d19ad

Conflicts:
	res/values/slim_strings.xml
	res/xml/simple_sound_settings.xml
	src/com/android/settings/simpleaosp/SoundSettings.java
Quick pulldown: Only show this option with secured lockscreen
Settings: StatusBar Ticker (2/2)

PS: MIspeeliings.

Change-Id: I02cf9192c3ba62111a41e7da52cf4c343a589392

Conflicts:
	res/values/slim_strings.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/slim/StatusBar.java
settings: Forward-port notification counters

* Port from CM11

Change-Id: Ie19a6184b1d59676774937084a830ef4c7e8426f
Battery text mode (2/2)

PS5: More configuration
PS7: Rebased and changed topic

Change-Id: I13bdf2236811f535b0ac324b5b78c0ab12f365a6
Signed-off-by: kecinzer <kecinzer@gmail.com>

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/cyanogenmod/StatusBarSettings.java

Conflicts:
	src/com/android/settings/simpleaosp/StatusBarSettings.java
ListPreference before switches
String cleanup
settings: Quick unlock controll 1/2

Change-Id: I5b34368a35ab5541b57189e44c28c5903e638778
Settings: Security: implement a pin keypad shuffler [2/2]

this is to further prevent people using the tablet guessing your pin based on fingerprints left on the screen
example of the expected outcome - https://www.dropbox.com/sh/r3xb2q53ksaqni9/Oz1Eu8Dm7O

PatchSet:
- fix checkbox was wrong assigned
- enable only for PIN Password lock
- small cleanup of old code

PatchSet:
- cleanup

PatchSet:
- add modes.....disabled/always/on request

Change-Id: I225af5654c440aa16964df3257130febec6ef275
Settings: Switch needs an setOnPreferenceChangeListener

So today is derp day....another 4am morning fix.

Will stop today for sure.

Sorry again

Change-Id: I04eea381a2930995ef0f8820c0f251bc40df4820
fixed

thanks mahdi :)
Statusbar settings cleanup
Private SwitchPreference
Merge pull request #1 from toyr99/patch-1

first, dont merge yet please, let me finish
Setting: Statusbar brightness rework

Conflicts:
	res/values/strings.xml
	src/com/android/settings/simpleaosp/StatusBarSettings.java
Merge branch 'L' into L-test

Conflicts:
	src/com/android/settings/simpleaosp/StatusBarSettings.java