Redo Navi Dimensions
Protected Apps: Show state by component instead of by app

Change-Id: Idbe1d69b376fc3f42980404d9448152f606e7f8e
(cherry picked from commit 56e11c8640cb9e34d07eb11fb1b67f3283b2f6f6)
Protected Apps: Increase hit target of the launch app button

Change-Id: I38355aca37079d43975d287ee9d81c3a500c3575
(cherry picked from commit 47e8e46f53cdf4f536845d57cc383d3c5f0ca893)
Feature : Volume adjust sound preference 2/2

This patch allows the users to choose if they want the audible tone when adjusting the volume

Change-Id: I6d43cba83bf4cf10f2d50502e7cee5408a73c520
Bring battery text options inline with Cm
Forward port battery icon option [2/2]

Bring forward the various battery icon options.

Still retains new options for where to show battery percentage text.

Change-Id: I75b3d9f4ba4b4206d2be5f2cd24ceceeae3234fc

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/cyanogenmod/StatusBarSettings.java
su: Remove the superuser app

This removes the superuser app, root access will be controlled through
appops switches on a per-app basis.

Change-Id: I46d1a1c89c7e0aefe136ce82c6c350684b9b7293

Conflicts:
	proguard.flags
su: Add Root access app-ops control

Adds an app-ops option for root access.

Platform-signed apps weren't previously being listed but there are some
that use root access (FileManager comes to mind).

So we list all of them, but for platform-signed apps we only show the
root toggle and none of the permission-based ones.

Change-Id: Ie716974156d55eb66061e78dc39505569e5bdc2a
Bluetooth: GAP: Handled scan mode during first time BT On

As the discoverability time out concept changed as per the
new design and this code snippet "setting scan mode to
connectable only when endtimestamp is null" is not
applicable.DUT remains in only connectable mode
if user remains in the settings menu.

Change-Id: I7aa2ea7d23c4a47f716e2c0645b2ad73018ada39
CRs-fixed: 714578
Bluetooth: Don't Initiate Connection if UUID not updated

 - if UUIDs are not updated don't initiate profile connection
 - add new profiles to already existing list
 -  don't delete profiles from the existing list

CRs-Fixed: 717840

Change-Id: Id71a5aad59f4004c262f3ad17f34fa0574654170
Bluetooth: Enable Page and Inquiry Scan.

When Bluetooth Setting is in foreground enable both
Page Scan and Inquiry Scan.
Changes made to make device both in connectable and
discoverable if user is in Bluetooth setting menu.
CRs-Fixed: 753990

Change-Id: I2d72ce3192f6b7fa9eb6beb5a175a3e732dac5a8
Bluetooth: GAP: Reset Alias name during virtual unplug

As per this fix Alias name get resetted when hid virtual
unplug initiated from HID device.

Change-Id: Idb1cba447072fd70c21cfecef8776b2baaf730bc
CRs-Fixed: 754689
Bluetooth: Refresh UI after checkbox is Unchecked.

 - Refresh list of auto-connectible profiles when
   Checkbox is unchecked in disconnected state.

Change-Id: Iddca04cbb06262556ea7decb39279df26e358eb6
CRs-Fixed: 758480
Bluetooth: Security: Add Null check during pairing cancel intent.

Added null check, so before posing event we can restrict events,
if cached device list is empty

Change-Id: I458d181abe5eec2497b80b1713ddbc3502b79786
CRs-Fixed: 546364
(cherry picked from commit 7d7222c3e5c1054b4e2f3e59cc40cb182a72b040)
(cherry picked from commit 8ce523155dd030d82c32cf502d317023b017645b)
(cherry picked from commit 938686e749bca911e5f63150223116d1c381da8e)
Bluetooth: GAP: Handled Null pointer deference in unregisterReceiver

Handled Null pointer deference in unregisterReceiver event of
pairing dialog

Change-Id: Ie0d0561cb3c0f09a018e1aeb20579700c6e8d783
CRs-fixed: 761872
Bluetooth: Add Manifest configure to fix settings crash issue.

Settings is crashed when press back key after rotating screen when
Bluetooth profile activity is opened. Add manifest configure to
enable screen orientation feature.

Change-Id: I4550b18383d817d1a2f46fbeebda8a3bdab580c6
CRs-Fixed: 762437
Revert "su: Add Root access app-ops control"

This reverts commit d0335cf85486cfed7a0ad1f547b58be87c326646.
Revert "su: Remove the superuser app"

This reverts commit 85440930fb0702bcc362b04d93a867a8c1cce95d.

Conflicts:
	proguard.flags
Settings: remove misplaced "Filter Notif" setting under Battery Saver

Change-Id: I01642425595d8216066a7761cdf6b8885fbed9e5
Code Clean up from CM