Peek: Add zh-rCN Translation

Change-Id: I4c09b099e2f692b105e712515246db6e53573f7b
Fix F/C in TTS settings

This is an attempt to fix uncaught MissingResourceException
that would be thrown if default language of selected engine is
set to a locale that has no 3-letter country/language code.

Please see https://code.google.com/p/android/issues/detail?id=63122

Change-Id: Iccb2a55f5f7a97819310fd888559650fe7febe4a
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
Signed-off-by: houst0nn <houstonn@gmail.com>
Updated czech translation
 Settings: Adding Peek FR translation

Change-Id: Icbe0b97a2378cc708f92fe678dc4c802909e6e30
Settings: Update IT Translation

Change-Id: Icacf4b236322253fe78b43aeed6213a0597bed8c
Catalan translations

Change-Id: Icef593010861adc0c02c8d08e01246e487dfc86c
add IME selector notification zh-rCN translation

Change-Id: I87832f17a18bcc7400513329fcd66fb8b9754b53
Settings: ES Translations

Change-Id: I9bcf7a84828c71a433b5e83fe0e92bb2d357a816
Signed-off-by: AlvaroOrduna <alvaro.orduna.92@gmail.com>
Data traffic details: use proper string for System UID

Android System ≠ Android OS (second is a "kernel" process).
Mind the numbers:
http://goo.gl/YnFvHa (actual "system" process)
http://goo.gl/XwoISO ("system" process displayed as "kernel")
http://goo.gl/sJ9yMi ("kernel" process with different traffic data)

Depends on http://review.cyanogenmod.org/63190

Change-Id: I6f6662b7adaee069ec5f29c6926b8fbce796917d
Display BTH connected status correctly

This patch removes incorrect condition.
(to not use LocalBluetoothProfile#isPreferred())
This condition uses the priority that already disconnected profile,
so this codition always returns false.

To verify this issue:
1. Turn on Bluetooth.
2. Pair and connect to BTH(A2DP/HFP)
3. The display now says "Connected"
3. Disconnect HFP profile
4. The display still says "Connected" but it should say "Connected (no phone)"

Change-Id: I9e2bfa6d23bf1be7587c9556b4b05459d02c4817
Settings: check if NfcAdapter is null

according to the javadoc, getDefaultAdapter(Context) can return null, if
no NFC adapter exists.

check if adapter is null before trying to call isEnabled

Change-Id: I7ff5488cc3b53ce9785c3e46effcf29dc31fe0ef
Settings: Add default value for display color control (2/2)

Change-Id: I50b684abe504c21ef49492f99b18873d75509697
Battery style: Change option's icon.

Thanks to Lo Hout for the drawables.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Settings: remove AppOps Operations Tabs

Remove tab from AppOps since it only has one category now.

Change-Id: Idd5e0160eb14754469b9583b793c517c4e47775f
Merge remote-tracking branch 'PA/kitkat' into legacy-staging

Conflicts:
	src/com/android/settings/Settings.java
Setup Remix Settings
Merge "Settings: remove AppOps Operations Tabs" into kitkat
Merge "Fix F/C in TTS settings" into kitkat
Merge "Battery style: Change option's icon." into kitkat
Settings: Superuser: Add root access options to dev/settings

PS2: remove dupe entries

Change-Id: Ib3b77941a4971b79af4c9e0b8b989c60d3bfd4e8
Signed-off-by: houst0nn <houstonn@gmail.com>