aapt: silence these warnings

to show them, set SHOW_MANIFEST_WARNING

Change-Id: I8fd3617e03ca535df1ae0ebdb3dde3a67eb2737b
Ringtone: Add support for selection of phone ringtone for SIM-2.

-Issue: "The process android.process.media has stopped" pop up is
 displayed when ringtone for SIM-2 is selected.
-Rootcause: There is no type and URI defined for SIM-2 ringtone
 in the RingtoneManager. This is leading to SQl exception when
 executing a selection query.
-Fix: Add URIs for the SIM-2 and SIM-3 ringtones. Define
 interfaces to return them to app side based on subscription ID.

CRs-Fixed: 612945
Change-Id: If68c2d008dd86d2b55d3fb7f5667bbadc238d0b3
Provider: Add multi SIM ringtone support in SettingsProvider

This change will handle multi-sim queries in
SettingsProvider.java when openFile and
openAssetFile APIs are called by other components.
Thus, it will ensure to play the correct ringtone
corresponding to the SIM.

CRs-Fixed: 661216
Change-Id: I7b22c233b9c41669c1ad948b83a7aa2c55442af1
CallLog: Support for active time in CDMA call log

Display the type(Active time/Call out time) in call log of CDMA call.

Change-Id: Icdc459b0e6aff2ae7f9d44395b6886232de16efe
Merge "aapt: silence these warnings" into kk44
Themes: Only kill launchers if overlays or icons changed

There is no need to kill the launcher for every coponent changed.
The only ones that really concern us in regards to killing launchers
are MODIFIES_OVERLAYS and MODIFIES_ICONS

Change-Id: I840b8e2ecd4b52a33f352809c5d3d2c7e92ce85e
Add ANT to the list of toggleable airplane mode radios

Adding ANT to the list of toggleable radios allows ANT to behave in the same way as Wifi or
Bluetooth in regards to operation during airplane mode: when airplane mode is turned on, ANT is
disabled, but can be re-enabled by the user at any time.

Change-Id: Idb9e9499fd7a7fccee8c459779ec86bf24e1373e
core: use 'normal' value for notification led off

Users can set this value to 250, 500, 1000, 2500 or 5000ms only,
but it's 2000ms by default.

With this patch, 'Normal' string is shown instead of 'By default'
and pulse speed goes to 1 sec.

Change-Id: Idb18ac345bd9eb1a5b795776faa60e2fb5bc258b
Use actual storage type of sdcard/usb (1/2).

Change-Id: Icaf0d246ab3bdd0614c8bb7a22f8b2b95cbe9c7e
TODO: Provide drawable for usb storage (someone please).
Fix API check derpage

Change-Id: Ib2086febae4c4f3c2caec77d8a78dcb1d0dfc978
AppOps: Add nfc enable control into AppOps

Check user permission before enabling nfc.

Change-Id: Ia84e33c299e4fdecfd66ee933d9e7d37ed29c340
AppOps: add permission check when enabing nfc

Add appops permission check for enable function.

Change-Id: Ie98be3e7b3cd9e72b0ad12cc1634d9cd1869a66c
watermark: Place watermark in the bottom-right when both deltax and deltaty are 0

The default behavior is to replicate the watermark all over the screen but this can
be too intrusive. The repetition is controlled by deltax and deltay and if they are
both 0 the watermark will actually be drawn off-screen and thus not shown.

We take advantage of this to add a special behavior when they are both 0 that simply
places them in the bottom right. This patch doesn't take UI elements into account and
may actually overlay soft-buttons and other chrome.

Change-Id: I4cff1326b8aaecdbc471eaf48e95bc2865181366
add MVNO info for tele2 in croatia
per CYAN-5178

Change-Id: I80f8bfbcf0f40abac397ddf63beaf2c0b2e46dfd
DocumentsUI: Workaround for aapt warnings

* Now we should be completely free of aapt warnings

Change-Id: I8e6886f9ac93adb19c80887a1b7329ae9b942125
Bypass the lockscreen when the hardware keyboard is slid out and security mode is 'none'

Change-Id: Ie40bb33ea46b7e68bad9916a0073cdf07a42ff93
Automatic translation import

Change-Id: I2b4ea08ab5fc2a215823ec4fe5db05ba229f671a

Conflicts:

	core/res/res/values-af/cm_strings.xml
	core/res/res/values-ar/cm_strings.xml
	core/res/res/values-de/cm_strings.xml
	core/res/res/values-es-rXA/cm_strings.xml
	core/res/res/values-fr/cm_strings.xml
	core/res/res/values-in/cm_strings.xml
	core/res/res/values-iw/cm_strings.xml
	core/res/res/values-nb/cm_strings.xml
	core/res/res/values-si/cm_strings.xml
	core/res/res/values-th/cm_strings.xml
	core/res/res/values-tr/cm_strings.xml
	core/res/res/values-zh-rHK/cm_strings.xml
	packages/DocumentsUI/res/values-ku/strings.xml
	packages/Keyguard/res/values-af/cm_strings.xml
	packages/Keyguard/res/values-es/cm_strings.xml
	packages/Keyguard/res/values-pl/cm_strings.xml
	packages/Keyguard/res/values-tr/cm_strings.xml
	packages/Keyguard/res/values-zh-rHK/cm_strings.xml
	packages/Shell/res/values-fr/cm_strings.xml
Fix heads up tile click action.

Change-Id: I0afe7a293b8deaf1da21d74ce38fca5b3e64669e

Conflicts:

	packages/SystemUI/src/com/android/systemui/quicksettings/HeadsUpTile.java
msim_status_bar.xml: now with left+center clock views

Change-Id: Iac2949546129d76c154eec8976e5fb232f6f9401
Not sure why this view is being found as a RelativeLayout... but it doesn't need to be an ImageView in this java code.

Change-Id: I2de561d951efeadde20e7d58d0d4beba116155f2