Nav Bar + Nav Bar Height

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml
	res/xml/system_settings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/cyanogenmod/SystemSettings.java

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/cyanogenmod/SystemSettings.java
Nav Bar Width in landscape (realtime change)

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml
Add temasek version

Conflicts:

	res/values/strings.xml
	src/com/android/settings/DeviceInfoSettings.java
Fix nav bar
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Move navigation bar to proper location
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Battery Bar + colorpicker

- battery bar collor
- battery bar tickness
- baterry bar style
- battery bar animate

Change-Id: Id28fc9f66adc4d3b6fdf12d669e43025f7ff74c1

Conflicts:

	res/values/cm_strings.xml
Dual panel for settings (2/2)

Change-Id: Icbfbd4a713592a3be9d5afff5a38fb07f6b8f2cf

Conflicts:

	src/com/android/settings/DisplaySettings.java
Advanced reboot enabled by default (1/2)

Change-Id: Ie8ab34ecc532d14d296e33fa568e6cf3ebc681e8
Settings: Notification Drawer Brightness Slider - (2/2)
Patchset 2:
- add category
- add summary
- change title

Patchset 3:
- clean up

Patchset 4:
- if you do a translatable array you should link it to strings.xml ;)

cheers

Change-Id: I3e466d4df26ec82c761c89aac9aa04b22e05fc0c

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/notification_drawer.xml
	src/com/android/settings/cyanogenmod/NotificationDrawer.java
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
Settings: Network speed indicator (2/2)
Originally Authored by : htchoi1995

- Default OFF

Conflicts:

	res/values/cm_strings.xml
	res/xml/status_bar.xml
	src/com/android/settings/cyanogenmod/StatusBar.java
Statusbar Network Indicator custom colors (2/2)

- Reset button to stock color working

Change-Id: I11737ae68aba59c6cf2ee239acd297c103bd46d1

Conflicts:

	AndroidManifest.xml
	res/values/cm_strings.xml
	res/xml/status_bar.xml

Conflicts:

	AndroidManifest.xml
Add missing packages
[Settings] Add clock styles and Clock color picker (2/2)
This commit is a combination of CM AOKP and SLIMROMS work

features:

- Clock and date enable/disable
- Clock and date position
- AM/PM styles multilang support
- Fully customizable date in style and format
- Fully dynamic settings

Change-Id: If4d648d2af182ea7d13f4757433564e1b2ab6a50

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/status_bar.xml
	src/com/android/settings/cyanogenmod/StatusBar.java
Settings: add reset option to clock color and cleanup (1/2)
to be consistent. So we have now on all places with colorpicker
same logic + option per menu to reset color to default.

as well some cleanup and codestyle corrections

cheers

Change-Id: If4156c57420a3a72b3eb0f01cf8441ccc7bf1eeb

Conflicts:

	src/com/android/settings/cyanogenmod/StatusBarClockStyle.java
	src/com/android/settings/cyanogenmod/StatusBarStyle.java
Status bar Auto-Hide [2/2]
Add an option to auto-hide status bar when there are no
notifications.

PS 2 : Reorder a bit

Conflicts:

	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/StatusBar.java