Merge kitkat-remix into kitkat-legacy to add the features of
remix and keep features & stuff necessary to -legacy (aka
non-nexus
devices)

Conflicts:
	core/java/android/inputmethodservice/InputMethodService.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/res/res/drawable-hdpi/scrubber_control_disabled_holo.png
	core/res/res/drawable-hdpi/scrubber_control_focused_holo.png
	core/res/res/drawable-hdpi/scrubber_control_normal_holo.png
	core/res/res/drawable-hdpi/scrubber_control_pressed_holo.png
	core/res/res/drawable-hdpi/scrubber_primary_holo.9.png
	core/res/res/drawable-hdpi/scrubber_secondary_holo.9.png
	core/res/res/drawable-mdpi/scrubber_control_disabled_holo.png
	core/res/res/drawable-mdpi/scrubber_control_focused_holo.png
	core/res/res/drawable-mdpi/scrubber_control_normal_holo.png
	core/res/res/drawable-mdpi/scrubber_control_pressed_holo.png
	core/res/res/drawable-mdpi/scrubber_primary_holo.9.png
	core/res/res/drawable-mdpi/scrubber_secondary_holo.9.png
	core/res/res/drawable-xhdpi/scrubber_control_disabled_holo.png
	core/res/res/drawable-xhdpi/scrubber_control_focused_holo.png
	core/res/res/drawable-xhdpi/scrubber_control_normal_holo.png
	core/res/res/drawable-xhdpi/scrubber_control_pressed_holo.png
	core/res/res/drawable-xhdpi/scrubber_primary_holo.9.png
	core/res/res/drawable-xhdpi/scrubber_secondary_holo.9.png
	core/res/res/drawable-xxhdpi/scrubber_control_disabled_holo.png
	core/res/res/drawable-xxhdpi/scrubber_control_focused_holo.png
	core/res/res/drawable-xxhdpi/scrubber_control_normal_holo.png
	core/res/res/drawable-xxhdpi/scrubber_control_pressed_holo.png
	core/res/res/drawable-xxhdpi/scrubber_primary_holo.9.png
	core/res/res/drawable-xxhdpi/scrubber_secondary_holo.9.png
	core/res/res/values-mcc260-mnc06/config.xml
	core/res/res/values/config.xml
	core/res/res/values/pa_strings.xml
	core/res/res/values/symbols.xml
	libs/hwui/OpenGLRenderer.cpp
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
	packages/SystemUI/res/layout-land/status_bar_recent_panel.xml
	packages/SystemUI/res/layout/status_bar_recent_panel.xml
	packages/SystemUI/res/values/pa_strings.xml
	packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
	packages/SystemUI/src/com/android/systemui/settings/BrightnessDialog.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/BatteryService.java
	services/java/com/android/server/NetworkManagementService.java
	services/java/com/android/server/power/DisplayPowerController.java
	services/java/com/android/server/power/DisplayPowerRequest.java
	services/java/com/android/server/power/PowerManagerService.java
	services/java/com/android/server/usb/UsbDeviceManager.java
	services/java/com/android/server/wifi/WifiService.java
	telephony/java/android/telephony/SignalStrength.java
fix build issues

Change-Id: I350968be2ae7068ad4323cdbaaed7a0112d8e4b6
fix build 1/2

Change-Id: I80f8ecc8ac8612d36fa0848f83a09ecf56368477
LED: Simplify logic

Removed settings observer for enabling custom led settings.

Change-Id: Ic5dfec96696ad5d2f7247b4a04a2df584dd35454
ZygoteInit: increase GC threshold amount when preloading to postpone GC

Patch Set 2: Hardcode it better to 1MB.

Change-Id: I7a6e195b82ebe2f4bd5bbb506e19200d452fa3e5
Revert "Fix a bootloop problem when /data/system/usagestats/usage-history.xml is empty."

This reverts commit e6c123adfd52165d53f468eecf24f8ec3db897bf.
Fix broken XML parsing idiom.

Code that expected a single top level element in an XML file
was doing something like :

while (type != START_TAG) { next(); }

This would loop forever when the XML being parsed was empty,
where each call to XmlPullParser.next() would return END_DOCUMENT.

bug: https://code.google.com/p/android/issues/detail?id=64173
Change-Id: I7543203e976a8999ae471a6c2d629249a87011bb
XmlUtils#readThisMapXml should handle null keys.

Both readThisValueXml & writeThisValueXml have been
implemented to handle values with "null" names.

Change readThisMapXml to allow such names as well, and
map them to the null key in the resulting HashMap.
readThisListXml and readThisSetXml already support
null names.

bug: https://code.google.com/p/android/issues/detail?id=63463

Change-Id: I1c93976656e45e7733113eb67d29b6bad5d25f1f
p2p: Display P2P peer MAC address if device name is empty.

Display MAC address of a P2P peer in an invitation prompt
message on receiving invitation request from the P2P peer
with empty device name.

Change-Id: Icabeb91d666437746eb5a733ec582849eb7295a5
CRs-Fixed: 506109
Add touch feedback to the clear all recents button

5 minutes of Photoshop™.

Change-Id: Idf8c97cf08a192605208cbee6f2ae41e0798e8d1
Show confirmation for deleted screenshot.

Change-Id: I4a36cf06bf252e5e15fe08fbd054dc64a0a507ae
Revert "Remove the navigation camera icon in keyguard if disabled by DPM"

This reverts commit 6eef309ae2e85e96f276b18a4f989f2086e2cf9c. The camera
widget itself not showing is a bug with the lock screen. The navigation
icon should be displayed.

Change-Id: If6edf7e70f48a1b272d336e9a9245095af10b38f
Fix fatal exception due to missing looper for current thread.

While creating handler for the thread, there was fatal exception getting
thrown because the present thread does not have a looper. So passing the
applications looper to be used , while creating the handler to avoid this
exception.

Change-Id: Id2e3ed61f5691c8319eb7bc20ad970eb6758e765
(cherry picked from commit f5d1769b4357fb8d86fc31f7115b55b567a20ed1)
(cherry picked from commit d0a7c5833b90fe4d8fe8f968b53a7028720ffd8c)
Forward Port: Hide USB Debugging Icon
PS2: code style, now on the fly
Change-Id: I459b6172540ad1f9f74289dcbe61abaf417c1b30

Change-Id: I459b6172540ad1f9f74289dcbe61abaf417c1b30

Conflicts:
	services/java/com/android/server/usb/UsbDeviceManager.java
Revert "Telephony: Add getLteOnGsmMode() method (1/2)"

This reverts commit 048cba9b23b0e253f8aa38e6588aa39e330da15c.
Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat
TelephonyManager: isSmsCapable: respect telephony properties

The 2 telephony properties override if SMS send/receive is enabled
in the telephony code. Also respect them for the isSmsCapable API.

Use case: Acer A700/701 (Wi-Fi only/3G) share the same build

Change-Id: Iaa1b45c62fa5a48a4c4a222d5e47980dd1678d48
Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat

Change-Id: Ic0d0fdfcf2de1db41486ca24d6c38bf7969f81d8
base: added national roaming info for Tuenti Movil in Spain

Users of Tuenti Movil in Spain (MCC 214 MNC 05) can roam on Movistar (MCC
214 MNC 07).

Change-Id: Idbb13525d01198f425dc1bff16f5ace5037e7bf5
core: added national roaming info for Bob in Austria.

Users of Bob in Austria(MCC 232 MNC 11)
  can roam on A1 Austria (MNC 01)

Change-Id: I12dfa3d63643af1026dcfea28a4c9d7acec5f9e9