Revert "Add: Navi Bar Custom Height"

This reverts commit 7b5ee39db673e7ed173a81576c05aa0af6ae2eaf.

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Rework Navibar
frameworks: fix make updateapi for weather setting

Change-Id: I3a23cd432138e63e037b427ceaf62a87627dfde6
Signed-off-by: Roman Birg <roman@cyngn.com>
Forward port Samsung STK support (frameworks/base)

[pawitp: port to Lollipop]

Change-Id: I08d169bc466df290fca838b09f6b0fbea2ac82a8
Feature : Volume adjust sound preference 1/2

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

The new preference is in
Settings | Sound
    Volume adjust sound
        Play sound when adjusting volume with hard keys
The Checkbox is defaulted to ON (1 in defaults.xml)

Look for 2/2 for the Settings, Sound Panel Change

[mikeioannina]: Update for L

Change-Id: I705c23065706317760ba60efc1a71f3ba6082bbd
Forward port battery icon options [1/2]
And Bring previous battery code inline with Cm

Bring forward the various battery icon options.
Portrait, Landscape, Circle, Text.

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

Change-Id: Icfc14d989eebde9014538291c24aa76d328df234

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/BatteryLevelTextView.java
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
SystemUI: Update WiFi indicator drawable sizes

Resize both the activity arrows and the signal strength indicators so
that both are properly centered and overlay correctly for all screen
densities.

Change-Id: I7e95adcdc110995504534a58eb0df42ba132bc97
Good ol PPP
Bluetooth-Wipower: Enable dynamic logging for A4WP

This helps to enable wipower dynamic parameters intercepted
at host to be logged via adb/command line.

Change-Id: Ibd79f4d56c99a43eab1146f4ae20155ac439cd8f
CRs=fixed: 754356
Bluetooth: Adds check to verify Bluetooth adapter state

This checks whether bluetooth is turned ON or not in BLE
start scan process.BLE scan apis are called from applications
so need to check if BT adapter state is ON to avoid Bluetooth
crash

CRs-fixed: 649274
Change-Id: Ic075e1560bba2cabbfac2e1477932f9ad3144067
Bluetooth: Change userhandle to current from ALL

Change to a user handle to indicate the current
user of the device instead of ALL to avoid the
force close error in bluetooth.

Change-Id: I72e5feba6616a48ef8590b6965ec1d94f27b7dca
CRs-fixed: 742926
Bluetooth: Enforce BT state check during GATT close/disconnect

Enforce BT state check when BLE Apps call into GATT to handle scenarios in which
delayed call from BLE App to disconnect/close comes after the BT is OFF

CRs-Fixed: 759852
Change-Id: Iaf7004cdd4fe52e64c48838f6ed918e1d25f5a1e
Bluetooth: Sync Bluetooth Adapter and Manager Service.

BluetoothAdapter has timeout of 8 sec whereas waittime of
Bluetooth Manager Service has timeout of 3 seconds, case
if remote does not responds to service level  disconnection
then Mangaer Service times out after 3 sec.
During multiuser switch new process is created hence
previous process cannot block ON thus one process is waiting
for timout and other process tries to Turn BT ON leading to
crash.
Fix involve is to have Adapter and Manager service
have same timeout during user switch.

CRs-Fixed: 761698

Change-Id: Ib1590fb2a41f748f36c58ae9ca8916cf68befc82
Correct the lockscreen carrier text alignment and text color

In AOSP the text is left aligned, not centered, and the text color is white, not grey

Change-Id: Ie9c77761d3440336ae57abed24c8403bda06be3e
5.0.2 time
Candy5 is upgrading
3am dreps
Adding back pdf_printer_media_sizes for values-zh-rCN to accomodate mediasize_default

Change-Id: I45cfd8babe813fa5dba49bb444e10517a3771f30
SystemUI: fix battery icon patch for MSim

Change-Id: Ia3437069de3faeb0cc922b756e4c1db85e2a2524
SystemUI: fix MediaProjection cast crash

Clicking on the "cast" icon of an app using the MediaProjection API will
crash as the code assume that it is a device.

java.lang.ClassCastException: android.media.projection.MediaProjectionInfo cannot be cast to android.media.MediaRouter$RouteInfo
	at com.android.systemui.statusbar.policy.CastControllerImpl.startCasting(CastControllerImpl.java:177)
	at com.android.systemui.qs.tiles.CastTile$CastDetailAdapter.onDetailItemClick(CastTile.java:237)
	at com.android.systemui.qs.QSDetailItems$1.onClick(QSDetailItems.java:177)
	at android.view.View.performClick(View.java:4756)
	at android.view.View$PerformClick.run(View.java:19749)
	at android.os.Handler.handleCallback(Handler.java:739)
	at android.os.Handler.dispatchMessage(Handler.java:95)
	at android.os.Looper.loop(Looper.java:135)
	at android.app.ActivityThread.main(ActivityThread.java:5221)
	at java.lang.reflect.Method.invoke(Native Method)
	at java.lang.reflect.Method.invoke(Method.java:372)
	at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:898)
	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:693)

Change-Id: Icfdf745c03da7bd1bbb228e06005f55324c1b8fa