Only show status bar blocker view if nav bar is translucent.

It's the background drawable of the translucent nav bar that makes the
blocker view necessary (as the background creates a visual 'gap' between
status bar and visual start of the nav bar), so if the nav bar isn't
translucent, there's no need for the view.

Change-Id: I684c8d24abe3d4393ae7db88fe5023aa65836164
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Keyguard: fix chopped keyguard on hdpi MSim devices

Both the CarrierText and MSimCarrierText were in the View, taking
additional space. Remove CarrierText from the view in case of MSim.

Change-Id: I803695044d06470ef9af59863ba92444e41488f5
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Improve strings

Change-Id: Ia210ee0fb04214325d26abaefed188d956e96c91
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Support for SEEK on Android

Following apis have been introduced to support
SEEK (Secure Element Evaluation Kit) on Android:
1. transmitIccLogicalChannel
2. transmitIccBasicChannel
3. openIccLogicalChannel
4. closeIccLogicalChannel
5. getLastError
6. transmitIccSimIO
7. getATR

Conflicts:
	telephony/java/com/android/internal/telephony/ITelephony.aidl

Change-Id: Idca9b47daa646902b74e37e7841d9d1506610887
MSim: Add Multi Sim support for SEEK

MSim support for the following apis has been added:
1. transmitIccLogicalChannel
2. transmitIccBasicChannel
3. openIccLogicalChannel
4. closeIccLogicalChannel
5. getLastError
6. transmitIccSimIO
7. getATR

Change-Id: I14fd1ccc08a9c89d655c7eb9f92a194c82138d3b
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
HardwareRender: reorder EGL calls for onTerminate override

In onTerminate function, perform EGL calls in optimal order:

* Clear current context
* Destroy surfaces
* Destroy context

This avoids the need to mark resources for later deletion, and
improves functionality on buggy EGL drivers.

Change-Id: I226ee531b591e85ac523dba5451f98f78849042f
bootanimation: reorder EGL calls

Reorder EGL calls to avoid marking resources for later deletion.

Before:
* Destroy surfaces
* Clear context

After:
* Clear context
* Destroy surfaces

Change-Id: I870d8e0956547555c283895e1e6e17a48f0a2500
core/Keyguard: Move CAF strings

Change-Id: Ia341e69e260f1cdd36ca0506e4285278976136fc
InputDevices: Move AOSP strings

Change-Id: Ia1c1fcf54a0024f1cb3738ddeb353fa180f14e8c
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Export missing internal resource as symbol

Change-Id: Ibfb472c25cf20d1683c1c05d18c9815135b52958
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Themes: Only process themes that are applied during boot

Currently, the PackageManagerService will process all themes and
ensure their resources are compiled and available to the system.
This is highly inefficient and can bog the system down when booting.

This patch will only process the themes that are currently applied
durring boot and lets the ThemeService take care of queuing up the
others for processing.   This reduces boot time considerably,
especially when the user has many themes installed.

Change-Id: I52168a1751ad3bfc458048dd1558ad71cc16317a
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Fix for "volume buttons change two volume steps per click" bug

This bug happens on all devices since CM9 or CM10 times.

To reproduce:
1) disable Settings/Buttons/Playback control
2) start music playback
3) turn off display
4) click on the volume buttons

When "Playback control" is enabled, the volume changes on the button up
event of short clicks only. When it is disabled, it changes on both
button down and up events. This fix cleans up the code and makes the
volume change only on button down when "Playback control" is disabled.

JIRA: CYAN-3202
Change-Id: If97218e35a8204ef602155f22b7eaaa5e13fb93c
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0