Move CAF strings

Change-Id: I5d8bbf7075d1d24391bbbf0d190a33cc097c40a6

(cherry picked from commit 693832f6097602f7a883d0f50e87b8398f2d9604)
Revert : Battery text mode (1/2)

Change-Id: I537c99827e78c796b4980ec7751e5f9b58a88251
Signed-off-by: kecinzer <kecinzer@gmail.com>

Patchset: 1
http://review.cyanogenmod.org/#/c/79710/

(cherry picked from commit 6d48ca1e0516090d47ee013dd6d504607b65b952) (reverted from commit b2700dbe1975691dbe70e9aee5d497c0acdb160b)
Battery text mode (1/2)

PS2: Make battery level more fit current solution
PS3: Fix displaing battery level inside the icon
PS6: Show battery level in status bar header when charging and percentage
     mode set to inside icon (it's replaced by charging icon)

Change-Id: I537c99827e78c796b4980ec7751e5f9b58a88251
Signed-off-by: kecinzer <kecinzer@gmail.com>
(cherry picked from commit 040721140b6dfe6a4ae5c0db7251073163f19b5d)

Conflicts:
	core/java/android/provider/Settings.java
Aproach CM in menu key remap

Menu key remap codes was already added by us in this commit: https://github.com/crdroidandroid/android_frameworks_base/commit/5c6b8b69bfc07e728bd3581166097f2133f7753c and here we're only trying to get cloests as possible with CyanogenMod codes

Based on this commit: https://github.com/CyanogenMod/android_frameworks_base/commit/10656747ca0057909d71767aff24bd5b9a0a0e7c

Again, a BIG thanks to all CM team!

(cherry picked from commit e7e65f5933610dc6a2163ec5ebcec4335229ced8)
Move hasHwKeysEnabled() and updateKeyAssignments() bellow navbar on/off detection

Based here: https://github.com/CyanogenMod/android_frameworks_base/commit/a8909012f7a78c2399f603c809a6a4e9b3dfa5c8

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

(cherry picked from commit 15e2dcfc39b8b0a7797ad960107ae79281076f6d)
Now is hasPermanentMenuKey()! And fix the build

(cherry picked from commit 9b9c54ad238f4b0bb3a28eed5d1b5bc135294654)
framework: add blacklist disconnect cause

Constant to be used when marking a Call as blacklisted.

Change-Id: If8e0ba7a2fb9b3ebbcfde04df48cd0ab14bba864
Signed-off-by: Roman Birg <roman@cyngn.com>

(cherry picked from commit c5ff674bada016c4da660c7a0db7099feff1d8da)
Update color dependent items when reusing notifications.

The notification might have changed its color setting.

Change-Id: Icf494db47b30af5505107eec2f728fb8bcba421a

(cherry picked from commit 1b7521d9907e64a143655de864c14ab31031d3e1)
Revert "SystemUI: Add data type and signal icons"

* These aren't used anywhere and are still Holo

This reverts commit 4e5e6d4cd8e56755d3e4cdaf08ede0e7ee3c82dc.

Change-Id: I39c6060766b2f75dd1362d945be31f6f9d20f59d

(cherry picked from commit d734c796f11b6d86932afc57268cd2ec42658d7a)
Status bar: Add HSPA+ icons

Forward port H+ icon in the status bar when connected to HSPA+
Uses new vector drawables by @blunden

PS1: Initial commit
PS2: New vectors (thanks @blunden)
PS3: Cleanup
PS4: Use correct indentation (oops)
PS5: Show correct icon in status bar (thanks @mikeNG)
PS6: Remove leftover Holo icons (thanks @mikeNG)
PS7: Rebase to depend on Holo icon removal (thanks @mikeNG)
PS8: Update commit message

Change-Id: Ia745c524d5e2530f50f12f961ea8533a4c8f5842

(cherry picked from commit ca318ef12b89875b3aa3386b0ca8c89a6260bead)
platform/framework/base: Fix Half Blank screen issue in Wallpaper

Issue: Start Any Full Screen Activity/ VideoView Activity in
       portrait mode, change to landscape mode and then perform
       suspend and resume. Only Half of the screen has display,
       the other half is blank screen

Fix: Added a check to update surface size on both rotation change
     and surface size change.

Change-Id: Iba77dfdb778ea3c60bbb1df33188fd4f792ab77c
CRs-Fixed: 712741

(cherry picked from commit 4c096bd84eabbae74d7d6c8387e1e2562ce31596)
Wakelock Blocker [1/2]

(cherry picked from commit 086544c341e3798b8fb381f01fa10e44cd281605)
VideoView: Add logs for video start/stop profiling

Add logs to profile video start and stop latencies.

Change-Id: Ic7f6237ee932a5c07828b1d0010dcb0fd3175411

(cherry picked from commit be613aabe03fa922f63db63e5658a8f0694d43c4)
Move media player list management to Audioservice

Move media player list management to Audioservice so that
list is retained even after BT restart.

Change-Id: Ia2455e6def1900b4af2225c50e1b5325a7ce1a98

(cherry picked from commit 79d2b7fe6101819178806a059d6c92323c044b11)
Revert "MediaMuxer: handle expection for add track"

This reverts commit 0e57858602657ccbb22d6f592831f6e2547cc4ef

Change-Id: Ia9b4969a660a9816b1698fabd5456400fca84563

(cherry picked from commit 3aafaaff4a4adb65e1c302fb90b57ed22846ccf4)
audio: fix unresolved link error for javadoc

- Remove @link comments for extended audio
  formats to fix unresolved link error while
  compiling Javadoc
- These extended audio formats are not standard
  AOSP definition and should not be updated for
  javadoc

Change-Id: I34fec0d9709a7def0f92660b6ec0a8e971529161

(cherry picked from commit 0f7840f0db84cf12e0a55a06c7d8f06f27ea4266)
Revert "camera2-legacy: Workaround max jpeg/preview size AR mismatch"

- This reverts commit a0496d34ffc5153bf933cacbd4be71a4a1bd4041,
  because it breaks CTS test cases:
  'android.hardware.camera2.cts.RecordingTest#testBasicRecording'
  and 'android.app.cts.SystemFeaturesTest#testCameraFeatures'.
- Above change causes all video sizes that doesn't match
  the largest still image aspect ratio to be threated as
  non-supported (not looking reasonable).

CRs-Fixed: 747378
Change-Id: Ib38b39e6ba575b4644cdaeb94391068845337044

(cherry picked from commit 0d057bc737730b2867fead3ab4416855d96cdf6e)