Settings: Fix text box margin to proper gap
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I8e289e190485a62deeaefc841539c83776ea9940
notification drawer brightness slider 2/2
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: Ie12f85b5dbb3fd06f1fd76b2c80d2fd20574e8d7
Show a preview of the selected font size immediately

Modified the font size preference dialog to show the user the selected
font size immediately. Also split the size description and percentage on
their own lines to show a preview of two different font sizes. In
addition, removed the gigantic title bar from the dialog.

Change-Id: Ifc1e930f9420bde0bb6fd61b1a395c3d36b4fb0b
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	res/layout/preference_dialog_fontsize.xml
	res/values/cr_strings.xml
Fix up font size commit again.
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I9d9884ca694c8480fcec49b57979dd335e1ed43b
Fix FC in Settings / About / Status (Status.java) on Tablets.

Fixes FC on tablets caused by  http://review.cyanogenmod.org/#/c/49258/
because of NULL pointer exception.

Change-Id: Ie84b4372c684504e80e6c65a8f403759af983d82
Settings: Fixed force close issue when the window is shown without the action bar (tablets)

Change-Id: Id4d9be361dec60a14e7fc26a4b9b7d2906c4abe3
Fix: Blacklist menu buttons (add, prefs) were oddly squeezed when entering from CallSettings

When entered from Settings app, add and prefs button were on the bottom bar, but when entered from CallSettings, all 3 buttons were squeezed in the ActionBar at the top.

Change-Id: I92c11f85631484f61857c11f4402e9380b4c081a
Settings: LockBeforeUnlock the new way (2/2)

Due that aosp removed the whole LockBeforeUnlock controll (show slider
lockscreen before an unsecure internal lockscreen) we must try to find another way
without touching the security system itself. Long guess sort solution, lmao

here it is, next SlimBean feature

ASS->Interface->Lockscreen->Security

cheers

Patchset:
- correct strings

Change-Id: Iec178ab5ab57ac370e935e7fd4b426e83036d2bf
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	res/values/strings.xml
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/slim/LockscreenInterface.java

Conflicts:
	res/values/strings.xml
Settings: Move LockBeforeUnlock -> Secure (2/2)

not really needed because it does not touch the security system.
But imo better from consistence so I decided to move it.

Also found a duplicate in provider.Settings from first porting
merges

cheers

Change-Id: I849c07d2e54b5cf068e133aa95e9619c9cedceec

Conflicts:
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/slim/LockscreenInterface.java
Show security settings at all times.  Thanks carbon devs.
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I1217db856ce2aa04e26ac182fe747e4235296ae8
Settings: correct wallpaper custom image size to new keyguard size
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I25692543cbc5d1ef7809ec210b862eea9623df8f
remove dithering setting
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: Iddfc78ab1b251c3e85091e7e945c773febf35053
Settings: add development animation transition mode 0.75

Change-Id: Iaaeb3757ef9b3b97d66d929629e9035ab511f72a
Settings: fix NPE

if the user resumes InputMethodAndLanguage settings and
the user dictonary preference was already removed before,
the user will run into a NPE.

check it to fix it.

Change-Id: I1eac844720768bb668e26f0a572c7876b7b0bcee
Revert "Added vibration adjustments via Performance"
I thought i removed you a long time ago.

This reverts commit 4f912ca0e754a68fafbc741f3bfea8bb5d252fad.

Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	res/xml/performance_settings.xml
	src/com/android/settings/cyanogenmod/BootReceiver.java
	src/com/android/settings/cyanogenmod/PerformanceSettings.java

Change-Id: I18381d22639afc3b607257c32bc65f83fabc8a58
port statusbar brightness slider from rom control 1/2
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: Id7d3ddd7fe769a779eb1f252a09c9a9101636175
Fix custom lockscreen wallpaper
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I59ff5fa7e785919de6930dad564899ed58660b45
Update colorpicker and layout for powerwidget toggle options.
It was waaay out of date and i waited way to long to do this.

Change-Id: I5c7356a1925364d33c595660eff58df9e60d6d38
Signed-off-by: scott <scott@ubuntu.com>
Revert "Fix custom lockscreen wallpaper"

This reverts commit 2b5cff18834fe6c498d1ed61ba33fcc52bc06676.
WiFi: Fix Null Pointer Exception in Wifi Settings dialog

This patch checks that the activity remains available in the
dialog onclick callback before using it.

Change-Id: I1886b87498455e890962415a864da803c94561a4
Orig-Change-Id: I1d7aba1b43a00568dcfaf580e7082aadc12ebde5
Signed-off-by: Loic Poulain <loicx.poulain@intel.com>
Signed-off-by: Jian Luo <jian.luo@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 122149