diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dc5c36b4f7d..5cdd7925147 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -360,17 +360,20 @@
             </intent-filter>
         </activity-alias>
 
-        <activity android:name="ApnSettings"
+        <activity android:name="Settings$ApnSettingsActivity"
                 android:label="@string/apn_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:launchMode="singleTask"
-                android:parentActivityName="Settings$WirelessSettingsActivity">
+                android:parentActivityName="Settings$WirelessSettingsActivity"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APN_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.ApnSettings" />
         </activity>
 
         <activity android:name="Settings$BluetoothSettingsActivity"
@@ -1215,8 +1218,9 @@
         <activity android:name=".deviceinfo.MiscFilesHandler"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"/>
 
-        <activity android:name="ApnEditor"
-                android:label="@string/apn_edit">
+        <activity android:name="Settings$ApnEditorActivity"
+                android:label="@string/apn_edit"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.EDIT" />
@@ -1229,6 +1233,8 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.dir/telephony-carrier" />
             </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.ApnEditor" />
         </activity>
 
         <activity android:name="MediaFormat" android:label="@string/media_format_title">
@@ -1700,6 +1706,8 @@
                 android:excludeFromRecents="true"
                 android:theme="@*android:style/Theme.Holo.Dialog.Alert" />
 
+        <activity android:name=".ApnEditor" />
+
          <!-- "Blacklist settings" UI, used only on voice-capable phone devices. -->
         <activity android:name="Settings$BlacklistSettingsActivity"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
@@ -1730,9 +1738,22 @@
                 android:value="com.android.settings.slim.QuietHours" />
         </activity>
 
+        <!-- Pseudo-activity used to provide an intent-filter entry point to quick tiles settings -->
+        <activity android:name="Settings$QuickSettingsTilesSettingsActivity"
+                android:label="@string/tile_picker_title"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.slim.quicksettings.QuickSettingsTiles" />
+        </activity>
+
         <!-- Pseudo-activity used to provide an intent-filter entry point to battery icon settings -->
         <activity android:name="Settings$BatteryIconStyleSettingsActivity"
-                android:label="@string/quiet_hours_title"
+                android:label="@string/battery_icon_title"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">
             <intent-filter>
@@ -1745,7 +1766,7 @@
 
         <!-- Pseudo-activity used to provide an intent-filter entry point to rotation settings -->
         <activity android:name="Settings$DisplayRotationSettingsActivity"
-                android:label="@string/quiet_hours_title"
+                android:label="@string/display_rotation_title"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">
             <intent-filter>
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png
index be5394d84c9..f0e28b993d8 100644
Binary files a/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png and b/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png
index 06d16740780..d23f042859e 100644
Binary files a/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png and b/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png
index 20c5e10cb77..9ea1dbacf38 100644
Binary files a/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png and b/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png
index 4f05e36b332..83b890530fe 100644
Binary files a/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png and b/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png
index c4849ff4ee2..2cd54f629ff 100644
Binary files a/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png and b/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png
index e8975cd4c42..00a54147b10 100644
Binary files a/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png and b/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png
index 64aed4f14ed..e89fa8e4c5d 100644
Binary files a/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png and b/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png
index 2b64ac04540..a99dcd7ca1b 100644
Binary files a/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png and b/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png
index 62ac4bb0fe6..de86b679ce1 100644
Binary files a/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png and b/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png
index 14c36d5e9e0..27573361a24 100644
Binary files a/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png and b/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png
index a67d43fab92..745b5ef2056 100644
Binary files a/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png and b/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png
index 6a98bad1d63..383a31a466f 100644
Binary files a/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png and b/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png differ
diff --git a/res/drawable-nodpi/preview.png b/res/drawable-nodpi/preview.png
index 0ffb70079ba..cd7d0067399 100644
Binary files a/res/drawable-nodpi/preview.png and b/res/drawable-nodpi/preview.png differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png
index b117df69ee8..6078b314f56 100644
Binary files a/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png and b/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png
index 421c4e2bb4c..1319b6f288a 100644
Binary files a/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png and b/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png
index 220ac66e829..fe8aa8bcdba 100644
Binary files a/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png and b/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png
index c764f4bb821..b945ced8f6d 100644
Binary files a/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png and b/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png
index 6bbc2aad95e..49a3428b418 100644
Binary files a/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png and b/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png
index dc66839c223..8507f5bdd5c 100644
Binary files a/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png and b/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png differ
diff --git a/res/drawable-xxhdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-xxhdpi/appwidget_settings_ind_on_c_holo.9.png
index a9114dcfb5a..b478464a6e4 100644
Binary files a/res/drawable-xxhdpi/appwidget_settings_ind_on_c_holo.9.png and b/res/drawable-xxhdpi/appwidget_settings_ind_on_c_holo.9.png differ
diff --git a/res/drawable-xxhdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-xxhdpi/appwidget_settings_ind_on_l_holo.9.png
index c23c095aec6..375cd842eaa 100644
Binary files a/res/drawable-xxhdpi/appwidget_settings_ind_on_l_holo.9.png and b/res/drawable-xxhdpi/appwidget_settings_ind_on_l_holo.9.png differ
diff --git a/res/drawable-xxhdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-xxhdpi/appwidget_settings_ind_on_r_holo.9.png
index a86b32fe76f..2b6a4aaa702 100644
Binary files a/res/drawable-xxhdpi/appwidget_settings_ind_on_r_holo.9.png and b/res/drawable-xxhdpi/appwidget_settings_ind_on_r_holo.9.png differ
diff --git a/res/drawable/data_usage_bar.xml b/res/drawable/data_usage_bar.xml
index 96f1caedd0e..7ce5e1223a3 100644
--- a/res/drawable/data_usage_bar.xml
+++ b/res/drawable/data_usage_bar.xml
@@ -23,14 +23,14 @@
     <item android:id="@android:id/secondaryProgress">
         <clip>
             <shape>
-                <solid android:color="#c050ade5" />
+                <solid android:color="#c0ffffff" />
             </shape>
         </clip>
     </item>
     <item android:id="@android:id/progress">
         <clip>
             <shape>
-                <solid android:color="#c050ade5" />
+                <solid android:color="#c0ffffff" />
             </shape>
         </clip>
     </item>
diff --git a/res/layout/custom_tile_dialog.xml b/res/layout/custom_tile_dialog.xml
new file mode 100755
index 00000000000..599418de6ce
--- /dev/null
+++ b/res/layout/custom_tile_dialog.xml
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="8dp"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="?android:attr/textAppearanceSmall"
+        android:text="@string/custom_tile_dialog_text" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="0.5"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageButton
+                    android:id="@+id/icon"
+                    android:padding="5dp"
+                    android:layout_width="@android:dimen/app_icon_size"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_height="@android:dimen/app_icon_size"
+                    android:scaleType="centerInside" />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@android:drawable/divider_horizontal_dark" />
+
+                <Button
+                    android:id="@+id/action"
+                    android:layout_width="match_parent"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_weight="1"
+                    android:gravity="start|center_vertical"
+                    android:paddingStart="5dp"
+                    android:layout_height="wrap_content" />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@android:drawable/divider_horizontal_dark" />
+
+                <ImageButton
+                    android:id="@+id/reset"
+                    android:padding="5dp"
+                    android:src="@drawable/ic_settings_backup"
+                    android:layout_width="@android:dimen/app_icon_size"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_height="@android:dimen/app_icon_size" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageButton
+                    android:id="@+id/icon_two"
+                    android:padding="5dp"
+                    android:layout_width="@android:dimen/app_icon_size"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_height="@android:dimen/app_icon_size"
+                    android:scaleType="centerInside" />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@android:drawable/divider_horizontal_dark" />
+
+                <Button
+                    android:id="@+id/action_two"
+                    android:layout_width="match_parent"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_weight="1"
+                    android:gravity="start|center_vertical"
+                    android:paddingStart="5dp"
+                    android:layout_height="wrap_content" />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@android:drawable/divider_horizontal_dark" />
+
+                <ImageButton
+                    android:id="@+id/reset_two"
+                    android:padding="5dp"
+                    android:src="@drawable/ic_settings_backup"
+                    android:layout_width="@android:dimen/app_icon_size"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_height="@android:dimen/app_icon_size" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageButton
+                    android:id="@+id/icon_three"
+                    android:padding="5dp"
+                    android:layout_width="@android:dimen/app_icon_size"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_height="@android:dimen/app_icon_size"
+                    android:scaleType="centerInside" />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@android:drawable/divider_horizontal_dark" />
+
+                <Button
+                    android:id="@+id/action_three"
+                    android:layout_width="match_parent"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_weight="1"
+                    android:gravity="start|center_vertical"
+                    android:paddingStart="5dp"
+                    android:layout_height="wrap_content" />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@android:drawable/divider_horizontal_dark" />
+
+                <ImageButton
+                    android:id="@+id/reset_three"
+                    android:padding="5dp"
+                    android:src="@drawable/ic_settings_backup"
+                    android:layout_width="@android:dimen/app_icon_size"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_height="@android:dimen/app_icon_size" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageButton
+                    android:id="@+id/icon_four"
+                    android:padding="5dp"
+                    android:layout_width="@android:dimen/app_icon_size"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_height="@android:dimen/app_icon_size"
+                    android:scaleType="centerInside" />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@android:drawable/divider_horizontal_dark" />
+
+                <Button
+                    android:id="@+id/action_four"
+                    android:layout_width="match_parent"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_weight="1"
+                    android:gravity="start|center_vertical"
+                    android:paddingStart="5dp"
+                    android:layout_height="wrap_content" />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@android:drawable/divider_horizontal_dark" />
+
+                <ImageButton
+                    android:id="@+id/reset_four"
+                    android:padding="5dp"
+                    android:src="@drawable/ic_settings_backup"
+                    android:layout_width="@android:dimen/app_icon_size"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_height="@android:dimen/app_icon_size" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageButton
+                    android:id="@+id/icon_five"
+                    android:padding="5dp"
+                    android:layout_width="@android:dimen/app_icon_size"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_height="@android:dimen/app_icon_size"
+                    android:scaleType="centerInside" />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@android:drawable/divider_horizontal_dark" />
+
+                <Button
+                    android:id="@+id/action_five"
+                    android:layout_width="match_parent"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_weight="1"
+                    android:gravity="start|center_vertical"
+                    android:paddingStart="5dp"
+                    android:layout_height="wrap_content" />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="5dp"
+                    android:layout_marginStart="5dp"
+                    android:background="@android:drawable/divider_horizontal_dark" />
+
+                <ImageButton
+                    android:id="@+id/reset_five"
+                    android:padding="5dp"
+                    android:src="@drawable/ic_settings_backup"
+                    android:layout_width="@android:dimen/app_icon_size"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_height="@android:dimen/app_icon_size" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>
diff --git a/res/layout/preference_linearcolor.xml b/res/layout/preference_linearcolor.xml
index d3a2603f241..754558dcc2e 100644
--- a/res/layout/preference_linearcolor.xml
+++ b/res/layout/preference_linearcolor.xml
@@ -19,7 +19,7 @@
         android:layout_height="?android:attr/listPreferredItemHeight"
         android:paddingEnd="?android:attr/scrollbarSize">
     <com.android.settings.applications.LinearColorBar
-        android:id="@+android:id/linear_color_bar"
+        android:id="@+id/linear_color_bar"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="16dp"
diff --git a/res/layout/preference_memoryusage.xml b/res/layout/preference_memoryusage.xml
index ddc619dd77d..edabcee9851 100644
--- a/res/layout/preference_memoryusage.xml
+++ b/res/layout/preference_memoryusage.xml
@@ -20,8 +20,27 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingEnd="?android:attr/scrollbarSize"
-    android:paddingStart="@*android:dimen/preference_widget_width">
+    android:paddingEnd="?android:attr/scrollbarSize">
+
+    <ImageView android:id="@+id/memory_usage_rescan_media"
+        android:layout_width="48dip"
+        android:layout_height="48dip"
+        android:padding="6dp"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:src="@drawable/ic_menu_refresh_holo_dark"
+        android:background="@*android:drawable/list_selector_holo_dark"
+        android:contentDescription="@string/storage_rescan_media"/>
+
+    <ProgressBar android:id="@+id/memory_usage_rescan_media_waiting"
+        android:layout_width="48dip"
+        android:layout_height="48dip"
+        android:padding="6dp"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:indeterminateOnly="true"/>
 
     <com.android.settings.deviceinfo.PercentageBarChart
         android:id="@+id/percentage_bar_chart"
diff --git a/res/layout/preference_profiles_widget.xml b/res/layout/preference_profiles_widget.xml
new file mode 100755
index 00000000000..ab63a10f1bb
--- /dev/null
+++ b/res/layout/preference_profiles_widget.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RadioButton
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+android:id/checkbox"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:focusable="false"
+    android:clickable="false" />
diff --git a/res/layout/quick_settings_tile_user.xml b/res/layout/quick_settings_tile_user.xml
index 22c6d239049..637ebba2741 100644
--- a/res/layout/quick_settings_tile_user.xml
+++ b/res/layout/quick_settings_tile_user.xml
@@ -13,25 +13,45 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<FrameLayout
+
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:background="#AA222222"
-    android:layout_height="wrap_content">
-    <ImageView
-        android:id="@+id/user_imageview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        />
-    <TextView
-        style="@style/TextAppearance.QuickSettings"
-        android:id="@+id/tile_textview"
+    android:layout_height="wrap_content"
+    android:background="#AA222222" >
+
+    <FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|bottom"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:background="#55000000"
-        />
-</FrameLayout>
+        android:background="#AA222222"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/user_imageview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            />
+        <TextView
+            style="@style/TextAppearance.QuickSettings"
+            android:id="@+id/tile_textview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|bottom"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:background="#55000000"
+            />
+    </FrameLayout>
+
+    <ImageView
+        android:id="@+id/settings"
+        android:layout_width="18dp"
+        android:layout_height="18dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:paddingTop="2dp"
+        android:paddingLeft="2dp"
+        android:visibility="gone"
+        android:src="@drawable/ic_settings_quicksettings" />
+
+</RelativeLayout>
diff --git a/res/values-cs/slim_strings.xml b/res/values-cs/slim_strings.xml
new file mode 100755
index 00000000000..1173f1731b6
--- /dev/null
+++ b/res/values-cs/slim_strings.xml
@@ -0,0 +1,950 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 SlimRoms Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- General strings -->
+    <string name="ok">OK</string>
+    <string name="reset">Obnovit</string>
+    <string name="attention">Upozornění</string>
+    <string name="enabled">Povoleno</string>
+    <string name="default_string">Výchozí</string>
+    <string name="additional_options_title">Další možnosti</string>
+    <string name="reset_message">Obnovit všechny položky na výchozí hodnoty?</string>
+    <string name="style_title">Styl</string>
+    <string name="add">Přidat</string>
+
+    <!-- Settings main menu category heading. Rom (Launcher, Themes, System). [CHAR LIMIT=40] -->
+    <string name="header_category_rom_settings">Pokročilé nastavení</string>
+
+    <!-- Slim settings screens -->
+    <string name="interface_settings_title">Rozhraní</string>
+    <string name="navigation_settings_title">Navigace</string>
+    <string name="slim_center_title">Slim Centrum</string>
+    <!-- Advanced, Device specific (DeviceParts) settings  -->
+    <string name="device_settings_title">Zařízení</string>
+
+    <!-- Color Picker -->
+    <string name="dialog_color_picker">Kapátko</string>
+    <string name="press_color_to_apply">Níže klikněte na barvu, kterou chcete použít</string>
+    <string name="arrow_right">→</string>
+    <string name="arrow_down">↓</string>
+    <string name="hex">Hex:</string>
+    <string name="hex_hint">#ff000000</string>
+    <string name="set">Nastavit</string>
+
+    <!-- About phone screen, slim version -->
+    <string name="slim_version_title">Slim verze</string>
+    <string name="slim_version_default">Neznámá</string>
+
+    <!-- Display settings screen, notification light settings -->
+    <string name="display_category_light_options_title">Nastavení světla</string>
+    <string name="notification_light_title">Světlo oznámení</string>
+    <string name="notification_light_general_title">Obecný</string>
+    <string name="notification_light_applist_title">Aplikace</string>
+    <string name="notification_light_phonelist_title">Telefon</string>
+    <string name="notification_light_use_custom">Použití vlastní hodnoty</string>
+    <string name="notification_light_missed_call_title">Zmeškaný hovor</string>
+    <string name="notification_light_voicemail_title">Hlasová schránka</string>
+    <string name="notification_light_choose_app">Vybrat aplikaci</string>
+    <string name="notification_light_add">Přidat</string>
+
+    <!-- Notification light dialogs -->
+    <string name="edit_light_settings">Upravit nastavení světel</string>
+    <string name="pulse_speed_title">Délka impulsu a rychlost</string>
+    <string name="picker_arrow">→</string>
+    <string name="default_time">Normální</string>
+    <string name="custom_time">Vlastní</string>
+    <string name="dialog_test">Otestovat</string>
+    <string name="dialog_delete_title">Smazat</string>
+    <string name="dialog_delete_message">Odstranit vybranou položku?</string>
+    <string name="dialog_test_message">Vypněte obrazovku pro zobrazení upozornění, nebo zamítněte toto dialogové okno</string>
+    <string name="dialog_test_button">Zrušit</string>
+
+    <!-- Values for the notification light pulse spinners -->
+    <string name="pulse_length_always_on">Vždy povolit</string>
+    <string name="pulse_length_very_short">Velmi krátká</string>
+    <string name="pulse_length_short">Krátká</string>
+    <string name="pulse_length_normal">Normalní</string>
+    <string name="pulse_length_long">Dlouhá</string>
+    <string name="pulse_length_very_long">Velmi dlouhá</string>
+    <string name="pulse_speed_very_fast">Velmi rychlá</string>
+    <string name="pulse_speed_fast">Rychlá</string>
+    <string name="pulse_speed_normal">Normální</string>
+    <string name="pulse_speed_slow">Pomalá</string>
+    <string name="pulse_speed_very_slow">Velmi pomalá</string>
+
+    <!-- Battery light settings -->
+    <string name="battery_light_title">Ukazatel baterie</string>
+    <string name="battery_low_pulse_title">Blikat, když je baterie vybitá</string>
+    <string name="battery_light_list_title">Barvy</string>
+    <string name="battery_light_low_color_title">Vybitá baterie</string>
+    <string name="battery_light_medium_color_title">Nabíjení</string>
+    <string name="battery_light_full_color_title">Plně nabito</string>
+
+    <!-- Privacy Guard -->
+    <string name="app_security_title">Zabezpečení aplikací</string>
+    <string name="privacy_guard_dlg_title">Povolit Ochranu soukromí?</string>
+    <string name="privacy_guard_dlg_text">Pokud je Ochrana soukromí povolen, aplikaci je znemožněn přístup k osobním datům jako jsou kontakty, zprávy nebo historie volání.</string>
+    <string name="privacy_guard_dlg_system_app_text">Při povolení Ochrany soukromí pro systémové aplikace, tyto aplikace nemůžou přistupovat nebo poskytovat osobní data. To může způsobit chybnou funkci ostatních aplikací.</string>
+    <string name="privacy_guard_default_title">Ve výchozím stavu povolen</string>
+    <string name="privacy_guard_default_summary">Automaticky aktivovat Ochranu soukromí pro nově nainstalované aplikace</string>
+    <string name="privacy_guard_notification_title">Upozornění</string>
+    <string name="privacy_guard_notifiation_summary">Zobrazit upozornění pokud je Ochrana soukromí aktivní.</string>
+    <string name="privacy_guard_manager_title">Ochrana soukromí</string>
+    <string name="privacy_guard_manager_summary">Spravovat aplikace, které mohou mít přístup k osobním údajům</string>
+    <string name="privacy_guard_no_user_apps">Není nainstalována žádná aplikace</string>
+    <string name="privacy_guard_filter_does_not_match">Není nainstalována žádná aplikace s příslušným oprávnění</string>
+    <string name="privacy_guard_help_text">Na této obrazovce můžete vybrat, která aplikace má být sledována Ochranou soukromí. Zvolené aplikace nebudou mít umožněno přistupovat k soukromím údajům, jako jsou kontakty, zprávy nebo seznamy hovorů. Dlouhým stiskem na dané aplikaci se zobrazí její systémové informace.\n\nVe výchozím stavu se systémové aplikace nezobrazují. Pokud chcete zobrazit i systémové aplikace, vyberte danou volbu z nabídky.</string>
+    <string name="privacy_guard_manager_show_system_apps">Zobrazit systémové aplikace</string>
+    <string name="privacy_guard_manager_filter_permissions">Filtr oprávnění</string>
+    <string name="privacy_guard_app_ops_detail_dialog_title">Pozor</string>
+    <string name="privacy_guard_app_ops_detail_dialog_text">Vybraná aplikace nevyžaduje oprávnění, které přistupuje k osobním údajům. Chcete změnit jiné oprávnění?</string>
+    <string name="privacy_guard_app_ops_detail_reset_dialog_text">Obnovit všechna oprávnění na výchozí hodnoty?</string>
+    <string name="app_ops_btn_text">Upravit</string>
+    <string name="app_ops_no_item_text">Tato aplikace nemá žádné proměnlivé oprávnění.</string>
+
+    <!-- Wi-Fi region code settings-->
+    <string name="wifi_setting_countrycode_title">Kód regionu Wi-Fi</string>
+    <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]. -->
+    <string name="wifi_setting_countrycode_summary">Zvolte kód regionu Wi-Fi</string>
+    <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+    <string name="wifi_setting_countrycode_error">Při nastavení kódu regionu došlo k problému.</string>
+    <!-- Wi-Fi settings diables message if Wifi is off-->
+    <string name="wifi_setting_countrycode_disabled">Povolte Wi-Fi pro úpravy.</string>
+    <!-- WiFi forget all networks -->
+    <string name="wifi_menu_forget_all">Zapomenout všechny sítě.</string>
+
+    <!-- Status bar -->
+    <string name="status_bar_title">Stavová lišta</string>
+    <string name="status_bar_style_title">Styl</string>
+    <string name="status_bar_general_title">Obecné</string>
+
+    <!-- Status bar | Clock -->
+    <string name="status_bar_clock">Datum a čas</string>
+    <string name="status_bar_clock_title">Styl data a času</string>
+    <string name="clock_title_enable">Zarovnání</string>
+    <string name="clock_color_title">Barva</string>
+    <string name="status_bar_clock_style_reset">Obnovit barvu</string>
+    <string name="status_bar_show_clock_title">Zobrazit datum a čas</string>
+    <string name="status_bar_am_pm_title">AM/PM</string>
+    <string name="status_bar_am_pm_info">24-hodinový formát povolen</string>
+    <string name="enable_clock_weekday">Den v týdnu</string>
+    <string name="enable_clock_weekday_summary">Zkrácený den v týdnu před časem</string>
+    <string name="right_clock">Hodiny vpravo</string>
+    <string name="center_clock">Hodiny uprostřed</string>
+    <string name="dont_show">Nezobrazovat	</string>
+    <string name="clock_date_display">Datum</string>
+    <string name="clock_date_display_summary">Zobrazit vlastní datum před hodinami</string>
+    <string name="clock_date_style">Styl datumu</string>
+    <string name="clock_date_format">Formát datumu</string>
+    <string name="clock_date_string_edittext_title">Musí být ve formátu například MM/dd/rr</string>
+    <string name="clock_date_string_edittext_summary">Zadejte řetězec</string>
+    <string name="am_pm_clock_normal">Normální velikost písma</string>
+    <string name="am_pm_clock_small">Malá velikost písma</string>
+    <string name="am_pm_clock_none">Nezobrazovat</string>
+    <string name="clock_date_display_none">Nezobrazovat</string>
+    <string name="clock_date_display_small">Malá velikost písma</string>
+    <string name="clock_date_display_normal">Normální velikost písma</string>
+    <string name="clock_date_style_normal">Normální</string>
+    <string name="clock_date_style_lowercase">Malá</string>
+    <string name="clock_date_style_uppercase">Velká</string>
+    <string name="clock_date_format_custom">Vlastní java formát</string>
+    <string name="status_bar_clock_style_reset_message">Obnovit barvu hodin?</string>
+    <string name="status_bar_toggle_brightness">Ovládání jasu</string>
+    <string name="status_bar_toggle_brightness_summary">Umožňuje nastavit jas tažením prstu na stavové liště</string>
+    <string name="status_bar_toggle_info">Automatický jas povolen</string>
+
+    <!-- Wakeup options -->
+    <string name="display_category_wakeup_options_title">Možnosti probuzení</string>
+    <string name="pref_volume_wake_title">Probuzení tlačítkem ovládání hlasitosti</string>
+    <string name="pref_volume_wake_summary">Stisknutím tlačítka hlasitosti dolů/nahoru probudíte zařízení.</string>
+    <string name="wakeup_when_plugged_unplugged_title">Probudit při nabíjení</string>
+    <string name="wakeup_when_plugged_unplugged_summary">Probudit v případě připojení/odpojení nabíječky.</string>
+
+    <!-- Sound settings -->
+    <string name="sound_title">Zvuk</string>
+    <string name="advanced_sound_title">Pokročilé možnosti</string>
+    <string name="volbtn_music_controls_title">Ovládání hudby tlačítky hlasitosti</string>
+    <string name="volbtn_music_controls_summary">V případě vypnutého displeje, dojde dlouhým stisknutím tlačítek hlasitosti k přepnutí skladby.</string>
+
+    <string name="volume_adjust_sounds_enable_title">Zvuk při změně hlasitosti</string>
+    <string name="volume_adjust_sounds_enable_summary">Přehrát zvuk při změně hlasitosti pomocí tlačítka</string>
+    <string name="link_volume_ringtones">Hlasitost vyzvánění a oznamování</string>
+    <string name="volume_ring_only_description">Vyzvánění</string>
+
+    <!-- Sound settings screen, setting check box label -->
+    <string name="camera_sounds_title">Zvuk závěrky fotoaparátu</string>
+    <string name="camera_sounds_summary">Povolit systémový zvuk úzávěrky fotoaparátu</string>
+    <string name="camera_sound_warning_dialog_text">Vypnutí zvuku spouště fotoaparátu může být v některých zemích nezákonné! Prosím zkontrolujte zákon ve Vaší zemi.</string>
+
+    <!-- Safe headset volume restore checkbox -->
+    <string name="safe_headset_volume_title">Bezpečná hlasitost sluchátek</string>
+    <string name="safe_headset_volume_summary">Zabránit hlasité úrovně hlasitosti, při prvním zasunutí headsetu</string>
+    <string name="safe_headset_volume_warning_dialog_text">Poslech při vysoké hlasitosti po delší dobu může poškodit váš sluch. Zakažte upozornění s opatrností.</string>
+
+    <!-- Display : Animation options -->
+    <string name="display_category_animation_options_title">Možnosti animace</string>
+    <string name="system_power_crt_mode_title">CRT animace </string>
+    <string name="system_power_crt_mode_dialog_title">CRT animace</string>
+    <string name="system_power_crt_mode_off">Nezobrazovat</string>
+    <string name="system_power_crt_mode_horizontal">Sbalit horizontálně</string>
+    <string name="system_power_crt_mode_vertical">Sbalit vertikálně</string>
+    <string name="system_power_crt_mode_both">Sbalit v závislosti na orientaci</string>
+    <string name="system_power_crt_mode_scale">Zmenšit</string>
+
+    <!-- Keyboard and Input ASS methods  -->
+    <string name="title_keyboard_input">Pokročilé možnosti</string>
+    <string name="disable_fullscreen_keyboard_title">Zákazat klávesnici přes celou obrazovku</string>
+    <string name="disable_fullscreen_keyboard_summary">Klávesnice na šířku nikdy nezabere celou obrazovku</string>
+    <string name="volume_key_cursor_control_title">Ovládání kurzoru tlačítky hlasitosti</string>
+    <string name="volume_key_cursor_control_on">Hlasitost nahoru/dolů přesune kurzor doleva/doprava</string>
+    <string name="volume_key_cursor_control_on_reverse">Hlasitost nahoru/dolů přesune kurzor doprava/doleva</string>
+    <string name="keyboard_rotation_toggle_title">Automatické otáčení klávesnice</string>
+    <string name="keyboard_rotation_toggle_summary">Vynucení automatického otočení klávesnice v případě, že je zobrazena</string>
+    <string name="keyboard_rotation_timeout_title">Zpožděné otáčení</string>
+    <string name="keyboard_rotation_timeout_summary">Zakazovat senzor automatického otáčení <xliff:g id="rotate_timeout">%1$s</xliff:g> sekund po skrytí klávesnice</string>
+    <string name="keyboard_rotation_dialog">Tato funkce vynutí automatické otočení dočasně, zatímco bude klávesnice zobrazena. Toto nemá vliv v případě, že je povoleno automatické otáčení.</string>
+    <string name="show_enter_key_title">Zobrazit tlačítko Enter</string>
+    <string name="show_enter_key_summary">Vnutit zobrazení klávesnice Enter místo emoji ikon</string>
+    <string name="ime_switcher_notify">Výběr oznámení</string>
+    <string name="ime_switcher_notify_summary">Zobrazit vstupní metody výběru oznámení</string>
+
+    <!-- Setting checkbox title for root access -->
+    <string name="root_access">Root přístup</string>
+    <string name="root_access_warning_title">Povolit root přístup?</string>
+    <string name="root_access_warning_message">Povolení aplikacím vyžadovat root přístup je velmi nebezpečené a může ohrozit bezpečnost Vašeho systému!</string>
+    <string name="root_access_none">Zakázáno</string>
+    <string name="root_access_apps">Pouze aplikace</string>
+    <string name="root_access_adb">Pouze ADB</string>
+    <string name="root_access_all">Aplikace a ADB</string>
+
+    <!-- Automatic brightness customization -->
+    <string name="auto_brightness_setup_title">Automatické podsvícení</string>
+    <string name="auto_brightness_adjustment_title">Přizpůsobení podsvícení</string>
+    <string name="auto_brightness_twilight_adjustment">Přizpůsobit pro východ a západ slunce</string>
+    <string name="light_sensor_current_value">Aktuální hodnota světelného senzoru: <xliff:g id="light_level">%d</xliff:g> luxů</string>
+    <string name="auto_brightness_dialog_title">Automatická úroveň podsvícení</string>
+    <string name="auto_brightness_level_format"><xliff:g id="level">%1$d</xliff:g> luxů</string>
+    <string name="auto_brightness_last_level_format"><xliff:g id="level">%1$d</xliff:g> -\n\u221e lux</string>
+    <string name="auto_brightness_brightness_format" translatable="false"><xliff:g id="percent">%s</xliff:g>%%</string>
+    <string name="auto_brightness_adjust_button">Upravit</string>
+    <string name="auto_brightness_close_button">Zavřít</string>
+    <string name="auto_brightness_reset_button">Obnovit</string>
+    <string name="auto_brightness_split_dialog_title">Rozdělit úroveň osvětlení</string>
+    <string name="auto_brightness_level_dialog_title">Nastavení úrovně osvětlení</string>
+    <string name="auto_brightness_lux">Okolní osvětlení (luxy)</string>
+    <string name="auto_brightness_backlight">Podsvětlení obrazovky (%)</string>
+    <string name="auto_brightness_reset_dialog_title">Obnovit úrovně?</string>
+    <string name="auto_brightness_reset_confirmation">Všechny úrovně podsvětlení budou obnoveny do jejich výchozích hodnot.</string>
+    <string name="auto_brightness_split_lux_format">Rozdělit pozici (mezi <xliff:g id="min">%1$d</xliff:g> a <xliff:g id="max">%2$d</xliff:g> luxy)</string>
+    <string name="auto_brightness_level_options">Možnosti úrovně osvětlení</string>
+    <string name="auto_brightness_menu_edit">Změnit</string>
+    <string name="auto_brightness_menu_split">Rozdělit</string>
+    <string name="auto_brightness_menu_remove">Odstranit</string>
+    <string name="auto_brightness_preview">Náhled</string>
+    <string name="auto_brightness_preview_dialog_title">Náhled křivky podsvícení</string>
+    <string name="auto_brightness_help_text"><b>Jak je počítána úroveň podsvícení?</b>\n\n
+Křivka podsvícení je počítána pomocí <i>interpolace kubické spline křivky</i> přes určitý
+počet <i>řídících bodů</i>. Výpočet není provádět skoky mezi konstantními úrovněmi okolního
+osvětlení. Tím je docíleno, že malé změny v okolním osvětlení nezpůsobí veliké skoky
+podsvícení, ale na druhou stranu je celkem obtížné odhadnout přímé chování podsvícení při
+změně řídících bodů.\nTomu napomáhá náhled vypočítané křivky. Zobrazení náhledu křivky
+je v <i>logaritmickém</i> měřítku, tudíž jsou všechny řídící body zobrazeny izolovaněji.
+Při použití lineárního měřítka by v některých případech nebylo možné rozlišit jednotlivé
+úrovně řídících bodů při nízkém okolním osvětlení.
+\n\n
+<b>Jak měnit křivku podsvícení?</b>
+\n\n
+Každý řádek v seznamu podsvícení odpovídá jednomu <i>řídícímu bodu</i> křivky podsvícení.
+Pro změnu úrovně podsvícení daného bodu změňte pomocí posuvného ovládacího prvku
+jeho hodnotu. Úroveň podsvícení bude okamžitě změněna na stejnou úroveň, na kterou
+je onen posuvný prvek nastaven a tím je možné okamžitě zkontrolovat úroveň podsvícení.\n
+Další možnosti jsou dostupné dlouhým dotykem na řádce daného bodu. Zvolením \'Změnit\',
+můžete změnit jak úroveň okolního světla tak i ručně vložit požadovanou hodnotu
+podsvícení. Zvolením \'Rozdělit\' dojde k rozdělení daného bodu na dva, které pak lze
+jednotlivě měnit a tím zvětšit počet řídících bodů. \'Odstranit\' smaže zvolenou řádku.
+    </string>
+
+    <string name="auto_brightness_sensitivity_title">Nastavení citlivosti</string>
+    <string name="auto_brightness_sensitivity_verylow">Velmi nízká</string>
+    <string name="auto_brightness_sensitivity_low">Nízká</string>
+    <string name="auto_brightness_sensitivity_medium">Střední</string>
+    <string name="auto_brightness_sensitivity_high">Vysoká</string>
+    <string name="auto_brightness_sensitivity_veryhigh">Velmi vysoká</string>
+
+    <!-- Blacklist preferences -->
+    <string name="blacklist_title">Černá listina</string>
+    <string name="blacklist_edit_dialog_title">Změnit položku černé listiny</string>
+    <string name="blacklist_prefs">Nastavení</string>
+    <string name="blacklist_button_delete">Smazat</string>
+    <string name="blacklist_empty_text">V seznamu černé listiny není žádné číslo. Položku přidáte pomocí tlačítka Přidat číslo (+).</string>
+    <string name="blacklist_disabled_empty_text">Pro zakázání komunikace z čísel na černé listině je potřeba tuto černou listinu povolit.</string>
+    <string name="blacklist_summary_disabled">Zakázána</string>
+    <string name="blacklist_summary">Příchozí volání a zprávy z čísel na černé listině budou blokovány</string>
+    <string name="blacklist_notify">Zobrazit upozornění</string>
+    <string name="blacklist_private_numbers_title">Skrytá čísla</string>
+    <string name="blacklist_private_numbers_summary_disabled">Neblokovat volání ze skrytých čísel</string>
+    <string name="blacklist_private_numbers_summary">Blokovat příchozí <xliff:g id="type">%s</xliff:g> ze skrytých čísel</string>
+    <string name="blacklist_unknown_numbers_title">Neznámá čísla</string>
+    <string name="blacklist_unknown_numbers_summary_disabled">Neblokovat volání nebo zprávy z čísel, které nejsou v seznamu kontaktů</string>
+    <string name="blacklist_unknown_numbers_summary">Blokovat příchozí <xliff:g id="type">%s</xliff:g> z čísla, které není v seznamu kontaktů</string>
+    <string name="blacklist_summary_type_calls_only">volání</string>
+    <string name="blacklist_summary_type_messages_only">zprávy</string>
+    <string name="blacklist_summary_type_calls_and_messages">volání i zprávy</string>
+    <string name="blacklist_regex_title">Použít zástupné znaky</string>
+    <string name="blacklist_regex_summary">Použít znak . jako zástupný a znak * pro opakování. Např. 123.* blokuje všechna čísla začínající sekvencí 123 a .*123.* blokuje všechna čísla, obsahující sekvenci 123</string>
+    <string name="blacklist_policy_block_calls">Blokovat příchozí hovory</string>
+    <string name="blacklist_policy_block_messages">Blokovat příchozí zprávy</string>
+
+    <!-- Blacklist management -->
+    <string name="add_blacklist_number">Přidat číslo</string>
+    <string name="remove_blacklist_number_title">Odstranit číslo</string>
+    <string name="remove_blacklist_entry">Opravdu odstranit toto číslo z černé listiny?</string>
+    <string name="select_contact">Zvolte kontakt</string>
+
+    <string name="increasing_ring_title">Zvyšování hlasitosti vyzvánění</string>
+    <!-- Sound settings screen, the caption of the checkbox for making incoming calls increase in volume -->
+    <string name="checkbox_increasing_ring">Povolit</string>
+    <!-- Sound settings screen, the title of the volume bar to adjust the minimum increasing ring volume -->
+    <string name="increasing_ring_min_volume_title">Počáteční hlasitost vyzvánění</string>
+    <string name="increasing_ring_volume_notice">Poznámka:\nPočáteční úroveň hlasitosti je větší než hlasitost vyzvánění.</string>
+    <string name="increasing_ring_interval_title">Interval zvyšování hlasitosti</string>
+    <string name="increasing_ring_interval_eachring">Pro každé zvonění</string>
+    <string name="increasing_ring_interval_half_second">0,5 sekund</string>
+    <string name="increasing_ring_interval_1second">1 sekunda</string>
+    <string name="increasing_ring_interval_2seconds">2 sekundy</string>
+    <string name="increasing_ring_interval_3seconds">3 sekundy</string>
+    <string name="increasing_ring_interval_5seconds">5 sekund</string>
+    <string name="increasing_ring_interval_10seconds">10 sekund</string>
+
+    <!-- Low battery warning policy -->
+    <string name="pref_low_battery_warning_policy_title">Kontrola stavu baterie</string>
+    <string name="pref_low_battery_warning_policy_dialog_title">Varování o stavu baterie pomocí</string>
+    <string name="low_battery_warning_policy_popup_sound">Vyskakovací okno a zvuk</string>
+    <string name="low_battery_warning_policy_notif_sound">Upozornění a zvuk</string>
+    <string name="low_battery_warning_policy_popup">Pouze vyskakovací okno</string>
+    <string name="low_battery_warning_policy_notif">Pouze upozornění</string>
+    <string name="low_battery_warning_policy_sound">Pouze zvuk</string>
+    <string name="battery_prefs_title">Možnosti</string>
+    <string name="battery_stats_title">Statistiky</string>
+
+    <!-- Button shorcut actions -->
+    <string name="shortcut_action_airplane">Režim V letadle</string>
+    <string name="shortcut_action_expanded_desktop">Rozšířená plocha</string>
+    <string name="shortcut_action_power_off">Vypnout</string>
+    <string name="shortcut_action_reboot">Restartovat</string>
+    <string name="shortcut_action_sound">Zvuk</string>
+    <string name="shortcut_action_app">Vlastní aplikace</string>
+    <string name="shortcut_action_home">Domů</string>
+    <string name="shortcut_action_back">Zpět</string>
+    <string name="shortcut_action_recent">Nedávné</string>
+    <string name="shortcut_action_lastapp">Poslední aplikace</string>
+    <string name="shortcut_action_search">Hledat</string>
+    <string name="shortcut_action_screenshot">Snímek obrazovky</string>
+    <string name="shortcut_action_menu">Nabídka</string>
+    <string name="shortcut_action_ime">Přepínač vstupní metody</string>
+    <string name="shortcut_action_kill">Ukončit apl.</string>
+    <string name="shortcut_action_power">Vypnutá obrazovka</string>
+    <string name="shortcut_action_theme_switch">Přepínač téma</string>
+    <string name="shortcut_action_notifications">Upozornění</string>
+    <string name="shortcut_action_menu_big">Nabídka</string>
+    <string name="shortcut_action_qs">Panel rychlého nastavené</string>
+    <string name="shortcut_action_none">Žádný</string>
+    <string name="shortcut_action_power_menu">Nabídka tlačítka Vypnout</string>
+    <string name="shortcut_action_torch">Svítilna</string>
+    <string name="shortcut_action_ring_vib">Zvonění/vibrace</string>
+    <string name="shortcut_action_ring_silent">Zvonění/ticho</string>
+    <string name="shortcut_action_ring_vib_silent">Zvonění/vibrace/ticho</string>
+    <string name="shortcut_action_longpress">Dlouhý stisk:</string>
+    <string name="shortcut_action_select_action_longpress">Vyberte akci pro dlouhý stisk:</string>
+    <string name="shortcut_action_select_action">Vyberte akci:</string>
+    <string name="shortcut_action_select_action_newbutton">Vyberte novou akci:</string>
+    <string name="shortcut_action_reset">Obnovit</string>
+    <string name="shortcut_action_add">Přidat</string>
+    <string name="shortcut_action_reset_message">Obnovit všechny položky do výchozího nastavení?</string>
+    <string name="shortcut_action_max">Maximální velikost položky bylo dosaženo</string>
+    <string name="shortcut_action_warning">Varování</string>
+    <string name="shortcut_action_warning_message">Není možné smazat poslední záznam.</string>
+    <string name="shortcut_action_disable_message">Zakázáno\nPro povolení této funkce přidejte novou položku</string>
+    <string name="shortcut_image_not_valid">Zvolená aplikace nevrátila platnou ikonu nebo nepodporuje oříznutí obrázku. Použijte jinou aplikaci.</string>
+    <string name="shortcut_duplicate_entry">Zvolenou akci nelze přidat dvakrát</string>
+
+    <string name="shortcut_action_help_shortcut">zástupce</string>
+    <string name="shortcut_action_help_button">tlačítko</string>
+    <string name="shortcut_action_help_icon">, při výběru na ikonu vyvoláte možnosti přizpůsobení</string>
+    <string name="shortcut_action_help_main">Při přidání %1$s, vyberte Přidat ikonu.  Jakmile %1$s je přidán, vybráním řádku změníte objekt%2$s\n\nPro odstranění %1$s, přejeďte řádek vodorovně vlevo nebo vpravo.  Přerovnání %1$s v seznamu, přetažením kotvy vertikálně na levé straně.\n\nChcete-li vymazat nebo obnovit výchozí nastavení, klepněte na ikonu Obnovit.</string>
+    <string name="shortcut_action_help_delete_last_entry">Odstraněním každé %1$s v seznamu, dojde k úplnému vyřazení funkce.</string>
+
+    <string name="shortcuts_icon_picker_alarm">Alarm</string>
+    <string name="shortcuts_icon_picker_andy">Andy</string>
+    <string name="shortcuts_icon_picker_battery">Baterie</string>
+    <string name="shortcuts_icon_picker_browser">Prohlížeč</string>
+    <string name="shortcuts_icon_picker_calendar">Kalendář</string>
+    <string name="shortcuts_icon_picker_camera">Fotoaparát</string>
+    <string name="shortcuts_icon_picker_cloud">Cloud</string>
+    <string name="shortcuts_icon_picker_contact">Kontakt</string>
+    <string name="shortcuts_icon_picker_directdial">Přímé volby</string>
+    <string name="shortcuts_icon_picker_directmessage">Přímá zpráva</string>
+    <string name="shortcuts_icon_picker_drive">Úložiště</string>
+    <string name="shortcuts_icon_picker_dropbox">Dropbox</string>
+    <string name="shortcuts_icon_picker_email">Email</string>
+    <string name="shortcuts_icon_picker_email2">Email zástupce</string>
+    <string name="shortcuts_icon_picker_evernote">Evernote</string>
+    <string name="shortcuts_icon_picker_facebook">Facebook</string>
+    <string name="shortcuts_icon_picker_favorite">Oblíbený</string>
+    <string name="shortcuts_icon_picker_file_browser">Prohlížeč souborů</string>
+    <string name="shortcuts_icon_picker_file_browser2">File Browser zástupce</string>
+    <string name="shortcuts_icon_picker_fitness">Zdraví</string>
+    <string name="shortcuts_icon_picker_gallery">Galerie</string>
+    <string name="shortcuts_icon_picker_gears">Hodinky</string>
+    <string name="shortcuts_icon_picker_google_small">Google</string>
+    <string name="shortcuts_icon_picker_gplus">Google Plus</string>
+    <string name="shortcuts_icon_picker_gtalk">Hangouts</string>
+    <string name="shortcuts_icon_picker_help">Nápověda</string>
+    <string name="shortcuts_icon_picker_joystick">Joystick</string>
+    <string name="shortcuts_icon_picker_key">Tlačítka/Účty</string>
+    <string name="shortcuts_icon_picker_laptop">Laptop</string>
+    <string name="shortcuts_icon_picker_notes">Poznámky</string>
+    <string name="shortcuts_icon_picker_luggage">Cestování</string>
+    <string name="shortcuts_icon_picker_maps">Mapy</string>
+    <string name="shortcuts_icon_picker_market">Obchod</string>
+    <string name="shortcuts_icon_picker_movie">Filmy</string>
+    <string name="shortcuts_icon_picker_music">Hudba</string>
+    <string name="shortcuts_icon_picker_nav">Navigace</string>
+    <string name="shortcuts_icon_picker_phone">Telefon</string>
+    <string name="shortcuts_icon_picker_package">Balíček</string>
+    <string name="shortcuts_icon_picker_pinterest">Pinterest</string>
+    <string name="shortcuts_icon_picker_play">Hrát</string>
+    <string name="shortcuts_icon_picker_pocket">Kapsa</string>
+    <string name="shortcuts_icon_picker_quicksettings">Rychlé nastavení</string>
+    <string name="shortcuts_icon_picker_rss">RSS Feed</string>
+    <string name="shortcuts_icon_picker_sdcard">Karta SD</string>
+    <string name="shortcuts_icon_picker_search">Hledat</string>
+    <string name="shortcuts_icon_picker_sms">Zprávy</string>
+    <string name="shortcuts_icon_picker_tasks">Úkoly</string>
+    <string name="shortcuts_icon_picker_terminal">Terminál</string>
+    <string name="shortcuts_icon_picker_transit">Tranzit</string>
+    <string name="shortcuts_icon_picker_tv">TV</string>
+    <string name="shortcuts_icon_picker_twitter">Twitter</string>
+    <string name="shortcuts_icon_picker_unlock">Odemknout</string>
+
+    <string name="icon_picker_type">Vyberte typ ikony:</string>
+    <string name="icon_default">Výchozí</string>
+    <string name="icon_presets">Systémové ikony</string>
+    <string name="icon_custom">Galerie</string>
+    <string name="icon_pack">Balík ikon</string>
+    <string name="icon_picker_choose_icon_title">Vyberte ikonu</string>
+    <string name="icon_color_mode_all_icons">Všechny ikony</string>
+    <string name="icon_color_mode_system_icons">Systémové ikony</string>
+    <string name="icon_color_mode_system_custom_icons">Systémové a vlastní ikony</string>
+    <string name="group_applications">Aplikace</string>
+    <string name="select_custom_app_title">Vyberte vlastní aplikaci</string>
+    <string name="shortcuts_text_color_title">Barva textu</string>
+    <string name="shortcuts_color_title">Barva ikony</string>
+    <string name="shortcuts_color_mode_title">Režim barevných ikon</string>
+    <string name="shortcuts_color_mode_summary">Změnit barevný režim ikon</string>
+
+    <!-- Notification drawer settings  -->
+    <string name="notification_drawer_qs_title">Oznamovací oblast a rychlé nastavení</string>
+    <string name="notification_drawer_title">Oznamovací oblast</string>
+    <string name="notification_shortcuts_settings_title">Zástupci</string>
+    <string name="notification_shortcuts_settings_summary">Zobrazit zkratky v oznamovací oblasti.</string>
+
+    <!-- Notification hide labels -->
+    <string name="notification_hide_labels_title">Skrýt štítky oznámení</string>
+    <string name="notification_hide_labels_disable">Zobrazit všechny štítky</string>
+    <string name="notification_hide_labels_carrier">Skrýt štítek operátora</string>
+    <string name="notification_hide_labels_wifi">Skrýt Wi-Fi štítek</string>
+    <string name="notification_hide_labels_all">Skrýt všechny štítky</string>
+    <string name="notification_hide_labels_text">v oznamovací liště</string>
+
+    <!-- StatusBar Battery Settings -->
+    <string name="battery_icon_title">Ikona baterie</string>
+    <string name="battery_status_icon">Ikona</string>
+    <string name="battery_status_percentage">Procenta</string>
+    <string name="battery_status_icon_percentage">Ikona s procenty</string>
+    <string name="battery_status_circle">Kruh</string>
+    <string name="battery_status_circle_percentage">Kruh s procenty</string>
+    <string name="battery_status_dotted_circle_percentage">Tečkovaný kruh s procenty</string>
+    <string name="battery_status_dotted_circle">Tečkovaný kruh</string>
+    <string name="battery_color_title">Barva baterie</string>
+    <string name="circle_battery_animation_speed">Rychlost otáčení kruhu</string>
+    <string name="circle_battery_animation_speed_none">Žádná</string>
+    <string name="circle_battery_animation_speed_slow">Pomalá</string>
+    <string name="circle_battery_animation_speed_stock">Normalní</string>
+    <string name="circle_battery_animation_speed_fast">Rychlá</string>
+    <string name="battery_text_color">Barva textu s procenty</string>
+    <string name="battery_bolt_color">Barva nabíjecí šipky</string>
+    <string name="battery_text_charging_color">Barva textu s procenty při nabíjení</string>
+    <string name="battery_style_reset_message">Obnovit všechny barvy baterie?</string>
+
+    <!-- Category title for power sound notification specific Settings.
+         [CHAR LIMIT=40] -->
+    <string name="power_notifications_category_title">Zvuk nabíječky</string>
+    <!-- Sound settings, power notifications enable/disable, setting check box label -->
+    <string name="power_notifications_enable_title">Povolit</string>
+    <string name="power_notifications_enable_summary">Přehrát zvuk při připojení/odpojení nabíječky</string>
+    <!-- Sound settings, power notifications vibrate enable/disable, setting check box label -->
+    <string name="power_notifications_vibrate_title">Vibrovat</string>
+    <!-- Sound settings, power notifications ringtone selection, preference label -->
+    <string name="power_notifications_ringtone_title">Zvuk upozornění</string>
+    <!-- Sound settings, power notifications label for ringtone == none -->
+    <string name="power_notifications_ringtone_silent">Tichý</string>
+
+    <!-- Navigation settings -->
+    <string name="navigation_settings_options_title">Možnosti navigace</string>
+    <string name="power_menu_title">Nabídka tlačítka Vypnout</string>
+
+    <!-- Power menu -->
+    <string name="power_menu_style_summary">Změnit barvy nabídky tlačítka Vypnout</string>
+
+    <!-- Navigation bar -->
+    <string name="navigation_bar_size_42_dp_default">42 dp (výchozí)</string>
+    <string name="navigation_bar_size_36_dp">36 dp</string>
+    <string name="navigation_bar_size_30_dp">30 dp</string>
+    <string name="navigation_bar_size_24_dp">24 dp</string>
+    <string name="navigation_bar_size_48_dp_default">48 dp (výchozí)</string>
+    <string name="navigation_bar_size_44_dp">44 dp</string>
+    <string name="navigation_bar_size_40_dp">40 dp</string>
+    <string name="navigation_bar_size_42_dp">42 dp</string>
+    <string name="navigation_bar_size_0_dp">0 dp (vypnuto)</string>
+    <string name="navigation_menu_right">Vpravo</string>
+    <string name="navigation_menu_left">Vlevo</string>
+    <string name="navigation_menu_both">Obojí</string>
+    <string name="navigation_menu_default_jb_behavior">Zobrazit na požádání (výchozí)</string>
+    <string name="navigation_menu_never_show">Nikdy nezobrazovat</string>
+    <string name="navigation_menu_always_show">Vždy zobrazit</string>
+    <string name="navigation_bar">Navigační lišta</string>
+    <string name="navbar_button_cat">Tlačítka navigační lišty</string>
+    <string name="title_pref_menu_location">Pozice nabídky</string>
+    <string name="summary_pref_menu_location">Kde chcete, aby se objevily tlačitka nabídky?</string>
+    <string name="title_pref_menu_display">Viditelnost nabídky</string>
+    <string name="summary_pref_menu_display">Jak a kdy chcete, aby se tlačítka nabídky zobrazovaly?</string>
+    <string name="navbar_enable_bar">Povolit navigační lištu</string>
+    <string name="navbar_enable_bar_summary">Povolit navigační lištu</string>
+    <string name="navigation_bar_height_title">Výška navigační lišty</string>
+    <string name="navigation_bar_height_summary">Výška navigační lišty v případě zařízení na výšku</string>
+    <string name="navigation_bar_height_landscape_title">Výška navigační lišty na šířku</string>
+    <string name="navigation_bar_height_landscape_summary">Vyška navigační lišty v případě zařízení na šířku.</string>
+    <string name="navigation_bar_width_title">Šířka navigační lišty</string>
+    <string name="navigation_bar_width_summary">Vyška navigační lišty v případě umístění na straně.</string>
+    <string name="navbar_can_move">Zobrazit na šířku</string>
+    <string name="navbar_can_move_summary">Zobrazit navigační lištu na šířku na dně</string>
+    <string name="navbar_style_dimen_title">Rozměry</string>
+    <string name="navbar_button_title">Tlačítka</string>
+    <string name="navbar_targets_title">Objekty kruhu</string>
+    <string name="navbar_cat">Navigační lišta</string>
+    <string name="navbar_dimensions_reset_message">Obnovit rozměry do výchozího nastavení?</string>
+
+    <!-- Navigation bar button style -->
+    <string name="nav_bar_button_style_summary">Změnit barvu tlačítek navigační lišty</string>
+    <string name="button_transparency_title">Průhlednost tlačítka</string>
+    <string name="nav_button_color_mode_summary">Změnit barevný režim tlačítek navigační lišty</string>
+    <string name="navigation_bar_glow_tint_title">Záře barvy</string>
+
+    <!-- Advanced settings -->
+    <string name="advanced_options_settings_title">Rozšířené možnosti</string>
+
+    <!-- MediaScanner behavior on boot -->
+    <string name="media_scanner_on_boot_title">Chování skenování medií při startu</string>
+    <string name="media_scanner_on_boot_enabled">Skenovat média</string>
+    <string name="media_scanner_on_boot_ask">Zeptat se na skenování(upozornění)</string>
+    <string name="media_scanner_on_boot_disabled">Neskenovat média</string>
+
+    <!-- Basic Numbers -->
+    <string name="two">Dva</string>
+    <string name="three">Tři</string>
+    <string name="four">Čtyři</string>
+    <string name="five">Pět</string>
+    <string name="six">Šest</string>
+
+    <!-- Quiet hours -->
+    <string name="quiet_hours_title">Klidný mód</string>
+    <string name="quiet_hours_summary">Nastavení hodin, kdy má být zařízení v tichém režimu</string>
+    <string name="quiet_hours_enabled">Povolit tiché hodiny</string>
+    <string name="quiet_hours_enabled_on">Klidný mód bude vynucen</string>
+    <string name="quiet_hours_enabled_off">Notifikace budou fungovat normálně</string>
+    <string name="quiet_hours_start">Začátek klidného módu</string>
+    <string name="quiet_hours_start_summary">Kdy začít prosazovat klidný mód</string>
+    <string name="quiet_hours_end">Konec klidného módu</string>
+    <string name="quiet_hours_end_summary">Kdy zastavit prosazování klidného módu</string>
+    <string name="quiet_hours_ringer_title">Ztlumit vyzvánění</string>
+    <string name="quiet_hours_ringer_on">Vyzvánění nebude přehráváno</string>
+    <string name="quiet_hours_ringer_off">Vyzvánění bude přehráváno normálně</string>
+    <string name="quiet_hours_mute">Ztišit upozornění</string>
+    <string name="quiet_hours_mute_on">Nebudou přehrány žádné zvuky</string>
+    <string name="quiet_hours_mute_off">Zvuky budou přehrány normálně</string>
+    <string name="quiet_hours_still">Vypnout vibrace</string>
+    <string name="quiet_hours_still_on">Zařízení nebude vibrovat</string>
+    <string name="quiet_hours_still_off">Zařízení bude vibrovat normálně</string>
+    <string name="quiet_hours_dim">Ztlumit LED</string>
+    <string name="quiet_hours_dim_on">LED notifikace bude vypnuta</string>
+    <string name="quiet_hours_dim_off">LED notifikace bude fungovat normálně</string>
+    <string name="quiet_hours_haptic">Vypnout hmatovou odezvu</string>
+    <string name="quiet_hours_haptic_on">Hmatová odezva bude vypnuta</string>
+    <string name="quiet_hours_haptic_off">Hmatová odezva bude fungovat normálně</string>
+    <string name="quiet_hours_active_from">Aktivovat od</string>
+    <string name="quiet_hours_active_to">do</string>
+    <string name="quiet_hours_auto_sms_group">Automatická odpověď</string>
+    <string name="quiet_hours_auto_sms_title">Příchozí textové zprávy</string>
+    <string name="quiet_hours_auto_sms_call_title">Příchozí hovory</string>
+    <string name="quiet_hours_auto_string_title">Odeslat odpověď</string>
+    <string name="quiet_hours_auto_string_explain">Tato zpráva bude odeslána všem co Vás pokusí kontaktovat zatím co bude aktivní Klidný mód</string>
+    <string name="quiet_hours_auto_sms_null">[Automatická zpráva] Ozvu se Vám jakmile budu moci..</string>
+    <string name="quiet_hours_auto_disabled">Zakázáno</string>
+    <string name="quiet_hours_auto_enabled">Všechny čísla</string>
+    <string name="quiet_hours_auto_contacts">Pouze kontakty</string>
+    <string name="quiet_hours_bypass_group">Vynechat klidný mód</string>
+    <string name="quiet_hours_sms_code_null">[Alarm]</string>
+    <string name="quiet_hours_sms_bypass_title">Vynechat textové zprávy</string>
+    <string name="quiet_hours_sms_code_title">Klíčová textová zpráva</string>
+    <string name="quiet_hours_sms_code_explain">Pokud příchozí zpráva obsahuje tento text, Vaše zařízení jí ohlasí alarmem.</string>
+    <string name="quiet_hours_call_bypass_title">Vynechat příchozí hovor</string>
+    <string name="quiet_hours_calls_required_title">Počet hovorů za 30 minut</string>
+    <string name="quiet_hours_calls_required_summary">" hovorů pro vynechání klidného módu"</string>
+    <string name="quiet_hours_bypass_ringtone_title">Přehrát vyzvánění</string>
+    <string name="quiet_hours_bypass_ringtone_loop_title">Vyzváněcí smyčka</string>
+    <string name="quiet_hours_bypass_ringtone_loop_summary_on">Vyzvánění bude přehráváno dokud nebude zrušeno.</string>
+    <string name="quiet_hours_bypass_ringtone_loop_summary_off">Vyzvánění bude přehráno pouze jednou</string>
+    <string name="quiet_hours_alarm_dismiss">Zrušit Alarm</string>
+    <string name="quiet_hours_alarm_and">" a "</string>
+    <string name="quiet_hours_alarm_dialog_title">KLIDNÝ MÓD VYNECHÁN</string>
+    <string name="quiet_hours_alarm_message">" splnilo požadavky pro vynechání klidného módu!"</string>
+
+    <!-- time range preference -->
+    <string name="start_time_title">Začátek</string>
+    <string name="end_time_title">Konec</string>
+
+    <!-- Display : Rotation -->
+    <string name="display_rotation_title">Otáčení</string>
+    <string name="display_rotation_disabled">Zakázáno</string>
+    <string name="display_rotation_unit">stupně</string>
+    <string name="display_rotation_category_title">Režim otáčení</string>
+    <string name="display_rotation_0_title">0 stupňů</string>
+    <string name="display_rotation_90_title">90 stupňů</string>
+    <string name="display_rotation_180_title">180 stupňů</string>
+    <string name="display_rotation_270_title">270 stupňů</string>
+
+    <!-- Lock Screen ASS -->
+    <string name="lock_screen_title">Zámek obrazovky</string>
+    <string name="lock_screen_summary">Zobrazit nebo upravit objekty a zkratky posuvníku</string>
+
+    <!-- Lock Screen Targets -->
+    <string name="lockscreen_target_info">Pro přiřazení zkratky přesuňte posuvník na požadovanou pozici</string>
+    <string name="lockscreen_target_title">Zkratky v posuvníku</string>
+    <string name="lockscreen_target_summary">Zobrazit nebo změnit vlastní zktratky pro zámek obrazovky</string>
+    <string name="lockscreen_target_color_title">Barva ikony objektu</string>
+    <string name="lockscreen_eight_targets_title">Osm objektů posuvníku</string>
+    <string name="lockscreen_eight_targets_summary">Povolit osm vlastních objektů posuvníku.</string>
+    <string name="lockscreen_enable_eight_targets_dialog">Změna tohoto nastavení resetuje Vaše aktuální nastavení zámku obrazovky.</string>
+    <string name="lockscreen_enable_eight_targets_enabled_dialog">\n\nS osmi povolenými objekty zamykací obrazovky nemůžete používat Vaše zkratky zamykací obrazovky.</string>
+    <string name="lockscreen_glowpad_torch_title">Zapnutí svítilny posuvníkem</string>
+    <string name="lockscreen_glowpad_torch_summary">Dvojklikem a podržením posuvníku zapnete svítilnu</string>
+    <string name="lockscreen_target_reset">Zkratky zámku obrazovky byly obnoveny do původních hodnot</string>
+    <string name="lockscreen_target_reset_message">Odstranit všechny uživatelsky vytvořené zktratky a obnovit výchozí nastavení?</string>
+    <string name="lockscreen_target_empty">Prázdné</string>
+    <string name="lockscreen_target_edit_title">Upravit zktratku a ikonu</string>
+    <string name="lockscreen_target_edit_msg">Vybrat nebo změnit požadovanou aplikaci nebo činnost a související ikonu</string>
+
+    <!-- Lockscreen Shortcuts -->
+    <string name="lockscreen_shortcuts_title">Zkratky</string>
+    <string name="lockscreen_shortcuts_summary">Zobrazit nebo změnit vlastní zkratky zámku obrazovky</string>
+    <string name="lockscreen_shorcuts_longpress_title">Dlouhý stiskt zkratek</string>
+    <string name="lockscreen_shorcuts_longpress_summary">Otevřít vlastní zkratky zámku obrazovky při dlouhém stistku</string>
+
+    <!-- Lock screen targets and shortcuts -->
+    <string name="picker_activities">Aktivity</string>
+    <string name="select_custom_activity_title">Zvolte vlastní činnost</string>
+    <string name="icon_picker_alarm">Alarm</string>
+    <string name="icon_picker_browser">Prohlížeč</string>
+    <string name="icon_picker_calendar">Kalendář</string>
+    <string name="icon_picker_camera">Fotoaparát</string>
+    <string name="icon_picker_email">Email</string>
+    <string name="icon_picker_email2">Email Holo</string>
+    <string name="icon_picker_facebook">Facebook</string>
+    <string name="icon_picker_gallery">Galerie</string>
+    <string name="icon_picker_google_small">Google (malý)</string>
+    <string name="icon_picker_googleplus">Google Plus</string>
+    <string name="icon_picker_googletalk">Hangouts</string>
+    <string name="icon_picker_maps">Mapy</string>
+    <string name="icon_picker_sms">Zprávy</string>
+    <string name="icon_picker_movie">Film</string>
+    <string name="icon_picker_music">Hudba</string>
+    <string name="icon_picker_nav_normal">Navigace</string>
+    <string name="icon_picker_phone">Telefon</string>
+    <string name="icon_picker_podcast">Podcast</string>
+    <string name="icon_picker_rss">Rss</string>
+    <string name="icon_picker_search">Hledat</string>
+    <string name="icon_picker_twitter">Twitter</string>
+
+    <!--Quick unlock -->
+    <string name="unlock_quick_unlock_control_title">Rychlé odemknutí</string>
+    <string name="unlock_quick_unlock_control_summary">Automatické odemknutí pokud je zadán správný PIN/heslo</string>
+
+    <!-- Lockscreen style settings -->
+    <string name="lockscreen_style_reset_message">Obnovit všechny barvy zámku obrazovky?</string>
+    <string name="lockscreen_icon_title">Ikona zámku</string>
+    <string name="lockscreen_lock_icon_custom">Vlastní ikona</string>
+    <string name="lockscreen_lock_icon_slim">Slim ikona</string>
+    <string name="lockscreen_lock_icon_default">Výchozí ikona</string>
+    <string name="lockscreen_colorize_handle_title">Vlastní barvy</string>
+    <string name="lockscreen_colorize_handle_summary">Barva zámku bude nastavena v prostoru zámku</string>
+    <string name="lockscreen_style_title">Styl téma</string>
+    <string name="lockscreen_frame_color_title">Barva rámu</string>
+    <string name="lockscreen_frame_color_summary">Barva widgetu a odemykacího rámu</string>
+    <string name="lockscreen_lock_color_title">Barva zámku</string>
+    <string name="lockscreen_lock_color_summary">Barva zámku</string>
+    <string name="lockscreen_dots_color_title">Barva teček</string>
+    <string name="lockscreen_dots_color_summary">Barva zářících teček</string>
+
+    <!-- Lockscreen widget settings -->
+    <string name="lockscreen_widgets_title">Widgety</string>
+    <string name="lockscreen_camera_widget_title">Povolit widget fotoaparátu</string>
+    <string name="lockscreen_camera_widget_summary">Zobrazit zabezpečený widget kamery na zámku obrazovky</string>
+    <string name="lockscreen_maximize_widgets_title">Maximální velikost</string>
+    <string name="lockscreen_maximize_widgets_summary">Zobrazit widget na maximální velikost při rozsvícení obrazovky</string>
+    <string name="lockscreen_disable_hints_title">Zakázat počáteční náznaky stránek</string>
+    <string name="lockscreen_disable_hints_summary">Zakáže záři, která obklopuje stránky widgetu na zámku obrazovky v režimu na výšku</string>
+    <string name="lockscreen_use_widget_container_carousel_title">Povolit pohyblivý widget na výšku</string>
+    <string name="lockscreen_use_widget_container_carousel_summary">Při přepínání mezi widgety a zámkem obrazovky použít pohyblivou animaci</string>
+
+    <!-- Lockscreen pin shuffle -->
+    <string name="lock_numpad_random_title">Změna pořadí čísel PIN zadání</string>
+    <string name="lock_numpad_random_dialog_title">PIN zadání náhodné</string>
+    <string name="lock_numpad_random_off">Zakázáno</string>
+    <string name="lock_numpad_random_always">Vždy</string>
+    <string name="lock_numpad_random_on_request">Na požadavek</string>
+
+    <!-- Lock before unlock -->
+    <string name="lock_before_unlock_title">Zobrazit posuvník před bezpečném odemknutí</string>
+    <string name="lock_before_unlock_summary">Zobrazit posuvník před mechanismem bezpečného odemknutí</string>
+
+    <!-- Sizes for pattern lockscreen -->
+    <string name="lock_pattern_size_3">3x3</string>
+    <string name="lock_pattern_size_4">4x4</string>
+    <string name="lock_pattern_size_5">5x5</string>
+    <string name="lock_pattern_size_6">6x6</string>
+
+    <!-- Notification drawer background -->
+    <string name="notification_style_title">Styl pozadí</string>
+    <string name="notification_style_summary">Zobrazit nebo změnit pozadí notifikační lišty a rychlého nastavení</string>
+    <string name="notification_wallpaper_title">Pozadí</string>
+    <string name="notification_wallpaper_landscape_title">Rozdílné pozadí krajiny</string>
+    <string name="notification_background_color_fill">Barevná výplň</string>
+    <string name="notification_background_custom_image">Vlastní obrázek</string>
+    <string name="notification_background_default_wallpaper">Výchozí pozadí</string>
+    <string name="notification_drawer_custom_background_dialog_title">Vyberte barvu</string>
+    <string name="notif_wallpaper_alpha_title">Průhlednost pozadí</string>
+    <string name="notif_alpha_title">Průhlednost upozornění</string>
+
+    <!-- Less Notification sounds -->
+    <string name="notifications_category_title">Upozornění</string>
+    <string name="less_notification_sounds_title">Méně časté zvuky oznámení</string>
+    <string name="less_notification_sounds_summary">Limitovat zvuky upozornění každé aplikace jednou za určitý čas</string>
+    <string name="less_notification_sounds_default">Výchozí chování</string>
+    <string name="less_notification_sounds_3s">3 sekundy</string>
+    <string name="less_notification_sounds_5s">5 sekund</string>
+    <string name="less_notification_sounds_10s">10 sekund</string>
+    <string name="less_notification_sounds_15s">15 sekund</string>
+    <string name="less_notification_sounds_30s">30 sekund</string>
+    <string name="less_notification_sounds_45s">45 sekund</string>
+    <string name="less_notification_sounds_1m">1 minuta</string>
+    <string name="less_notification_sounds_2m">2 minuty</string>
+    <string name="less_notification_sounds_5m">5 minut</string>
+
+    <!-- Quick Settings -->
+    <string name="quick_settings_title">Panel rychlého nastavení</string>
+    <string name="tile_picker_title">Dlaždice a rozmístění</string>
+    <string name="tile_picker_summary">Zobrazení, změna rozmístění či vlastností zvolených dlaždic</string>
+    <string name="tile_choose_title">Zvolte dlaždici</string>
+    <string name="title_tile_airplane">Režim V letadle</string>
+    <string name="title_tile_battery">Baterie</string>
+    <string name="title_tile_bluetooth">Bluetooth</string>
+    <string name="title_tile_brightness">Jas</string>
+    <string name="title_tile_custom">Vlastní</string>
+    <string name="title_tile_sleep">Uspat</string>
+    <string name="title_tile_location">Lokace</string>
+    <string name="title_tile_torch">Svítilna</string>
+    <string name="title_tile_lockscreen">Zámek obrazovky</string>
+    <string name="title_tile_lte">LTE</string>
+    <string name="title_tile_mobiledata">Mobilní data</string>
+    <string name="title_tile_autorotate">Orientace</string>
+    <string name="title_tile_settings">Nastavení</string>
+    <string name="title_tile_sound">Zvuk</string>
+    <string name="title_tile_sync">Synchronizace</string>
+    <string name="title_tile_wifiap">Wi-Fi AP</string>
+    <string name="title_tile_wifi">Wi-Fi</string>
+    <string name="title_tile_user">Přepnutí uživatele</string>
+    <string name="title_tile_networkmode">Režim sítě</string>
+    <string name="title_tile_nfc">NFC</string>
+    <string name="title_tile_screen_timeout">Zhasínání obrazovky</string>
+    <string name="title_tile_quick_record">Rychlá nahrávka</string>
+    <string name="title_tile_quiet_hours">Tiché hodiny</string>
+    <string name="title_tile_volume">Hlasitost</string>
+    <string name="title_tile_expanded_desktop">Rozšířená plocha</string>
+    <string name="title_tile_music">Hudba</string>
+    <string name="title_tile_reboot">Restartovat</string>
+    <string name="title_tile_theme">Přepínač téma</string>
+    <string name="dynamic_tile_ime_switcher">Změna IME</string>
+    <string name="dynamic_tile_usb_tether">Sdílení USB</string>
+    <string name="dynamic_tile_alarm">Alarm</string>
+    <string name="dynamic_tile_bugreport">Bugreport</string>
+    <string name="dynamic_tiles_title">Dynamické dlaždice</string>
+    <string name="tiles_reset_message">Obnovit nastavení a rozmístění dlaždic do výchozího nastavení?</string>
+    <string name="disable_qs">Panel rychlého nastavení není povolen</string>
+    <string name="disable_qs_message">Všechny dlaždice byly odstraněny. Rychlé nastavení je zakázáno.\n\nPro povolení přidejte dlaždici.</string>
+    <string name="help_qs_message">Pro přidání dlaždice rychlého nastavení, zmáčkněte tlačítko Přidat a vyberte dlaždici. Chcete-li změnit uspořádání dlaždic, dlouze stiskněte dlaždici a přesuňte na požadovanou pozici. Chcete-li odstranit dlaždice, přetáhněte ji na tlačítko Odstranit, které se objeví během tažení.\n\nChcete-li nastavit dynamické dlaždice stiskněte příslušnou ikonu v pravém horním rohu obrazovky\n\nChcete-li zakázat rychlé nastavení, odstraňte všechny dlaždice.</string>
+    <string name="custom_tile_dialog_text">Každá akce přidá dlaždici nový stav. Každy klik provede změnu na další stav. Dlouhý stisk pro přidání akcí s dlouhým stiskem. Pokud neexistuje akce s jednoduchým klikem, bude použita ikona for akci s dlouhým stiskem. Toto umožňuje měnit stav klikáním a spouštěním akcí dlouhým stiskem.</string>
+    <string name="custom_tile_dialog_title">Vlastní akce dlaždice</string>
+    <string name="custom_toggle_extras">Speciální vlastní dlaždice</string>
+    <string name="custom_toggle_collapse_check">Stínově sbalit upozornění</string>
+    <string name="custom_toggle_match_state_check">Klikněte na akci odpovídající ikoně</string>
+    <string name="custom_tile_long_press">Dlouhý stisk:</string>
+    <string name="custom_tile_null_warning">Nejprve musíte nastavit akci</string>
+
+    <!-- QuickSettings style options -->
+    <string name="quicksettings_tiles_style">Styl</string>
+    <string name="summary_quicksettings_tiles_style">Zobrazit nebo změnit nastavení stylu rychlého nastavení</string>
+    <string name="quicksettings_tiles_style_additional_options">Další možnosti</string>
+    <string name="tiles_per_row_title">Dlaždice na řádek</string>
+    <string name="tiles_per_row_duplicate_landscape_title">Velikost kajiny</string>
+    <string name="tiles_per_row_duplicate_landscape_summary">Krajinový pohled zdvojnásobí počet dlaždic na řádek</string>
+    <string name="quick_tiles_bg_color_title">Barva pozadí dlaždic</string>
+    <string name="quick_tiles_bg_pressed_color_title">Barva pozadí dlaždice po stisknutí</string>
+    <string name="quick_tiles_text_color_title">Barva textu dlaždic</string>
+    <string name="quick_tiles_alpha_title">Pozadí a průhlednost dlaždic</string>
+    <string name="qs_style_reset_message">Obnovit všechny barvy do výchozích hodnot?</string>
+
+    <string name="pref_network_mode_title">Režimy sítě</string>
+    <string name="pref_screentimeout_mode_title">Režimy zhasínání obrazovky</string>
+    <string name="pref_ring_mode_title">Režimy zvuku</string>
+    <string name="pref_music_mode_title">Režimy hudby</string>
+    <string name="screentimeout_mode1">15s | 1m | 5m | Nikdy</string>
+    <string name="screentimeout_mode2">30s | 2m | 5m | Nikdy</string>
+    <string name="sound_mode_silent">Tichý</string>
+    <string name="sound_mode_vibrate">Vibrace</string>
+    <string name="sound_mode_sound">Zvuk</string>
+    <string name="sound_mode_soundVibrate">Zvuk a vibrace</string>
+    <string name="music_tile_mode_background">Zobrazit obal alba</string>
+    <string name="music_tile_mode_tracktitle">Zobrazit název skladby</string>
+
+    <!-- QuickSettings: Quick Pulldown -->
+    <string name="title_quick_pulldown">Rychlé vysunutí nabídky</string>
+    <string name="summary_quick_pulldown">Tažením dolů z %1$s strany stavového řádku bude vysunuta rychlá nabídka nastavení</string>
+    <string name="quick_pulldown_off">Zrušeno</string>
+    <string name="quick_pulldown_left">Nalevo</string>
+    <string name="quick_pulldown_right">Napravo</string>
+
+    <!-- Stylus Gestures -->
+    <string name="gestures_settings_title">Gesta stylusem</string>
+    <string name="category_spen_title">Gesta stylusem</string>
+    <string name="enable_subcat_title">Stylus</string>
+    <string name="enable_spen_title_head">Povolit gesta</string>
+    <string name="enable_spen_summary_head">Spustit vlastní akci pomocí gesta a podržením tlačítka na stylusu</string>
+    <string name="gestures_subcat_title">Gesta</string>
+    <string name="gestures_left_spen_title_head">Levé posunutí</string>
+    <string name="gestures_left_spen_summary_head">Spuštění vlastní akce při levém posunutí</string>
+    <string name="gestures_right_spen_title_head">Pravé posunutí</string>
+    <string name="gestures_right_spen_summary_head">Spuštění vlastní akce při pravém posunutí</string>
+    <string name="gestures_up_spen_title_head">Horní posunutí</string>
+    <string name="gestures_up_spen_summary_head">Spuštění vlastní akce při horním posunutí</string>
+    <string name="gestures_down_spen_title_head">Dolní posunutí</string>
+    <string name="gestures_down_spen_summary_head">Spuštění vlastní akce při dolním posunutí</string>
+    <string name="gestures_long_spen_title_head">Dlouhý dotyk</string>
+    <string name="gestures_long_spen_summary_head">Spuštění vlastní akce při dlouhém dotyku</string>
+    <string name="gestures_double_spen_title_head">Dvojklik</string>
+    <string name="gestures_double_spen_summary_head">Spuštění vlastní akce při dvojkliku</string>
+
+    <!-- Gestures Options -->
+    <string name="gestures_action_empty">Bez akce</string>
+    <string name="gestures_action_home">Domů</string>
+    <string name="gestures_action_back">Zpět</string>
+    <string name="gestures_action_menu">Nabídka</string>
+    <string name="gestures_action_search">Spustit vyhledávání</string>
+    <string name="gestures_action_recent">Nedávné aplikace</string>
+
+    <!-- stylus gestures support -->
+    <string name="stylus_app_not_installed">%s není nainstalován</string>
+
+    <!-- Stylus Icon -->
+    <string name="stylus_icon_enabled_title">Zobrazit ikonu, když je použitý stylus</string>
+    <string name="stylus_icon_enabled_summary">Zobrazit ikonu při najetí kurzoru nebo kreslení pomocí tužky</string>
+
+    <!-- Themes -->
+    <string name="theme_settings_title">Skutečně tmavý slim</string>
+    <string name="theme_auto_mode_title">Přepnout téma</string>
+    <string name="theme_auto_mode_off">Manuálně</string>
+    <string name="theme_auto_mode_lightsensor">Na změnu světelných podmínek</string>
+    <string name="theme_auto_mode_twilight">Na denní</string>
+    <string name="theme_auto_switch_mode_error">Automatický režim změny světelných podmínek je povolen. Ruční přepnutí není možné.</string>
+
+    <!-- Preference category for LAN development settings. [CHAR LIMIT=25] -->
+    <string name="debug_LAN_category">Nastavení sítě LAN</string>
+    <!-- Hostname setting -->
+    <string name="device_hostname">Hostitelské jméno zařízení</string>
+
+    <!-- Chamber of Secrets -->
+    <string name="chamber_title">Tajemná komnata</string>
+    <string name="chamber_toast">Tajemná komnata byla otevřena</string>
+
+    <!-- Volume Keys Media Control -->
+    <string name="volume_keys_control_media_stream">Ovládání médií</string>
+    <string name="volume_keys_control_media_stream_summary">Tlačítka hlasitosti ovládají média místo upozornění</string>
+
+    <!-- Rescan media volume -->
+    <string name="storage_rescan_media">Prohledat úložiště pro média</string>
+    <string name="storage_rescan_media_complete">Prohledávání dokončeno</string>
+
+    <!-- Delete apn confirmation dialog message -->
+    <string name="confirm_delete_apn">Položka APN bude smazána.</string>
+
+    <!-- Minimum Vibration Duration -->
+    <string name="minimum_vibration_duration">Minimální délka vibrací</string>
+
+    <!-- ListView animation -->
+    <string name="interface_settings_animation_title">Možnosti animace</string>
+    <string name="listview_animation_title">ListView Animace</string>
+    <string name="listview_off">Výchozí</string>
+    <string name="listview_wave_left">Vlna (vlevo)</string>
+    <string name="listview_wave_right">Vlna (vpravo)</string>
+    <string name="listview_alpha">Alpha</string>
+    <string name="listview_scale">Měřítko</string>
+    <string name="listview_stack_top">Spousta (nahoře)</string>
+    <string name="listview_stack_bottom">Štos (dole)</string>
+    <string name="listview_unfold">Rozvinout</string>
+    <string name="listview_fold">Složit</string>
+    <string name="listview_translate_left">Překládat (vlevo)</string>
+    <string name="listview_translate_right">Překládat (vpravo)</string>
+
+    <!-- ListView interpolator -->
+    <string name="listview_interpolator_title">Zobrazení interpolátoru</string>
+    <string name="listview_accelerate_interpolator">Urychlit</string>
+    <string name="listview_decelerate_interpolator">Zpomalit</string>
+    <string name="listview_accelerate_decelerate_interpolator">Zrychlují a zpomalují</string>
+    <string name="listview_anticipate_interpolator">Předvídat</string>
+    <string name="listview_overshoot_interpolator">Přestřelit</string>
+    <string name="listview_anticipate_overshoot_interpolator">Předvídání a překročení</string>
+    <string name="listview_bounce_interpolator">Odskočit</string>
+
+    <!-- Advanced reboot options -->
+    <string name="advanced_reboot_title">Rozšířený restart</string>
+    <string name="advanced_reboot_summary">Pokud povoleno, v nabídce vypnutí jsou také možnosti restartovat zařízení do recovery nebo bootloaderu</string>
+    <string name="advanced_reboot_dialog_title">Nabídka rozšířeného restartu</string>
+    <string name="advanced_reboot_disabled">Zakázat</string>
+    <string name="advanced_reboot_hide_on_keyguard">Skrýt na zamykací obrazovce</string>
+    <string name="advanced_reboot_show_always">Vždy zobrazit</string>
+
+</resources>
diff --git a/res/values-es/slim_strings.xml b/res/values-es/slim_strings.xml
index ddc3e15878c..10243b0213e 100644
--- a/res/values-es/slim_strings.xml
+++ b/res/values-es/slim_strings.xml
@@ -33,6 +33,8 @@
     <string name="interface_settings_title">Interfaz</string>
     <string name="navigation_settings_title">Navegación</string>
     <string name="slim_center_title">SlimCenter</string>
+    <!-- Advanced, Device specific (DeviceParts) settings  -->
+    <string name="device_settings_title">Dispositivo</string>
 
     <!-- Color Picker -->
     <string name="dialog_color_picker">Selector de color</string>
@@ -122,6 +124,8 @@
     <string name="wifi_setting_countrycode_error">Ocurrió un error al establecer el código de país.</string>
     <!-- Wi-Fi settings diables message if Wifi is off-->
     <string name="wifi_setting_countrycode_disabled">Habilitar Wi-Fi para cambiar esta opción.</string>
+    <!-- WiFi forget all networks -->
+    <string name="wifi_menu_forget_all">Olvidar todas las redes</string>
 
     <!-- Status bar -->
     <string name="status_bar_title">Barra de estado</string>
@@ -170,6 +174,13 @@
     <string name="wakeup_when_plugged_unplugged_title">Despertar al cargar</string>
     <string name="wakeup_when_plugged_unplugged_summary">Despierta el dispositivo si se conecta/desconecta al cargador.</string>
 
+    <!-- Volume Overlay -->
+    <string name="volume_overlay_title">Estilo del panel de Volumen</string>
+    <string name="volume_overlay_single">Único</string>
+    <string name="volume_overlay_expandable">Expandible</string>
+    <string name="volume_overlay_expanded">Expandido</string>
+    <string name="volume_overlay_disable">Deshabilitado</string>
+
     <!-- Sound settings -->
     <string name="sound_title">Sonido</string>
     <string name="advanced_sound_title">Opciones avanzadas</string>
@@ -178,6 +189,7 @@
 
     <string name="volume_adjust_sounds_enable_title">Sonido de ajuste de volumen</string>
     <string name="volume_adjust_sounds_enable_summary">Reproduce un sonido cuando se cambia el volumen con las teclas físicas.</string>
+    <string name="link_volume_ringtones">Vincular volumen de tono de llamada &amp; notificaciones</string>
     <string name="volume_ring_only_description">Tono de llamada</string>
 
     <!-- Sound settings screen, setting check box label -->
@@ -455,11 +467,17 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <!-- Notification drawer settings  -->
     <string name="notification_drawer_qs_title">Panel de notificaciones &amp; ajustes rápidos</string>
     <string name="notification_drawer_title">Panel de notificaciones</string>
-    <string name="notification_hide_carrier_title">Ocultar nombre de operador</string>
-    <string name="notification_hide_carrier_summary">Ocultar nombre de operador y red Wi-Fi en el panel de notificaciones</string>
     <string name="notification_shortcuts_settings_title">Accesos directos</string>
     <string name="notification_shortcuts_settings_summary">Mostrar accesos directos en el panel de notificaciones</string>
 
+    <!-- Notification hide labels -->
+    <string name="notification_hide_labels_title">Ocultar wifi/operador en panel notif.</string>
+    <string name="notification_hide_labels_disable">Mostrar todo</string>
+    <string name="notification_hide_labels_carrier">Ocultar operador</string>
+    <string name="notification_hide_labels_wifi">Ocultar red WiFi</string>
+    <string name="notification_hide_labels_all">Ocultar todo</string>
+    <string name="notification_hide_labels_text">en el panel de notificaciones</string>
+
     <!-- StatusBar Battery Settings -->
     <string name="battery_icon_title">Icono de batería</string>
     <string name="battery_status_icon">Icono</string>
@@ -761,9 +779,11 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <string name="title_tile_battery">Batería</string>
     <string name="title_tile_bluetooth">Bluetooth</string>
     <string name="title_tile_brightness">Brillo</string>
+    <string name="title_tile_contact">Contacto</string>
     <string name="title_tile_sleep">Apagar pantalla</string>
     <string name="title_tile_location">Localización</string>
     <string name="title_tile_torch">Linterna</string>
+    <string name="title_tile_custom">Personalizado</string>
     <string name="title_tile_lockscreen">Bloqueo de pantalla</string>
     <string name="title_tile_lte">LTE</string>
     <string name="title_tile_mobiledata">Datos móviles</string>
@@ -791,6 +811,13 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <string name="disable_qs">Ajustes rápidos deshabilitados</string>
     <string name="disable_qs_message">Todos los botones se han borrado. Los ajustes rápidos están deshabilitados.\n\nPara habilitarlos añade un botón.</string>
     <string name="help_qs_message">Para añadir un botón de ajustes rápidos, toca en el botón Añadir y selecciona el botón que quieras. Para reordenar los botones pulsa prolongadamente en uno y arrastralo a la posición que quieras. Si quieres eliminar un botón, arrástralo sobre el botón Borrar que aparece al arrastrarlo.\n\nPara deshabilitar los ajustes rápidos, borra todos los botones.\n\nPara configurar los botones dinámicos toca ,en la zona superior derecha de la panatalla, el icono correspondiente.\n\nPara deshabilitar el panel de ajustes rápidos elimina todos los botones.</string>
+    <string name="custom_tile_dialog_text">Cada acción creará un nuevo estado al interruptor. Cada toque cambiará al siguiente estado. Pulsa de forma prolongada para añadir acciones de pulsación larga. Si no se definen acciones al tocar se usará la pulsación larga como acción del interruptor. Esto permite cambiar el estado tocando y lanzar acciones con pulsación prolongada.</string>
+    <string name="custom_tile_dialog_title">Acciones del int. persolanizado</string>
+    <string name="custom_toggle_extras">Extras del int. personalizado</string>
+    <string name="custom_toggle_collapse_check">Cerrar panel de notificaciones</string>
+    <string name="custom_toggle_match_state_check">Acción al tocar concuerda con el icono</string>
+    <string name="custom_tile_long_press">Pulsación larga:</string>
+    <string name="custom_tile_null_warning">Primero se debe definir una acción</string>
 
     <!-- QuickSettings style options -->
     <string name="quicksettings_tiles_style">Estilo</string>
@@ -825,4 +852,111 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <string name="quick_pulldown_left">Izquierda</string>
     <string name="quick_pulldown_right">Derecha</string>
     
+    <!-- QuickSettings: Quick Collapse -->
+    <string name="title_collapse_panel">Cierre rápido</string>
+    <string name="summary_collapse_panel">Cierra el panel de notificaciones tras tocar</string>
+
+    <!-- QuickSettings: Smart Pulldown -->
+    <string name="smart_pulldown_title">Despliegue inteligente</string>
+    <string name="smart_pulldown_summary">Despliega el panel de ajustes rápidos cuando no hay notificaciones %1$s</string>
+    <string name="smart_pulldown_off">Desactivado</string>
+    <string name="smart_pulldown_dismissable">Desechables</string>
+    <string name="smart_pulldown_persistent">Persistentes</string>
+
+     <!-- Stylus Gestures -->
+    <string name="gestures_settings_title">Gestos con Stylus</string>
+    <string name="category_spen_title">Gestos con Stylus</string>
+    <string name="enable_subcat_title">Stylus</string>
+    <string name="enable_spen_title_head">Habilitar gestos con stylus</string>
+    <string name="enable_spen_summary_head">Lanzar acciones personalizadas al deslizar el stylus con el botón presionado. Atención: las aplicaciones no podrán recibir toques al estar el botón del stylys presionado</string>
+    <string name="gestures_subcat_title">Gestos</string>
+    <string name="gestures_left_spen_title_head">Deslizar a la izquierda</string>
+    <string name="gestures_left_spen_summary_head">Lanza una acción personalizada al deslizar a la izquierda</string>
+    <string name="gestures_right_spen_title_head">Deslizar a la derecha</string>
+    <string name="gestures_right_spen_summary_head">Lanza una acción personalizada al deslizar a la derecha</string>
+    <string name="gestures_up_spen_title_head">Deslizar hacia arriba</string>
+    <string name="gestures_up_spen_summary_head">Lanza una acción personalizada al deslizar hacia arriba</string>
+    <string name="gestures_down_spen_title_head">Deslizar hacia abajo</string>
+    <string name="gestures_down_spen_summary_head">Lanza una acción personalizada al deslizar hacia abajo</string>
+    <string name="gestures_long_spen_title_head">Pulsación larga</string>
+    <string name="gestures_long_spen_summary_head">Lanza una acción personalizada al hacer una pulsación larga</string>
+    <string name="gestures_double_spen_title_head">Doble pulsación</string>
+    <string name="gestures_double_spen_summary_head">Lanza una acción personalizada al hacer una pulsación doble</string>
+
+    <!-- Gestures Options -->
+    <string name="gestures_action_empty">Sin acción</string>
+    <string name="gestures_action_home">Emular botón Inicio</string>
+    <string name="gestures_action_back">Emular botón Atrás</string>
+    <string name="gestures_action_menu">Emular botón Menú</string>
+    <string name="gestures_action_search">Lanzar Búsqueda</string>
+    <string name="gestures_action_recent">Aplicaciones recientes</string>
+
+    <!-- stylus gestures support -->
+    <string name="stylus_app_not_installed">%s no está instalada</string>
+
+    <!-- Stylus Icon -->
+    <string name="stylus_icon_enabled_title">Mostrar icono cuando se usa stylus</string>
+    <string name="stylus_icon_enabled_summary">Muestra un icono mientras se está usando el stylus</string>
+
+    <!-- Themes -->
+    <string name="theme_settings_title">The real dark slim</string>
+    <string name="theme_auto_mode_title">Cambiar tema</string>
+    <string name="theme_auto_mode_off">Manual</string>
+    <string name="theme_auto_mode_lightsensor">Al cambuir las condiciones de luz</string>
+    <string name="theme_auto_mode_twilight">en función de la hora del día</string>
+    <string name="theme_auto_switch_mode_error">El cambio automático en función de las condiciones de luz está habilitado. El cambio manual no puede utilizarse.</string>
+
+    <!-- Preference category for LAN development settings. [CHAR LIMIT=25] -->
+    <string name="debug_LAN_category">Configuración LAN</string>
+    <!-- Hostname setting -->
+    <string name="device_hostname">Nombre del dispositivo</string>
+
+    <!-- Chamber of Secrets -->
+    <string name="chamber_title">Chamber of secrets</string>
+    <string name="chamber_toast">The chamber of secrets has opened</string>
+
+    <!-- Volume Keys Media Control -->
+    <string name="volume_keys_control_media_stream">Media control</string>
+    <string name="volume_keys_control_media_stream_summary">Las teclas de volumen controlan el volumen de música en lugar de las notificaciones</string>
+
+    <!-- Rescan media volume -->
+    <string name="storage_rescan_media">Buscar ficheros multimedia en la tarjeta de almacenamiento</string>
+    <string name="storage_rescan_media_complete">Búsqueda completada</string>
+    
+    <!-- Minimum Vibration Duration -->
+    <string name="minimum_vibration_duration">Duración mínima de la vibración</string>
+
+    <!-- ListView animation -->
+    <string name="interface_settings_animation_title">Opciones de animaciones</string>
+    <string name="listview_animation_title">Animación de listados</string>
+    <string name="listview_off">Predeterminado</string>
+    <string name="listview_wave_left">Ondas (izda)</string>
+    <string name="listview_wave_right">Ondas (dcha)</string>
+    <string name="listview_alpha">Alfa</string>
+    <string name="listview_scale">Escalar</string>
+    <string name="listview_stack_top">Pila (arriba)</string>
+    <string name="listview_stack_bottom">Pila (abajo)</string>
+    <string name="listview_unfold">Desplegar</string>
+    <string name="listview_fold">Plegar</string>
+    <string name="listview_translate_left">Trasladar (izda)</string>
+    <string name="listview_translate_right">Trasladar (dcha)</string>
+
+    <!-- ListView interpolator -->
+    <string name="listview_interpolator_title">Interpolador de listados</string>
+    <string name="listview_accelerate_interpolator">Acelerar</string>
+    <string name="listview_decelerate_interpolator">Decelerar</string>
+    <string name="listview_accelerate_decelerate_interpolator">Acelerar y decelerar</string>
+    <string name="listview_anticipate_interpolator">Anticipar</string>
+    <string name="listview_overshoot_interpolator">Excedido</string>
+    <string name="listview_anticipate_overshoot_interpolator">Anticipar y exceder</string>
+    <string name="listview_bounce_interpolator">Rebote</string>
+
+    <!-- Advanced reboot options -->
+    <string name="advanced_reboot_title">Reinicio avanzado</string>
+    <string name="advanced_reboot_summary">Mostrar opciones para reiniciar en modo recovery y bootloader en el menú de apagado</string>
+    <string name="advanced_reboot_dialog_title">Menu de reinicio avanzado</string>
+    <string name="advanced_reboot_disabled">Deshabilitado</string>
+    <string name="advanced_reboot_hide_on_keyguard">Ocultar en pantalla de bloqueo</string>
+    <string name="advanced_reboot_show_always">Mostrar siempre</string>
+
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2e740bec620..e83165f20dd 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2042,4 +2042,6 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Hacer foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Seleccionar foto de la galería"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="adb_notify">Notificación de Debug USB</string>
+    <string name="adb_notify_summary">Muestra una notificación cuando se conecta el dispositivo a un USB</string>
 </resources>
diff --git a/res/values-hu/slim_strings.xml b/res/values-hu/slim_strings.xml
index 43353ca56c4..8d4879b83fd 100644
--- a/res/values-hu/slim_strings.xml
+++ b/res/values-hu/slim_strings.xml
@@ -33,6 +33,9 @@
     <string name="interface_settings_title">Interfész</string>
     <string name="navigation_settings_title">Navigáció</string>
     <string name="slim_center_title">SlimCenter</string>
+    <!-- Advanced, Device specific (DeviceParts) settings  -->
+    <string name="device_settings_title">Eszköz
+</string>
 
     <!-- Color Picker -->
     <string name="dialog_color_picker">Szín választó</string>
@@ -355,6 +358,7 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <string name="shortcut_action_ime">Billentyűzet váltó megnyítása</string>
     <string name="shortcut_action_kill">Alkalmazás kilövése</string>
     <string name="shortcut_action_power">Képernyő KI</string>
+    <string name="shortcut_action_theme_switch">Téma választó</string>
     <string name="shortcut_action_notifications">Értesítések</string>
     <string name="shortcut_action_menu_big">Menü</string>
     <string name="shortcut_action_qs">Gyorsbeállítás panel</string>
@@ -456,8 +460,6 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <!-- Notification drawer settings  -->
     <string name="notification_drawer_qs_title">Értesítési &amp; QS panel</string>
     <string name="notification_drawer_title">Értesítési panel</string>
-    <string name="notification_hide_carrier_title">Hálózati címke elrejtése</string>
-    <string name="notification_hide_carrier_summary">Szolgáltató és Wi-Fi címke elrejtése az Értesítési panelen</string>
     <string name="notification_shortcuts_settings_title">Parancsikonok</string>
     <string name="notification_shortcuts_settings_summary">Parancsikonok kihelyezése az Értesítési panelen</string>
 
@@ -762,6 +764,7 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <string name="title_tile_battery">Akkumulátor</string>
     <string name="title_tile_bluetooth">Bluetooth</string>
     <string name="title_tile_brightness">Fényerő</string>
+    <string name="title_tile_custom">Egyéni</string>
     <string name="title_tile_sleep">Alvó állapot</string>
     <string name="title_tile_location">Hely</string>
     <string name="title_tile_torch">Zseblámpa</string>
@@ -778,15 +781,29 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <string name="title_tile_networkmode">Hálózati mód</string>
     <string name="title_tile_nfc">NFC</string>
     <string name="title_tile_screen_timeout">Képernyő késleltetési ideje</string>
+    <string name="title_tile_quick_record">Gyors felvétel</string>
     <string name="title_tile_quiet_hours">Csendes órák</string>
     <string name="title_tile_volume">Hangerő</string>
     <string name="title_tile_expanded_desktop">Kiterjesztet képernyő</string>
     <string name="title_tile_music">Zene</string>
     <string name="title_tile_reboot">Újraindítás</string>
+    <string name="title_tile_theme">Téma választó</string>
+    <string name="dynamic_tile_ime_switcher">Billentyűzet váltó</string>
+    <string name="dynamic_tile_usb_tether">USB megosztás</string>
+    <string name="dynamic_tile_alarm">Riasztás</string>
+    <string name="dynamic_tile_bugreport">Hibajelentés</string>
+    <string name="dynamic_tiles_title">Dinamikus csempék</string>
     <string name="tiles_reset_message">Visszaállítod az alapértelmezett csempéket és elrendezést?</string>
     <string name="disable_qs">Gyors beállítások tiltva</string>
     <string name="disable_qs_message">Összes csempe eltávolítva. Gyors elérések tiltva.\n\nEngedélyezve hozzáadhatsz csempéket.</string>
     <string name="help_qs_message">Gyors beállítás csempe hozzáadásához nyomd meg a Hozzáadás gombot és válaszd ki amelyiket szeretnéd. Csempék átrendezéséhez hosszan nyomj rajta és húzd a kivánt helyre. Ha törölni szeretne egy csempét, húzza a törlés csempére.\n\nLetiltva a Gyors beállításokat, eltávolítja a csempéket.</string>
+    <string name="custom_tile_dialog_text">Minden művelet új állapotot add a csempének. Minden kattintás a következő állapotra vált. Hosszan nyomásra hozzáad egy hosszan nyomás műveletet. Ha nem kattintasz létező műveletre akkor a hossza nyomás ikonja használja a csempét. Lehetővé teszi, hogy megváltoztassa az állapotát kattintással és elindítja a műveletet hosszan nyomásra.</string>
+    <string name="custom_tile_dialog_title">Egyéni csempe művelet</string>
+    <string name="custom_toggle_extras">Egyéni csempe extrák</string>
+    <string name="custom_toggle_collapse_check">Összeomló értesítési árnyék</string>
+    <string name="custom_toggle_match_state_check">Kattintási művelet az ikonnak megfelelő</string>
+    <string name="custom_tile_long_press">Hosszan nyomás:</string>
+    <string name="custom_tile_null_warning">Be kell állítani egy műveletet elösszőr</string>
 
     <!-- QuickSettings style options -->
     <string name="quicksettings_tiles_style">Stílus</string>
@@ -821,4 +838,70 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <string name="quick_pulldown_left">Bal</string>
     <string name="quick_pulldown_right">Jobb</string>
 
+    <!-- Stylus Gestures -->
+    <string name="gestures_settings_title">Stílus gesztusok</string>
+    <string name="category_spen_title">Stílus gesztusok</string>
+    <string name="enable_subcat_title">Stílus</string>
+    <string name="enable_spen_title_head">Stílus gesztusok engedélyezése</string>
+    <string name="enable_spen_summary_head">Egyéni akció indítása a stílus gombbal húzó mozdulattal. Figyelmeztetés: alkalmazás nem lesz képes bemenetet fogadni míg nyomva tartod a stílus gombot</string>
+    <string name="gestures_subcat_title">Gesztusok</string>
+    <string name="gestures_left_spen_title_head">Balra húzás</string>
+    <string name="gestures_left_spen_summary_head">Egyéni alkalmazás indítása balra húzásra</string>
+    <string name="gestures_right_spen_title_head">Jobbra húzás</string>
+    <string name="gestures_right_spen_summary_head">Egyéni alkalmazás indítása jobbra húzásra</string>
+    <string name="gestures_up_spen_title_head">Fel húzás</string>
+    <string name="gestures_up_spen_summary_head">Egyéni alkalmazás indítása felfelé húzásra</string>
+    <string name="gestures_down_spen_title_head">Le húzás</string>
+    <string name="gestures_down_spen_summary_head">Egyéni alkalmazás indítása lefelé húzásra</string>
+    <string name="gestures_long_spen_title_head">Hosszan nyomás</string>
+    <string name="gestures_long_spen_summary_head">Egyéni alkalmazás indítása hosszan nyomásra</string>
+    <string name="gestures_double_spen_title_head">Dupla érintés</string>
+    <string name="gestures_double_spen_summary_head">Egyéni alkalmazás indítása dupla érintésre</string>
+
+    <!-- Gestures Options -->
+    <string name="gestures_action_empty">Nincs akció</string>
+    <string name="gestures_action_home">Emulálja a home gombot</string>
+    <string name="gestures_action_back">Emulálja a vissza gombot</string>
+    <string name="gestures_action_menu">Emulálja a menü gombot</string>
+    <string name="gestures_action_search">Keresés indítása</string>
+    <string name="gestures_action_recent">Legutóbbi alkalmazások</string>
+
+    <!-- stylus gestures support -->
+    <string name="stylus_app_not_installed">%s nincs telepítve</string>
+
+    <!-- Stylus Icon -->
+    <string name="stylus_icon_enabled_title">Ikon mutatása stílus használat közben</string>
+    <string name="stylus_icon_enabled_summary">Mutató ikon mutatása stílus használata közben</string>
+
+    <!-- Themes -->
+    <string name="theme_settings_title">Az igazi fekete slim</string>
+    <string name="theme_auto_mode_title">Téma váltás</string>
+    <string name="theme_auto_mode_off">Kézi</string>
+    <string name="theme_auto_mode_lightsensor">Fényviszonyok változtatása</string>
+    <string name="theme_auto_mode_twilight">Nappali</string>
+    <string name="theme_auto_switch_mode_error">Automatikus fényviszonyok változásának engedélyezése. Kézi állítás nem lehetséges.</string>
+
+    <!-- Preference category for LAN development settings. [CHAR LIMIT=25] -->
+    <string name="debug_LAN_category">LAN Beállítások</string>
+    <!-- Hostname setting -->
+    <string name="device_hostname">Eszköz neve</string>
+
+    <!-- Chamber of Secrets -->
+    <string name="chamber_title">Titkok Kamrája</string>
+    <string name="chamber_toast">A Titkok Kamrája nyítva van</string>
+
+    <!-- Volume Keys Media Control -->
+    <string name="volume_keys_control_media_stream">Média vezérlés</string>
+    <string name="volume_keys_control_media_stream_summary">Hangerő gombokkal vezérli a média hangerejét</string>
+
+    <!-- Rescan media volume -->
+    <string name="storage_rescan_media">Média újra keresése a tárolón</string>
+    <string name="storage_rescan_media_complete">Keresés befejezve</string>
+
+    <!-- Delete apn confirmation dialog message -->
+    <string name="confirm_delete_apn">Az APN törölve lesz.</string>
+
+    <!-- Minimum Vibration Duration -->
+    <string name="minimum_vibration_duration">Minimum rezgés időtartam</string>
+
 </resources>
diff --git a/res/values-ru/slim_strings.xml b/res/values-ru/slim_strings.xml
index 71d13126b23..7ef4a5c7e02 100644
--- a/res/values-ru/slim_strings.xml
+++ b/res/values-ru/slim_strings.xml
@@ -75,6 +75,14 @@
     <string name="increasing_ring_interval_10seconds">10 секунд</string>
     <string name="link_volume_ringtones">Связать громкость и звуки уведомления</string>
     <string name="volume_ring_only_description">Рингтон</string>
+
+    <!-- Volume Overlay -->
+    <string name="volume_overlay_title">Панель громкости</string>
+    <string name="volume_overlay_single">Одиночная</string>
+    <string name="volume_overlay_expandable">Расширяемая</string>
+    <string name="volume_overlay_expanded">Расширенная</string>
+    <string name="volume_overlay_disable">Нет</string>
+
     <string name="camera_sounds_title">Звук затвора камеры</string>
     <string name="camera_sounds_summary">ВНИМАНИЕ: отключение звука затвора камеры иногда незаконно!</string>
     <string name="sound_title">Звук</string>
@@ -131,6 +139,10 @@
     <string name="group_applications">Приложения</string>
     <string name="notification_shortcuts_settings_title">Ярлыки</string>
     <string name="notification_shortcuts_settings_summary">Показывать ярлыки в панели уведомлений</string>
+    <string name="notification_carrier_label_title">Имя оператора</string>
+    <string name="notification_custom_carrier_label_title">Установить имя оператора</string>
+    <string name="notification_custom_carrier_label_explain">Пожалуйста, введите новое имя. Пустое вернет к значению по умолчанию.</string>
+    <string name="notification_custom_carrier_label_notset">Имя оператора не установлено</string>
     <string name="display_category_light_options_title">Настройки LED</string>
     <string name="light_sensor_current_value">Текущее значение сенсора освещения: <xliff:g id="light_level">%d</xliff:g> lux</string>
     <string name="auto_brightness_dialog_title">Автоуровни яркости</string>
@@ -236,7 +248,6 @@
     <string name="notification_drawer_title">Панель уведомлений</string>
     <string name="notification_style_title">Стиль панели уведомления</string>
     <string name="notification_style_summary">Изменить стиль панели уведомления</string>
-    <string name="notification_hide_carrier_title">Скрывать имя оператора</string>
     <string name="notification_wallpaper_title">Фон панели уведомлений</string>
     <string name="notification_wallpaper_landscape_title">Фон панели уведомлений в ландшафтном режиме</string>
     <string name="notification_background_color_fill">Заливка цветом</string>
@@ -253,6 +264,8 @@
     <string name="title_tile_battery">Батарея</string>
     <string name="title_tile_bluetooth">Bluetooth</string>
     <string name="title_tile_brightness">Подсветка</string>
+    <string name="title_tile_contact">Контакт</string>
+    <string name="title_tile_custom">Свой ярлык</string>
     <string name="title_tile_torch">Фонарь</string>
     <string name="title_tile_lockscreen">Экран блокировки</string>
     <string name="title_tile_lte">LTE</string>
@@ -277,6 +290,18 @@
     <string name="quick_pulldown_off">Выкл.</string>
     <string name="quick_pulldown_left">Левый</string>
     <string name="quick_pulldown_right">Правый</string>
+
+    <!-- QuickSettings: Quick Collapse -->
+    <string name="title_collapse_panel">Быстрое сворачивание</string>
+    <string name="summary_collapse_panel">Закрывать панель уведомлений после выбора</string>
+
+    <!-- QuickSettings: Smart Pulldown -->
+    <string name="smart_pulldown_title">\"Умная\" панель уведомлений</string>
+    <string name="smart_pulldown_summary">Открывать быстрые настройки, если нет %1$s уведомлений</string>
+    <string name="smart_pulldown_off">Выкл</string>
+    <string name="smart_pulldown_dismissable">Удаляемые</string>
+    <string name="smart_pulldown_persistent">Постоянные</string>
+
     <string name="quicksettings_tiles_style">Стиль быстрых настроек</string>
     <string name="summary_quicksettings_tiles_style">Просмотреть/изменить установки стиля быстрых настроек</string>
     <string name="quicksettings_tiles_style_additional_options">Дополнительные настройки</string>
@@ -296,7 +321,7 @@
     <string name="hex_hint">#ff000000</string>
     <string name="set">Задать</string>
     <string name="battery_text_color">Цвет процентов</string>
-    <string name="battery_text_charging_color">Цвет процентов при зарядке</string>
+    <string name="battery_text_charging_color">Цвет молнии при зарядке</string>
     <string name="circle_battery_animation_speed">Скорость анимации круга</string>
     <string name="circle_battery_animation_speed_none">Нет</string>
     <string name="circle_battery_animation_speed_slow">Медленно</string>
@@ -627,7 +652,6 @@
     <string name="shortcuts_color_mode_title">Режим цвета значка</string>
     <string name="shortcuts_color_mode_summary">Изменить режим цвета значка ярлыка</string>
     <string name="notification_drawer_qs_title">Панель уведомлений и быстрых настроек</string>
-    <string name="notification_hide_carrier_summary">Скрывать имя оператора и Wi-Fi-сети в панели уведомлений</string>
     <string name="battery_icon_title">Значок батареи</string>
     <string name="battery_status_icon">Значок</string>
     <string name="battery_status_percentage">Проценты</string>
@@ -686,6 +710,8 @@
     <string name="lockscreen_target_color_title">Цвет значков действий</string>
     <string name="lockscreen_enable_eight_targets_dialog">Включение этой настройки сбросит ваши текущие действия на экране блокировки к значениям по умолчанию.</string>
     <string name="lockscreen_enable_eight_targets_enabled_dialog">\n\nНельзя использовать одновременно и кольцо из 8 действий, и ярлыки экрана блокировки.</string>
+    <string name="lockscreen_glowpad_torch_title">Фонарик на ползунке</string>
+    <string name="lockscreen_glowpad_torch_summary">Дважды нажмите и удерживайте ползунок, чтобы включить фонарик</string>
     <string name="lockscreen_style_reset_message">Сбросить все цвета экрана блокировки?</string>
     <string name="lockscreen_icon_title">Значок ползунка блокировки</string>
     <string name="lockscreen_lock_icon_custom">Свой значок</string>
@@ -710,6 +736,13 @@
     <string name="disable_qs">Быстрые настройки отключены</string>
     <string name="disable_qs_message">Все плитки удалены, быстрые настройки выключены.\n\nДобавьте плитку для включения.</string>
     <string name="help_qs_message">Чтобы добавить плитку быстрых настроек, нажмите кнопку \"Добавить\" и выберите нужную плитку. Чтобы поменятьпорядок плиток, нажмите и удерживайте плитку, затем перетащите ее на нужное место. Для удаления плитки перетащите ее на кнопку удаления, которая появляется при перетаскивании.\n\n Для настройки динамических плиток нажмите соответствующий значок на экране справа вверху.\n\nЧтобы отключить быстрые настройки, удалите все плитки.</string>
+    <string name="custom_tile_dialog_text">Каждое действие будет добавлять плитке новое состояние. Нажатие переключает эти состояния. По долгому нажатию задаются действия на долгое нажатие. При отсутствии основного действия по нажатию будет выполнено действие долгого нажатия. Это позволяет переключать состояния плитки обычным нажатием и запускать что-либо долгим нажатием.</string>
+    <string name="custom_tile_dialog_title">Действия своего ярлыка</string>
+    <string name="custom_toggle_extras">Дополнения своего ярлыка</string>
+    <string name="custom_toggle_collapse_check">Сворачивать тень уведомления</string>
+    <string name="custom_toggle_match_state_check">Значок для обычного нажатия</string>
+    <string name="custom_tile_long_press">Долгое нажатие:</string>
+    <string name="custom_tile_null_warning">Сначала нужно задать действие</string>
     <string name="quick_tiles_alpha_title">Прозрачность фона плиток</string>
     <string name="pref_music_mode_title">Режим музыки</string>
     <string name="screentimeout_mode1">15с | 1м | 5м | Никогда</string>
@@ -732,4 +765,67 @@
     <string name="theme_auto_switch_mode_error">Активирован режим автоматического изменения в зависимости от освещения. Ручной режим недоступен.</string>
     <string name="debug_LAN_category">Настройки локальной сети</string>
     <string name="shortcut_action_theme_switch">Переключатель тем</string>
+    <string name="title_tile_quick_record">Быстрая запись</string>
+    <string name="chamber_title">Тайная комната</string>
+    <string name="chamber_toast">Тайная комната снова открыта</string>
+    <!-- WiFi forget all networks -->
+    <string name="wifi_menu_forget_all">Удалить сохраненные сети</string>
+    <!-- Volume Keys Media Control -->
+    <string name="volume_keys_control_media_stream">Управление мультимедиа</string>
+    <string name="volume_keys_control_media_stream_summary">Кнопки громкости контролируют громкость мультимедиа, а не уведомлений</string>
+    <!-- Rescan media volume -->
+    <string name="storage_rescan_media">Пересканировать медиа на накопителе</string>
+    <string name="storage_rescan_media_complete">Сканирование завершено</string>
+
+    <!-- Delete apn confirmation dialog message -->
+    <string name="confirm_delete_apn">APN будет удалена</string>
+
+    <!-- Minimum Vibration Duration -->
+    <string name="minimum_vibration_duration">Минимальная длительность вибрации</string>
+
+    <!-- ListView animation -->
+    <string name="interface_settings_animation_title">Настройки анимации</string>
+    <string name="listview_animation_title">Анимация списков</string>
+    <string name="listview_off">По умолчанию</string>
+    <string name="listview_wave_left">Волна (слева)</string>
+    <string name="listview_wave_right">Волна (справа)</string>
+    <string name="listview_alpha">Проявление</string>
+    <string name="listview_scale">Увеличение</string>
+    <string name="listview_stack_top">Стек (сверху)</string>
+    <string name="listview_stack_bottom">Стек (снизу)</string>
+    <string name="listview_unfold">Развернуть</string>
+    <string name="listview_fold">Свернуть</string>
+    <string name="listview_translate_left">Сдвиг (слева)</string>
+    <string name="listview_translate_right">Сдвиг (справа)</string>
+
+    <!-- ListView interpolator -->
+    <string name="listview_interpolator_title">Эффекты анимации списков</string>
+    <string name="listview_accelerate_interpolator">Усилить</string>
+    <string name="listview_decelerate_interpolator">Ослабить</string>
+    <string name="listview_accelerate_decelerate_interpolator">Усилить и ослабить</string>
+    <string name="listview_anticipate_interpolator">Ускорить</string>
+    <string name="listview_overshoot_interpolator">Проскочить</string>
+    <string name="listview_anticipate_overshoot_interpolator">Ускорить и проскочить</string>
+    <string name="listview_bounce_interpolator">Отскакивать</string>
+
+    <!-- Advanced reboot options -->
+    <string name="advanced_reboot_title">Расширенная перезагрузка</string>
+    <string name="advanced_reboot_summary">Включить отображение в меню управления питанием настроек для загрузки в рекавери и бутлоадер</string>
+    <string name="advanced_reboot_dialog_title">Расширенное меню перезагрузки</string>
+    <string name="advanced_reboot_disabled">Выключено</string>
+    <string name="advanced_reboot_hide_on_keyguard">Скрывать на экране блокировки</string>
+    <string name="advanced_reboot_show_always">Всегда показывать</string>
+
+    <!-- Keyguard always show battery -->
+    <string name="lockscreen_battery_status_title">Состояние батареи</string>
+    <string name="lockscreen_battery_status_summary">Всегда показывать состояние батареи на экране блокировки</string>
+
+    <!-- Notification hide labels -->
+    <string name="notification_hide_labels_title">Скрывать метки уведомлений</string>
+    <string name="notification_hide_labels_disable">Показывать все метки</string>
+    <string name="notification_hide_labels_carrier">Скрывать имя оператора</string>
+    <string name="notification_hide_labels_wifi">Скрывать имя WiFi-сети</string>
+    <string name="notification_hide_labels_all">Скрывать все метки</string>
+    <string name="notification_hide_labels_text">в панели уведомлений</string>
+
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0b490d51d30..7ef11940509 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2055,4 +2055,8 @@
     <string name="wifi_display_wps_config">Конфигурация WPS</string>
     <string name="wifi_display_listen_channel">Канал прослушивания</string>
     <string name="wifi_display_operating_channel">Операционный канал</string>
+
+    <!-- Setting checkbox summary for displaying USB debugging notification -->
+    <string name="adb_notify">Уведомление об отладке по USB</string>
+    <string name="adb_notify_summary">Показывать уведомление о включённом режиме отладки по USB</string>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9434df6faf5..50d352528e9 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -49,4 +49,6 @@
     <color name="auto_brightness_preview_foreground">@android:color/white</color>
     <color name="auto_brightness_preview_markers">@android:color/holo_blue_light</color>
     <color name="auto_brightness_preview_grid">#44ffffff</color>
+
+    <color name="tab_selector">#FFFFFFFF</color>
 </resources>
diff --git a/res/values/slim_arrays.xml b/res/values/slim_arrays.xml
index e0eebd4b9a6..77125483705 100644
--- a/res/values/slim_arrays.xml
+++ b/res/values/slim_arrays.xml
@@ -211,6 +211,22 @@
         <item>2</item>
     </string-array>
 
+    <!-- Volume Overlay entries. Do not translate. -->
+    <string-array name="volume_overlay_entries" translatable="false">
+        <item>@string/volume_overlay_single</item>
+        <item>@string/volume_overlay_expandable</item>
+        <item>@string/volume_overlay_expanded</item>
+        <item>@string/volume_overlay_disable</item>
+    </string-array>
+
+    <!-- Values for Volume Overlay. Do not translate. -->
+    <string-array name="volume_overlay_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
     <!-- Auto keyboard rotation -->
     <string-array name="keyboard_rotation_timeout_entries" translatable="false">
         <item>2s</item>
@@ -905,6 +921,19 @@
         <item>2</item>
     </string-array>
 
+    <!-- Smart pulldown -->
+    <string-array name="smart_pulldown_entries" translatable="false">
+        <item>@string/smart_pulldown_off</item>
+        <item>@string/smart_pulldown_dismissable</item>
+        <item>@string/smart_pulldown_persistent</item>
+    </string-array>
+
+    <string-array name="smart_pulldown_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
     <!-- Stylus Gestures -->
     <string-array name="gestures_entries" translatable="false">
         <item>@string/gestures_action_empty</item>
@@ -937,4 +966,84 @@
         <item>2</item>
     </string-array>
 
+    <!-- Advanced reboot menu dev options -->
+    <string-array name="advanced_reboot_entries">
+        <item>@string/advanced_reboot_disabled</item>
+        <item>@string/advanced_reboot_hide_on_keyguard</item>
+        <item>@string/advanced_reboot_show_always</item>
+    </string-array>
+
+    <string-array name="advanced_reboot_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <!-- Listview animation -->
+    <string-array name="listview_animation_entries">
+        <item>@string/listview_off</item>
+        <item>@string/listview_wave_left</item>
+        <item>@string/listview_wave_right</item>
+        <item>@string/listview_scale</item>
+        <item>@string/listview_alpha</item>
+        <item>@string/listview_stack_top</item>
+        <item>@string/listview_stack_bottom</item>
+        <item>@string/listview_unfold</item>
+        <item>@string/listview_fold</item>
+        <item>@string/listview_translate_left</item>
+        <item>@string/listview_translate_right</item>
+    </string-array>
+
+    <string-array name="listview_animation_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+    </string-array>
+
+    <!-- Listview Interpolator -->
+    <string-array name="listview_interpolator_entries">
+        <item>@string/listview_off</item>
+        <item>@string/listview_accelerate_interpolator</item>
+        <item>@string/listview_decelerate_interpolator</item>
+        <item>@string/listview_accelerate_decelerate_interpolator</item>
+        <item>@string/listview_anticipate_interpolator</item>
+        <item>@string/listview_overshoot_interpolator</item>
+        <item>@string/listview_anticipate_overshoot_interpolator</item>
+        <item>@string/listview_bounce_interpolator</item>
+    </string-array>
+
+    <string-array name="listview_interpolator_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+    </string-array>
+
+    <!-- Notification hide labels -->
+    <string-array name="notification_hide_labels_entries">
+        <item>@string/notification_hide_labels_disable</item>
+        <item>@string/notification_hide_labels_carrier</item>
+        <item>@string/notification_hide_labels_wifi</item>
+        <item>@string/notification_hide_labels_all</item>
+    </string-array>
+
+    <string-array name="notification_hide_labels_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/slim_strings.xml b/res/values/slim_strings.xml
index 7a0ab4b6cd9..05737a65961 100644
--- a/res/values/slim_strings.xml
+++ b/res/values/slim_strings.xml
@@ -124,6 +124,8 @@
     <string name="wifi_setting_countrycode_error">There was a problem setting the region code.</string>
     <!-- Wi-Fi settings diables message if Wifi is off-->
     <string name="wifi_setting_countrycode_disabled">Enable Wi-Fi to change this option.</string>
+    <!-- WiFi forget all networks -->
+    <string name="wifi_menu_forget_all">Forget all networks</string>
 
     <!-- Status bar -->
     <string name="status_bar_title">Status bar</string>
@@ -183,6 +185,13 @@
     <string name="link_volume_ringtones">Link ringtone &amp; notifications volumes</string>
     <string name="volume_ring_only_description">Ringtone</string>
 
+    <!-- Volume Overlay -->
+    <string name="volume_overlay_title">Volume panel style</string>
+    <string name="volume_overlay_single">Single</string>
+    <string name="volume_overlay_expandable">Expandable</string>
+    <string name="volume_overlay_expanded">Expanded</string>
+    <string name="volume_overlay_disable">Disable</string>
+
     <!-- Sound settings screen, setting check box label -->
     <string name="camera_sounds_title">Camera shutter sound</string>
     <string name="camera_sounds_summary">Enable system camera shutter sound</string>
@@ -460,11 +469,22 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <!-- Notification drawer settings  -->
     <string name="notification_drawer_qs_title">Notification &amp; QS drawer</string>
     <string name="notification_drawer_title">Notification drawer</string>
-    <string name="notification_hide_carrier_title">Hide network label</string>
-    <string name="notification_hide_carrier_summary">Hide carrier and Wi-Fi label on the notification drawer</string>
     <string name="notification_shortcuts_settings_title">Shortcuts</string>
     <string name="notification_shortcuts_settings_summary">Show shortcuts in the notification drawer</string>
 
+    <string name="notification_carrier_label_title">Carrier label</string>
+    <string name="notification_custom_carrier_label_title">Custom carrier label</string>
+    <string name="notification_custom_carrier_label_explain">Please enter a new label. Enter an empty label to revert to stock label.</string>
+    <string name="notification_custom_carrier_label_notset">Custom label currently not set</string>
+
+    <!-- Notification hide labels -->
+    <string name="notification_hide_labels_title">Hide notification labels</string>
+    <string name="notification_hide_labels_disable">Show all labels</string>
+    <string name="notification_hide_labels_carrier">Hide Carrier label</string>
+    <string name="notification_hide_labels_wifi">Hide WiFi label</string>
+    <string name="notification_hide_labels_all">Hide all labels</string>
+    <string name="notification_hide_labels_text">in the notification panel</string>
+
     <!-- StatusBar Battery Settings -->
     <string name="battery_icon_title">Battery icon</string>
     <string name="battery_status_icon">Icon</string>
@@ -647,6 +667,8 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <string name="lockscreen_eight_targets_summary">Enable eight custom lock screen targets.</string>
     <string name="lockscreen_enable_eight_targets_dialog">Changing this option resets your current lockscreen targets setup to default.</string>
     <string name="lockscreen_enable_eight_targets_enabled_dialog">\n\nWith eight lockscreen targets enabled you cannot use your lockscreen shortcuts at the same time.</string>
+    <string name="lockscreen_glowpad_torch_title">Slider torch</string>
+    <string name="lockscreen_glowpad_torch_summary">Double-tap and hold the slider to start torch</string>
     <string name="lockscreen_target_reset">Lock screen targets reset to default</string>
     <string name="lockscreen_target_reset_message">Delete all user created lock screen targets and restore to default?</string>
     <string name="lockscreen_target_empty">None</string>
@@ -768,6 +790,8 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <string name="title_tile_battery">Battery</string>
     <string name="title_tile_bluetooth">Bluetooth</string>
     <string name="title_tile_brightness">Brightness</string>
+    <string name="title_tile_contact">Contact</string>
+    <string name="title_tile_custom">Custom</string>
     <string name="title_tile_sleep">Go to sleep</string>
     <string name="title_tile_location">Location</string>
     <string name="title_tile_torch">Torch</string>
@@ -784,6 +808,7 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <string name="title_tile_networkmode">Network mode</string>
     <string name="title_tile_nfc">NFC</string>
     <string name="title_tile_screen_timeout">Screen timeout</string>
+    <string name="title_tile_quick_record">Quick Record</string>
     <string name="title_tile_quiet_hours">Quiet hours</string>
     <string name="title_tile_volume">Volume</string>
     <string name="title_tile_expanded_desktop">Expanded desktop</string>
@@ -799,6 +824,13 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <string name="disable_qs">Quick settings are disabled</string>
     <string name="disable_qs_message">All tiles were removed. Quick settings are disabled.\n\nTo enable add a tile.</string>
     <string name="help_qs_message">To add a quick settings tile, press the Add button and choose the tile you would like. To rearrange your tiles, longpress the tile and drag it into the position you want. If you want to delete a tile, drag it to the delete button which appears while dragging the tile.\n\nTo setup dynamic tiles press the respective icon on the top right of the screen\n\nTo disable quick settings, remove all tiles.</string>
+    <string name="custom_tile_dialog_text">Each action will add a new state to the tile. Each click changes to the next state. Long-press to add long-press actions. If no click action exists the long-action icon will be used for the tile. This allows you to change states by clicking and launch actions by long-pressing.</string>
+    <string name="custom_tile_dialog_title">Custom tile actions</string>
+    <string name="custom_toggle_extras">Custom tile extras</string>
+    <string name="custom_toggle_collapse_check">Collapse notification shade</string>
+    <string name="custom_toggle_match_state_check">Click action matches icon</string>
+    <string name="custom_tile_long_press">Longpress:</string>
+    <string name="custom_tile_null_warning">An action must be set first</string>
 
     <!-- QuickSettings style options -->
     <string name="quicksettings_tiles_style">Style</string>
@@ -833,6 +865,17 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <string name="quick_pulldown_left">Left</string>
     <string name="quick_pulldown_right">Right</string>
 
+    <!-- QuickSettings: Smart Pulldown -->
+    <string name="smart_pulldown_title">Smart pulldown</string>
+    <string name="smart_pulldown_summary">Open Quick Settings when there are no %1$s notifications present</string>
+    <string name="smart_pulldown_off">Off</string>
+    <string name="smart_pulldown_dismissable">Dismissable</string>
+    <string name="smart_pulldown_persistent">Persistent</string>
+
+    <!-- QuickSettings: Quick Collapse -->
+    <string name="title_collapse_panel">Quick collapse</string>
+    <string name="summary_collapse_panel">Close the notification panel upon toggle</string>
+
     <!-- Stylus Gestures -->
     <string name="gestures_settings_title">Stylus gestures</string>
     <string name="category_spen_title">Stylus gestures</string>
@@ -881,4 +924,59 @@ two in order to insert additional control points. \'Remove\' deletes the selecte
     <!-- Hostname setting -->
     <string name="device_hostname">Device hostname</string>
 
+    <!-- Chamber of Secrets -->
+    <string name="chamber_title">Chamber of secrets</string>
+    <string name="chamber_toast">The chamber of secrets has opened</string>
+
+    <!-- Volume Keys Media Control -->
+    <string name="volume_keys_control_media_stream">Media control</string>
+    <string name="volume_keys_control_media_stream_summary">Volume keys control media volume rather than notifications</string>
+
+    <!-- Rescan media volume -->
+    <string name="storage_rescan_media">Rescan media for the storage volume</string>
+    <string name="storage_rescan_media_complete">Scan completed</string>
+
+    <!-- Delete apn confirmation dialog message -->
+    <string name="confirm_delete_apn">The APN will be deleted.</string>
+
+    <!-- Minimum Vibration Duration -->
+    <string name="minimum_vibration_duration">Minimum vibration duration</string>
+
+    <!-- ListView animation -->
+    <string name="interface_settings_animation_title">Animation options</string>
+    <string name="listview_animation_title">ListView animation</string>
+    <string name="listview_off">Default</string>
+    <string name="listview_wave_left">Wave (left)</string>
+    <string name="listview_wave_right">Wave (right)</string>
+    <string name="listview_alpha">Alpha</string>
+    <string name="listview_scale">Scale</string>
+    <string name="listview_stack_top">Stack (top)</string>
+    <string name="listview_stack_bottom">Stack (bottom)</string>
+    <string name="listview_unfold">Unfold</string>
+    <string name="listview_fold">Fold</string>
+    <string name="listview_translate_left">Translate (left)</string>
+    <string name="listview_translate_right">Translate (right)</string>
+
+    <!-- ListView interpolator -->
+    <string name="listview_interpolator_title">ListView interpolator</string>
+    <string name="listview_accelerate_interpolator">Accelerate</string>
+    <string name="listview_decelerate_interpolator">Decelerate</string>
+    <string name="listview_accelerate_decelerate_interpolator">Accelerate and decelerate</string>
+    <string name="listview_anticipate_interpolator">Anticipate</string>
+    <string name="listview_overshoot_interpolator">Overshoot</string>
+    <string name="listview_anticipate_overshoot_interpolator">Anticipate and overshoot</string>
+    <string name="listview_bounce_interpolator">Bounce</string>
+
+    <!-- Advanced reboot options -->
+    <string name="advanced_reboot_title">Advanced reboot</string>
+    <string name="advanced_reboot_summary">Include options in the power menu for rebooting into recovery and bootloader</string>
+    <string name="advanced_reboot_dialog_title">Advanced reboot menu</string>
+    <string name="advanced_reboot_disabled">Disable</string>
+    <string name="advanced_reboot_hide_on_keyguard">Hide on lock screen</string>
+    <string name="advanced_reboot_show_always">Show always</string>
+
+    <!-- Keyguard always show battery -->
+    <string name="lockscreen_battery_status_title">Battery status</string>
+    <string name="lockscreen_battery_status_summary">Always show battery status on keyguard</string>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9ebedc2bba1..2337a3af872 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4902,4 +4902,8 @@
 
     <!-- Text to display in regulatory info screen (from device overlay). -->
     <string name="regulatory_info_text"></string>
+
+    <!-- Setting checkbox summary for displaying USB debugging notification -->
+    <string name="adb_notify">USB debugging notify</string>
+    <string name="adb_notify_summary">Display a notification when USB debugging is connected</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2969292b89e..0cff5cece30 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -246,7 +246,7 @@
     <integer name="preference_scrollbar_style">33554432</integer>
 
     <style name="ApnPreference">
-        <item name="android:layout">@layout/apn_preference_layout</item>
+        <item name="android:widgetLayout">@layout/preference_profiles_widget</item>
     </style>
 
     <style name="TextAppearance.QuickSettings">
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 7b599b859e2..96d6c42761d 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -66,11 +66,9 @@
                 android:fragment="com.android.settings.tts.TextToSpeechSettings"
                 android:title="@string/tts_settings_title"/>
 
-        <ListPreference android:key="select_long_press_timeout_preference"
-                android:title="@string/accessibility_long_press_timeout_preference_title"
-                android:entries="@array/long_press_timeout_selector_titles"
-                android:entryValues="@array/long_press_timeout_selector_values"
-                android:persistent="false"/>
+        <com.android.settings.widget.SeekBarPreference
+                android:key="select_long_press_timeout_preference"
+                android:title="@string/accessibility_long_press_timeout_preference_title" />
 
     </PreferenceCategory>
 
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index eebd650a6d5..c5dcf65d7ee 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -77,6 +77,12 @@
             android:title="@string/enable_adb"
             android:summary="@string/enable_adb_summary"/>
 
+        <CheckBoxPreference
+            android:key="adb_notify"
+            android:title="@string/adb_notify"
+            android:summary="@string/adb_notify_summary"
+            android:dependency="enable_adb"/>
+
         <Preference android:key="clear_adb_keys"
                 android:title="@string/clear_adb_keys" />
 
@@ -288,4 +294,13 @@
 
      </PreferenceCategory>
 
+     <!-- Must remain at bottom -->
+     <Preference
+         android:key="chamber_of_secrets"
+         android:title="\n \n" />
+
+     <CheckBoxPreference
+         android:key="chamber_of_unlocked_secrets"
+         android:title="@string/chamber_title" />
+
 </PreferenceScreen>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 961e3bf4c4a..08518d23494 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -69,6 +69,22 @@
             android:entries="@array/entries_system_power_crt_mode"
             android:entryValues="@array/values_system_power_crt_mode" />
 
+        <ListPreference
+            android:key="listview_animation"
+            android:dialogTitle="@string/listview_animation_title"
+            android:title="@string/listview_animation_title"
+            android:entries="@array/listview_animation_entries"
+            android:entryValues="@array/listview_animation_values"
+            android:defaultValue="0" />
+
+        <ListPreference
+            android:key="listview_interpolator"
+            android:dialogTitle="@string/listview_interpolator_title"
+            android:title="@string/listview_interpolator_title"
+            android:entries="@array/listview_interpolator_entries"
+            android:entryValues="@array/listview_interpolator_values"
+            android:defaultValue="0" />
+
     </PreferenceCategory>
 
         <PreferenceCategory
diff --git a/res/xml/lockscreen_interface_settings.xml b/res/xml/lockscreen_interface_settings.xml
index 35296125b69..02e65496ebb 100644
--- a/res/xml/lockscreen_interface_settings.xml
+++ b/res/xml/lockscreen_interface_settings.xml
@@ -40,4 +40,9 @@
          <extra android:name="fragment" android:value="com.android.settings.slim.fragments.LockscreenShortcutFragment" />
      </PreferenceScreen>
 
+    <CheckBoxPreference
+        android:key="lockscreen_torch"
+        android:title="@string/lockscreen_glowpad_torch_title"
+        android:summary="@string/lockscreen_glowpad_torch_summary" />
+
 </PreferenceScreen>
diff --git a/res/xml/notification_drawer_qs_settings.xml b/res/xml/notification_drawer_qs_settings.xml
index 697309b2492..bfe53492e0c 100644
--- a/res/xml/notification_drawer_qs_settings.xml
+++ b/res/xml/notification_drawer_qs_settings.xml
@@ -19,11 +19,23 @@
     <PreferenceCategory
         android:title="@string/notification_drawer_title" />
 
-     <CheckBoxPreference
-         android:key="notification_hide_carrier"
-         android:title="@string/notification_hide_carrier_title"
-         android:summary="@string/notification_hide_carrier_summary"
-         android:defaultValue="false" />
+    <ListPreference
+        android:key="notification_hide_labels"
+        android:title="@string/notification_hide_labels_title"
+        android:entries="@array/notification_hide_labels_entries"
+        android:entryValues="@array/notification_hide_labels_values"
+        android:persistent="false" />
+
+     <com.android.settings.slim.CustomCarrier
+         android:key="notification_custom_carrier_label"
+         android:title="@string/notification_custom_carrier_label_title"
+         android:dialogTitle="@string/notification_custom_carrier_label_title"
+         android:positiveButtonText="@string/wifi_save"
+         android:negativeButtonText="@string/wifi_cancel"
+         android:selectAllOnFocus="true"
+         android:imeOptions="actionDone"
+         android:inputType="textNoSuggestions"
+         android:persistent="false" />
 
      <com.android.settings.widget.SeekBarPreference
          android:key="notification_alpha"
@@ -57,6 +69,19 @@
             android:entryValues="@array/quick_pulldown_values"
             android:persistent="false" />
 
+        <ListPreference
+            android:key="smart_pulldown"
+            android:title="@string/smart_pulldown_title"
+            android:entries="@array/smart_pulldown_entries"
+            android:entryValues="@array/smart_pulldown_values"
+            android:persistent="false" />
+
+        <CheckBoxPreference
+            android:key="collapse_panel"
+            android:title="@string/title_collapse_panel"
+            android:summary="@string/summary_collapse_panel"
+            android:defaultValue="false" />
+
         <PreferenceScreen
             android:key="quicksettings_tiles_style"
             android:fragment="com.android.settings.slim.quicksettings.QuickSettingsTilesStyle"
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index 994eeaffd59..914a23b104e 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -75,6 +75,11 @@
             android:summary="@string/lockscreen_target_summary"
             android:title="@string/lockscreen_target_title" />
 
+        <CheckBoxPreference
+            android:key="lockscreen_battery_status"
+            android:title="@string/lockscreen_battery_status_title"
+            android:summary="@string/lockscreen_battery_status_summary" />
+
         <PreferenceScreen
             android:key="keyguard_enable_widgets"
             android:fragment="com.android.settings.slim.LockscreenWidgets"
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index 1d93b7249e4..1882f6cc117 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -43,6 +43,11 @@
             android:summary="@string/lockscreen_target_summary"
             android:title="@string/lockscreen_target_title" />
 
+        <CheckBoxPreference
+            android:key="lockscreen_battery_status"
+            android:title="@string/lockscreen_battery_status_title"
+            android:summary="@string/lockscreen_battery_status_summary" />
+
         <PreferenceScreen
             android:key="keyguard_enable_widgets"
             android:fragment="com.android.settings.slim.LockscreenWidgets"
diff --git a/res/xml/security_settings_lockscreen.xml b/res/xml/security_settings_lockscreen.xml
index cd9b49bfdb7..d29c9d33915 100644
--- a/res/xml/security_settings_lockscreen.xml
+++ b/res/xml/security_settings_lockscreen.xml
@@ -31,6 +31,11 @@
             android:fragment="com.android.settings.slim.LockscreenStyle"
             android:title="@string/lockscreen_style_title"/>
 
+        <CheckBoxPreference
+            android:key="lockscreen_battery_status"
+            android:title="@string/lockscreen_battery_status_title"
+            android:summary="@string/lockscreen_battery_status_summary" />
+
         <PreferenceScreen
             android:key="keyguard_enable_widgets"
             android:fragment="com.android.settings.slim.LockscreenWidgets"
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index dbbeb1df4fe..45ad7a68ed5 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -40,6 +40,14 @@
             android:title="@string/device_admin_title"
             android:persistent="false">
 
+        <ListPreference
+            android:key="advanced_reboot"
+            android:title="@string/advanced_reboot_title"
+            android:dialogTitle="@string/advanced_reboot_dialog_title"
+            android:entries="@array/advanced_reboot_entries"
+            android:entryValues="@array/advanced_reboot_values"
+            android:summary="@string/advanced_reboot_summary" />
+
         <Preference android:title="@string/manage_device_admin"
                 android:summary="@string/manage_device_admin_summary"
                 android:persistent="false"
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index c9ff34868c6..3fce6fcd8c8 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -67,6 +67,11 @@
             android:summary="@string/lockscreen_target_summary"
             android:title="@string/lockscreen_target_title" />
 
+        <CheckBoxPreference
+            android:key="lockscreen_battery_status"
+            android:title="@string/lockscreen_battery_status_title"
+            android:summary="@string/lockscreen_battery_status_summary" />
+
         <PreferenceScreen
             android:key="keyguard_enable_widgets"
             android:fragment="com.android.settings.slim.LockscreenWidgets"
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 7c092d188e0..22c3ba69529 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -66,6 +66,11 @@
             android:summary="@string/lockscreen_target_summary"
             android:title="@string/lockscreen_target_title" />
 
+        <CheckBoxPreference
+            android:key="lockscreen_battery_status"
+            android:title="@string/lockscreen_battery_status_title"
+            android:summary="@string/lockscreen_battery_status_summary" />
+
         <PreferenceScreen
             android:key="keyguard_enable_widgets"
             android:fragment="com.android.settings.slim.LockscreenWidgets"
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index 06cd85db98c..69eca74a0a4 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -74,6 +74,11 @@
             android:summary="@string/lockscreen_target_summary"
             android:title="@string/lockscreen_target_title" />
 
+        <CheckBoxPreference
+            android:key="lockscreen_battery_status"
+            android:title="@string/lockscreen_battery_status_title"
+            android:summary="@string/lockscreen_battery_status_summary" />
+
         <PreferenceScreen
             android:key="keyguard_enable_widgets"
             android:fragment="com.android.settings.slim.LockscreenWidgets"
diff --git a/res/xml/slim_sound_settings.xml b/res/xml/slim_sound_settings.xml
index 3321c7df2de..7435503dad7 100644
--- a/res/xml/slim_sound_settings.xml
+++ b/res/xml/slim_sound_settings.xml
@@ -52,6 +52,13 @@
         android:entries="@array/less_notification_sounds_entries"
         android:entryValues="@array/less_notification_sounds_values" />
 
+    <CheckBoxPreference
+        android:key="volume_keys_control_media_stream"
+        android:title="@string/volume_keys_control_media_stream"
+        android:summary="@string/volume_keys_control_media_stream_summary"
+        android:defaultValue="false"
+        android:persistent="false" />
+
     <PreferenceCategory
         android:title="@string/power_notifications_category_title" />
 
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index cd0b966b66e..2b5d404f84b 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -94,12 +94,22 @@
             android:title="@string/haptic_feedback_enable_title"
             android:defaultValue="true" />
 
+    <com.android.settings.widget.SeekBarPreference
+            android:key="vibration_duration"
+            android:title="@string/minimum_vibration_duration" />
+
     <CheckBoxPreference
             android:key="volume_adjust_sounds"
             android:title="@string/volume_adjust_sounds_enable_title"
             android:summary="@string/volume_adjust_sounds_enable_summary"
             android:defaultValue="true" />
 
+    <ListPreference
+            android:key="volume_overlay"
+            android:title="@string/volume_overlay_title"
+            android:entries="@array/volume_overlay_entries"
+            android:entryValues="@array/volume_overlay_values" />
+
     <ListPreference
             android:key="emergency_tone"
             android:title="@string/emergency_tone_title"
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 2da2d76f84f..5604bb0a00f 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -16,10 +16,14 @@
 
 package com.android.settings;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ContentUris;
 import android.content.ContentValues;
+import android.content.Context;
+import android.content.CursorLoader;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ -27,16 +31,15 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.SystemProperties;
+import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
 import android.provider.Telephony;
 import android.telephony.TelephonyManager;
 import android.util.Log;
-import android.view.KeyEvent;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 
 import com.android.internal.telephony.Phone;
@@ -45,7 +48,7 @@
 import com.android.internal.telephony.TelephonyProperties;
 
 
-public class ApnEditor extends PreferenceActivity
+public class ApnEditor extends SettingsPreferenceFragment
         implements SharedPreferences.OnSharedPreferenceChangeListener,
                     Preference.OnPreferenceChangeListener {
 
@@ -58,6 +61,8 @@ public class ApnEditor extends PreferenceActivity
     private final static String KEY_CARRIER_ENABLED = "carrier_enabled";
     private final static String KEY_BEARER = "bearer";
     private final static String KEY_MVNO_TYPE = "mvno_type";
+    protected static final String EDIT_ACTION = "edit_action";
+    protected static final String EDIT_DATA = "edit_data";
 
     private static final int MENU_DELETE = Menu.FIRST;
     private static final int MENU_SAVE = Menu.FIRST + 1;
@@ -148,7 +153,7 @@ public class ApnEditor extends PreferenceActivity
 
 
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.apn_editor);
@@ -188,16 +193,22 @@ protected void onCreate(Bundle icicle) {
 
         mRes = getResources();
 
-        final Intent intent = getIntent();
-        final String action = intent.getAction();
+        final Intent intent = getActivity().getIntent();
+        String action = intent.getAction();
+        Bundle fragArgs = getArguments();
+
+        if (fragArgs != null && fragArgs.containsKey(EDIT_ACTION)) {
+            mUri = Uri.parse(fragArgs.getString(EDIT_DATA));
+            action = fragArgs.getString(EDIT_ACTION);
+        } else {
+            mUri = intent.getData();
+        }
 
         mFirstTime = icicle == null;
 
-        if (action.equals(Intent.ACTION_EDIT)) {
-            mUri = intent.getData();
-        } else if (action.equals(Intent.ACTION_INSERT)) {
+        if (action.equals(Intent.ACTION_INSERT)) {
             if (mFirstTime || icicle.getInt(SAVED_POS) == 0) {
-                mUri = getContentResolver().insert(intent.getData(), new ContentValues());
+                mUri = getContentResolver().insert(mUri, new ContentValues());
             } else {
                 mUri = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI,
                         icicle.getInt(SAVED_POS));
@@ -208,26 +219,28 @@ protected void onCreate(Bundle icicle) {
             // original activity if they requested a result.
             if (mUri == null) {
                 Log.w(TAG, "Failed to insert new telephony provider into "
-                        + getIntent().getData());
+                        + getActivity().getIntent().getData());
                 finish();
                 return;
             }
 
             // The new entry was created, so assume all will end well and
             // set the result to be returned.
-            setResult(RESULT_OK, (new Intent()).setAction(mUri.toString()));
+            getActivity().setResult(Activity.RESULT_OK, (new Intent()).setAction(mUri.toString()));
 
-        } else {
+        } else if (!action.equals(Intent.ACTION_EDIT)) {
             finish();
             return;
         }
 
-        mCursor = managedQuery(mUri, sProjection, null, null);
+        CursorLoader qCursor = new CursorLoader(getActivity(), mUri, sProjection, null, null, null);
+        mCursor = qCursor.loadInBackground();
         mCursor.moveToFirst();
 
-        mTelephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
+        mTelephonyManager = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
 
         fillUi();
+        setHasOptionsMenu(true);
     }
 
     @Override
@@ -441,8 +454,8 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
         // If it's a new APN, then cancel will delete the new entry in onPause
         if (!mNewApn) {
             menu.add(0, MENU_DELETE, 0, R.string.menu_delete)
@@ -452,7 +465,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
             .setIcon(android.R.drawable.ic_menu_save);
         menu.add(0, MENU_CANCEL, 0, R.string.menu_cancel)
             .setIcon(android.R.drawable.ic_menu_close_clear_cancel);
-        return true;
     }
 
     @Override
@@ -477,20 +489,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK: {
-                if (validateAndSave(false)) {
-                    finish();
-                }
-                return true;
-            }
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle icicle) {
+    public void onSaveInstanceState(Bundle icicle) {
         super.onSaveInstanceState(icicle);
         if (validateAndSave(true)) {
             icicle.putInt(SAVED_POS, mCursor.getInt(ID_INDEX));
@@ -598,12 +597,12 @@ private String getErrorMsg() {
     }
 
     @Override
-    protected Dialog onCreateDialog(int id) {
+    public Dialog onCreateDialog(int id) {
 
         if (id == ERROR_DIALOG_ID) {
             String msg = getErrorMsg();
 
-            return new AlertDialog.Builder(this)
+            return new AlertDialog.Builder(getActivity())
                     .setTitle(R.string.error_title)
                     .setPositiveButton(android.R.string.ok, null)
                     .setMessage(msg)
@@ -613,22 +612,18 @@ protected Dialog onCreateDialog(int id) {
         return super.onCreateDialog(id);
     }
 
-    @Override
-    protected void onPrepareDialog(int id, Dialog dialog) {
-        super.onPrepareDialog(id, dialog);
-
-        if (id == ERROR_DIALOG_ID) {
-            String msg = getErrorMsg();
-
-            if (msg != null) {
-                ((AlertDialog)dialog).setMessage(msg);
-            }
-        }
-    }
-
     private void deleteApn() {
-        getContentResolver().delete(mUri, null, null);
-        finish();
+        new AlertDialog.Builder(getActivity())
+        .setMessage(R.string.confirm_delete_apn)
+        .setCancelable(true)
+        .setPositiveButton(R.string.delete,new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog,int id) {
+                getContentResolver().delete(mUri, null, null);
+                finish();
+            }
+        })
+        .setNegativeButton(R.string.cancel, null)
+        .show();
     }
 
     private String starify(String value) {
diff --git a/src/com/android/settings/ApnPreference.java b/src/com/android/settings/ApnPreference.java
index addb695cafc..89e1e872878 100644
--- a/src/com/android/settings/ApnPreference.java
+++ b/src/com/android/settings/ApnPreference.java
@@ -16,23 +16,17 @@
 
 package com.android.settings;
 
-import android.content.ContentUris;
 import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
 import android.preference.Preference;
-import android.provider.Telephony;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.View.OnClickListener;
 import android.widget.CompoundButton;
 import android.widget.RadioButton;
-import android.widget.RelativeLayout;
 
 public class ApnPreference extends Preference implements
-        CompoundButton.OnCheckedChangeListener, OnClickListener {
+        CompoundButton.OnCheckedChangeListener {
     final static String TAG = "ApnPreference";
 
     public ApnPreference(Context context, AttributeSet attrs, int defStyle) {
@@ -56,9 +50,10 @@ public ApnPreference(Context context) {
     public View getView(View convertView, ViewGroup parent) {
         View view = super.getView(convertView, parent);
 
-        View widget = view.findViewById(R.id.apn_radiobutton);
+        View widget = view.findViewById(android.R.id.checkbox);
         if ((widget != null) && widget instanceof RadioButton) {
             RadioButton rb = (RadioButton) widget;
+            rb.setClickable(true);
             if (mSelectable) {
                 rb.setOnCheckedChangeListener(this);
 
@@ -76,11 +71,6 @@ public View getView(View convertView, ViewGroup parent) {
             }
         }
 
-        View textLayout = view.findViewById(R.id.text_layout);
-        if ((textLayout != null) && textLayout instanceof RelativeLayout) {
-            textLayout.setOnClickListener(this);
-        }
-
         return view;
     }
 
@@ -111,17 +101,6 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         }
     }
 
-    public void onClick(android.view.View v) {
-        if ((v != null) && (R.id.text_layout == v.getId())) {
-            Context context = getContext();
-            if (context != null) {
-                int pos = Integer.parseInt(getKey());
-                Uri url = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, pos);
-                context.startActivity(new Intent(Intent.ACTION_EDIT, url));
-            }
-        }
-    }
-
     public void setSelectable(boolean selectable) {
         mSelectable = selectable;
     }
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 3fbb5e3ab2c..2b71a726a71 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -16,6 +16,8 @@
 
 package com.android.settings;
 
+import java.util.ArrayList;
+
 import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
@@ -39,6 +41,7 @@
 import android.provider.Telephony;
 import android.util.Log;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.Toast;
 
@@ -47,9 +50,7 @@
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
 
-import java.util.ArrayList;
-
-public class ApnSettings extends PreferenceActivity implements
+public class ApnSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
     static final String TAG = "ApnSettings";
 
@@ -116,21 +117,20 @@ private static PhoneConstants.DataState getMobileDataState(Intent intent) {
     }
 
     @Override
-    protected void onCreate(Bundle icicle) {
+    public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-
         addPreferencesFromResource(R.xml.apn_settings);
-        getListView().setItemsCanFocus(true);
 
         mMobileStateFilter = new IntentFilter(
                 TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
+        setHasOptionsMenu(true);
     }
 
     @Override
-    protected void onResume() {
+    public void onResume() {
         super.onResume();
 
-        registerReceiver(mMobileStateReceiver, mMobileStateFilter);
+        getActivity().registerReceiver(mMobileStateReceiver, mMobileStateFilter);
 
         if (!mRestoreDefaultApnMode) {
             fillList();
@@ -140,14 +140,13 @@ protected void onResume() {
     }
 
     @Override
-    protected void onPause() {
+    public void onPause() {
         super.onPause();
-
-        unregisterReceiver(mMobileStateReceiver);
+        getActivity().unregisterReceiver(mMobileStateReceiver);
     }
 
     @Override
-    protected void onDestroy() {
+    public void onDestroy() {
         super.onDestroy();
 
         if (mRestoreDefaultApnThread != null) {
@@ -165,7 +164,7 @@ private void fillList() {
                 Telephony.Carriers.DEFAULT_SORT_ORDER);
 
         if (cursor != null) {
-            PreferenceGroup apnList = (PreferenceGroup) findPreference("apn_list");
+            PreferenceGroup apnList = (PreferenceGroup) getPreferenceScreen().findPreference("apn_list");
             apnList.removeAll();
 
             ArrayList<Preference> mmsApnList = new ArrayList<Preference>();
@@ -178,7 +177,7 @@ private void fillList() {
                 String key = cursor.getString(ID_INDEX);
                 String type = cursor.getString(TYPES_INDEX);
 
-                ApnPreference pref = new ApnPreference(this);
+                ApnPreference pref = new ApnPreference(getActivity());
 
                 pref.setKey(key);
                 pref.setTitle(name);
@@ -207,8 +206,8 @@ private void fillList() {
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
         menu.add(0, MENU_NEW, 0,
                 getResources().getString(R.string.menu_new))
                 .setIcon(android.R.drawable.ic_menu_add)
@@ -216,7 +215,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
         menu.add(0, MENU_RESTORE, 0,
                 getResources().getString(R.string.menu_restore))
                 .setIcon(android.R.drawable.ic_menu_upload);
-        return true;
     }
 
     @Override
@@ -234,14 +232,22 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void addNewApn() {
-        startActivity(new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI));
+        Bundle editBundle = new Bundle();
+        editBundle.putString(ApnEditor.EDIT_ACTION, Intent.ACTION_INSERT);
+        editBundle.putString(ApnEditor.EDIT_DATA, Telephony.Carriers.CONTENT_URI.toSafeString());
+        ((PreferenceActivity) getActivity()).startPreferencePanel(ApnEditor.class.getName(), editBundle,
+                            R.string.apn_edit, null, null, 0);
     }
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         int pos = Integer.parseInt(preference.getKey());
         Uri url = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, pos);
-        startActivity(new Intent(Intent.ACTION_EDIT, url));
+        Bundle editBundle = new Bundle();
+        editBundle.putString(ApnEditor.EDIT_ACTION, Intent.ACTION_EDIT);
+        editBundle.putString(ApnEditor.EDIT_DATA, url.toSafeString());
+        ((PreferenceActivity) getActivity()).startPreferencePanel(ApnEditor.class.getName(), editBundle,
+                R.string.apn_edit, null, null, 0);
         return true;
     }
 
@@ -278,6 +284,12 @@ private String getSelectedApnKey() {
         return key;
     }
 
+    @Override
+    protected void showDialog(int dialogId) {
+        removeDialog(dialogId);
+        super.showDialog(dialogId);
+    }
+
     private boolean restoreDefaultApn() {
         showDialog(DIALOG_RESTORE_DEFAULTAPN);
         mRestoreDefaultApnMode = true;
@@ -308,9 +320,9 @@ public void handleMessage(Message msg) {
                     fillList();
                     getPreferenceScreen().setEnabled(true);
                     mRestoreDefaultApnMode = false;
-                    dismissDialog(DIALOG_RESTORE_DEFAULTAPN);
+                    removeDialog(DIALOG_RESTORE_DEFAULTAPN);
                     Toast.makeText(
-                        ApnSettings.this,
+                        getActivity(),
                         getResources().getString(
                                 R.string.restore_default_apn_completed),
                         Toast.LENGTH_LONG).show();
@@ -341,20 +353,16 @@ public void handleMessage(Message msg) {
     }
 
     @Override
-    protected Dialog onCreateDialog(int id) {
+    public Dialog onCreateDialog(int id) {
         if (id == DIALOG_RESTORE_DEFAULTAPN) {
-            ProgressDialog dialog = new ProgressDialog(this);
+            ProgressDialog dialog = new ProgressDialog(getActivity());
             dialog.setMessage(getResources().getString(R.string.restore_default_apn));
             dialog.setCancelable(false);
+            dialog.setCanceledOnTouchOutside(false);
+            getPreferenceScreen().setEnabled(false);
             return dialog;
         }
         return null;
     }
 
-    @Override
-    protected void onPrepareDialog(int id, Dialog dialog) {
-        if (id == DIALOG_RESTORE_DEFAULTAPN) {
-            getPreferenceScreen().setEnabled(false);
-        }
-    }
 }
diff --git a/src/com/android/settings/BandMode.java b/src/com/android/settings/BandMode.java
index 0a0f77fdb20..2c636ec650e 100644
--- a/src/com/android/settings/BandMode.java
+++ b/src/com/android/settings/BandMode.java
@@ -17,18 +17,14 @@
 import android.widget.ArrayAdapter;
 import android.widget.AdapterView;
 
-
 /**
  * Radio Band Mode Selection Class
- *
- * It will query baseband about all available band modes and display them
- * in screen. It will display all six band modes if the query failed.
- *
- * After user select one band, it will send the selection to baseband.
- *
- * It will alter user the result of select operation and exit, no matter success
- * or not.
- *
+ * This will query the device for all available band modes
+ * and display the options on the screen. If however it fails it will then
+ * display all the available band modes that are in the BAND_NAMES array.
+ * After the user selects a band, it will attempt to set the band mode 
+ * regardless of the outcome. However if the bandmode will not work RIL.Java
+ * will catch it and throw a GENERIC_FAILURE or RADIO_NOT_AVAILABLE error
  */
 public class BandMode extends Activity {
     private static final String LOG_TAG = "phone";
@@ -36,14 +32,31 @@ public class BandMode extends Activity {
 
     private static final int EVENT_BAND_SCAN_COMPLETED = 100;
     private static final int EVENT_BAND_SELECTION_DONE = 200;
-
+/*
+* pulled from hardware/ril/include/telephony/ril.h and cleaned up a little
+* there ought to be a better way to do this...
+* make queryAvailableBandMode return something other than just an int array?
+*/
     private static final String[] BAND_NAMES = new String[] {
             "Automatic",
-            "EURO Band",
-            "USA Band",
-            "JAPAN Band",
-            "AUS Band",
-            "AUS2 Band"
+            "EURO Band     (GSM-900/DCS-1800/WCDMA-IMT-2000)",
+            "USA Band      (GSM-850/PCS-1900/WCDMA-850/WCDMA-PCS-1900)",
+            "JAPAN Band    (WCDMA-800/WCDMA-IMT-2000)",
+            "AUS Band      (GSM-900/DCS-1800/WCDMA-850/WCDMA-IMT-2000)",
+            "AUS2 Band     (GSM-900/DCS-1800/WCDMA-850)",
+            "Cellular      (800-MHz)",
+            "PCS           (1900-MHz)",
+            "Band Class 3  (JTACS Band)",
+            "Band Class 4  (Korean PCS Band)",
+            "Band Class 5  (450-MHz Band)",
+            "Band Class 6  (2-GMHz IMT2000 Band)",
+            "Band Class 7  (Upper 700-MHz Band)",
+            "Band Class 8  (1800-MHz Band)",
+            "Band Class 9  (900-MHz Band)",
+            "Band Class 10 (Secondary 800-MHz Band)",
+            "Band Class 11 (400-MHz European PAMR Band)",
+            "Band Class 15 (AWS Band)",
+            "Band Class 16 (US 2.5-GHz Band)"
     };
 
     private ListView mBandList;
@@ -141,21 +154,21 @@ private void bandListLoaded(AsyncResult result) {
 
         if (result.result != null) {
             int bands[] = (int[])result.result;
-            int size = bands[0];
-
-            if (size > 0) {
-                for (int i=1; i<size; i++) {
-                    item = new BandListItem(bands[i]);
-                    mBandListAdapter.add(item);
-                    if (DBG) log("Add " + item.toString());
-                }
-                addBandSuccess = true;
+            //Always show Band 0, ie Automatic
+            item = new BandListItem(0);
+            mBandListAdapter.add(item);
+            if (DBG) log("Add " + item.toString());
+            for (int i=0; i<bands.length; i++) {
+                item = new BandListItem(bands[i]);
+                mBandListAdapter.add(item);
+                if (DBG) log("Add " + item.toString());
             }
+            addBandSuccess = true;
         }
 
         if (addBandSuccess == false) {
             if (DBG) log("Error in query, add default list");
-            for (int i=0; i<Phone.BM_BOUNDARY; i++) {
+            for (int i=0; i<BAND_NAMES.length; i++) {
                 item = new BandListItem(i);
                 mBandListAdapter.add(item);
                 if (DBG) log("Add default " + item.toString());
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index e53f129af93..afaaaf01511 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -64,6 +64,7 @@
 import android.widget.CompoundButton;
 import android.widget.Switch;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import dalvik.system.VMRuntime;
 
@@ -91,6 +92,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
     public static final String PREF_SHOW = "show";
 
     private static final String ENABLE_ADB = "enable_adb";
+    private static final String ADB_NOTIFY = "adb_notify";
     private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
     private static final String ENABLE_TERMINAL = "enable_terminal";
     private static final String KEEP_SCREEN_ON = "keep_screen_on";
@@ -150,6 +152,10 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
 
     private static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
 
+    private static final String KEY_CHAMBER_OF_SECRETS = "chamber_of_secrets";
+    private static final String KEY_CHAMBER_OF_UNLOCKED_SECRETS =
+            "chamber_of_unlocked_secrets";
+
     private static final int RESULT_DEBUG_APP = 1000;
 
     private IWindowManager mWindowManager;
@@ -160,8 +166,10 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
     private boolean mLastEnabledState;
     private boolean mHaveDebugSettings;
     private boolean mDontPokeProperties;
+    private boolean mUnofficialBuild;
 
     private CheckBoxPreference mEnableAdb;
+    private CheckBoxPreference mAdbNotify;
     private Preference mClearAdbKeys;
     private CheckBoxPreference mEnableTerminal;
     private Preference mBugreport;
@@ -207,6 +215,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
 
     private CheckBoxPreference mShowAllANRs;
 
+    private Preference mChamber;
+    private CheckBoxPreference mChamberUnlocked;
+
     private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
     private final ArrayList<CheckBoxPreference> mResetCbPrefs
             = new ArrayList<CheckBoxPreference>();
@@ -231,6 +242,8 @@ public DevelopmentSettings() {
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
+        mUnofficialBuild = android.os.Build.VERSION.CODENAME.equals("UNOFFICIAL");
+
         mWindowManager = IWindowManager.Stub.asInterface(ServiceManager.getService("window"));
         mBackupManager = IBackupManager.Stub.asInterface(
                 ServiceManager.getService(Context.BACKUP_SERVICE));
@@ -248,6 +261,7 @@ public void onCreate(Bundle icicle) {
                 findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
 
         mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB);
+        mAdbNotify = findAndInitCheckboxPref(ADB_NOTIFY);
         mClearAdbKeys = findPreference(CLEAR_ADB_KEYS);
         if (!SystemProperties.getBoolean("ro.adb.secure", false)) {
             if (debugDebuggingCategory != null) {
@@ -337,6 +351,22 @@ public void onCreate(Bundle icicle) {
             mAllPrefs.add(mRootAccess);
         }
 
+        mChamber = (Preference) findPreference(KEY_CHAMBER_OF_SECRETS);
+        mAllPrefs.add(mChamber);
+        mChamberUnlocked =
+                findAndInitCheckboxPref(KEY_CHAMBER_OF_UNLOCKED_SECRETS);
+        mChamberUnlocked.setOnPreferenceChangeListener(this);
+
+        boolean chamberOpened = Settings.Secure.getInt(
+                getActivity().getContentResolver(),
+                Settings.Secure.CHAMBER_OF_SECRETS, 0) == 1;
+        mChamberUnlocked.setChecked(chamberOpened);
+
+        if (chamberOpened) {
+            removePreference(mChamber);
+        } else {
+            removePreference(mChamberUnlocked);
+        }
     }
 
     private ListPreference addListPreference(String prefKey) {
@@ -425,6 +455,12 @@ private void removePreference(Preference preference) {
         mAllPrefs.remove(preference);
     }
 
+    private void addPreference(Preference preference) {
+        getPreferenceScreen().addPreference(preference);
+        preference.setOnPreferenceChangeListener(this);
+        mAllPrefs.add(preference);
+    }
+
     private void setPrefsEnabledState(boolean enabled) {
         for (int i = 0; i < mAllPrefs.size(); i++) {
             Preference pref = mAllPrefs.get(i);
@@ -486,7 +522,9 @@ private void updateAllOptions() {
         final ContentResolver cr = context.getContentResolver();
         mHaveDebugSettings = false;
         updateCheckBox(mEnableAdb, Settings.Global.getInt(cr,
-                Settings.Global.ADB_ENABLED, 0) != 0);
+                Settings.Global.ADB_ENABLED, mUnofficialBuild ? 1 : 0) != 0);
+        mAdbNotify.setChecked(Settings.Secure.getInt(cr,
+            Settings.Secure.ADB_NOTIFY, 1) != 0);
         if (mEnableTerminal != null) {
             updateCheckBox(mEnableTerminal,
                     context.getPackageManager().getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)
@@ -600,14 +638,14 @@ private void updateRuntimeValue() {
     }
 
     private void updateRootAccessOptions() {
-        String value = SystemProperties.get(ROOT_ACCESS_PROPERTY, "0");
+        String value = SystemProperties.get(ROOT_ACCESS_PROPERTY, mUnofficialBuild ? "1" : "0");
         mRootAccess.setValue(value);
         mRootAccess.setSummary(getResources()
                 .getStringArray(R.array.root_access_entries)[Integer.valueOf(value)]);
     }
 
     private void writeRootAccessOptions(Object newValue) {
-        String oldValue = SystemProperties.get(ROOT_ACCESS_PROPERTY, "0");
+        String oldValue = SystemProperties.get(ROOT_ACCESS_PROPERTY, mUnofficialBuild ? "1" : "0");
         SystemProperties.set(ROOT_ACCESS_PROPERTY, newValue.toString());
         if (Integer.valueOf(newValue.toString()) < 2 && !oldValue.equals(newValue)
                 && "1".equals(SystemProperties.get("service.adb.root", "0"))) {
@@ -621,7 +659,7 @@ private void writeRootAccessOptions(Object newValue) {
     }
 
     private void resetRootAccessOptions() {
-        String oldValue = SystemProperties.get(ROOT_ACCESS_PROPERTY, "0");
+        String oldValue = SystemProperties.get(ROOT_ACCESS_PROPERTY, mUnofficialBuild ? "1" : "0");
         SystemProperties.set(ROOT_ACCESS_PROPERTY, "0");
         if (!oldValue.equals("1") && "1".equals(SystemProperties.get("service.adb.root", "0"))) {
             SystemProperties.set("service.adb.root", "0");
@@ -725,7 +763,8 @@ private void writeVerifyAppsOverUsbOptions() {
 
     private boolean enableVerifierSetting() {
         final ContentResolver cr = getActivity().getContentResolver();
-        if (Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, 0) == 0) {
+        if (Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED,
+                    mUnofficialBuild ? 1 : 0) == 0) {
             return false;
         }
         if (Settings.Global.getInt(cr, Settings.Global.PACKAGE_VERIFIER_ENABLE, 1) == 0) {
@@ -752,7 +791,7 @@ private void updateBugreportOptions() {
         if ("user".equals(Build.TYPE)) {
             final ContentResolver resolver = getActivity().getContentResolver();
             final boolean adbEnabled = Settings.Global.getInt(
-                    resolver, Settings.Global.ADB_ENABLED, 0) != 0;
+                    resolver, Settings.Global.ADB_ENABLED, mUnofficialBuild ? 1 : 0) != 0;
             if (adbEnabled) {
                 mBugreport.setEnabled(true);
                 mBugreportInPower.setEnabled(true);
@@ -1258,6 +1297,10 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
                         .setPositiveButton(android.R.string.ok, this)
                         .setNegativeButton(android.R.string.cancel, null)
                         .show();
+        } else if (preference == mAdbNotify) {
+            Settings.Secure.putInt(getActivity().getContentResolver(),
+                    Settings.Secure.ADB_NOTIFY,
+                    mAdbNotify.isChecked() ? 1 : 0);
         } else if (preference == mEnableTerminal) {
             final PackageManager pm = getActivity().getPackageManager();
             pm.setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
@@ -1314,6 +1357,18 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
             writeForceRtlOptions();
         } else if (preference == mWifiDisplayCertification) {
             writeWifiDisplayCertificationOptions();
+        } else if (preference == mChamber) {
+            if (Settings.Secure.getInt(getActivity().getContentResolver(),
+                    Settings.Secure.CHAMBER_OF_SECRETS, 0) == 0) {
+                Settings.Secure.putInt(getActivity().getContentResolver(),
+                        Settings.Secure.CHAMBER_OF_SECRETS, 1);
+                Toast.makeText(getActivity(),
+                        R.string.chamber_toast,
+                        Toast.LENGTH_LONG).show();
+                getPreferenceScreen().removePreference(mChamber);
+                addPreference(mChamberUnlocked);
+                mChamberUnlocked.setChecked(true);
+            }
         } else {
             return super.onPreferenceTreeClick(preferenceScreen, preference);
         }
@@ -1383,7 +1438,7 @@ public void onClick(DialogInterface dialog, int which) {
             writeAppProcessLimitOptions(newValue);
             return true;
         } else if (preference == mRootAccess) {
-            if ("0".equals(SystemProperties.get(ROOT_ACCESS_PROPERTY, "0"))
+            if ("0".equals(SystemProperties.get(ROOT_ACCESS_PROPERTY, mUnofficialBuild ? "1" : "0"))
                     && !"0".equals(newValue)) {
                 mSelectedRootValue = newValue;
                 mDialogClicked = false;
@@ -1401,6 +1456,11 @@ public void onClick(DialogInterface dialog, int which) {
                 writeRootAccessOptions(newValue);
             }
             return true;
+        } else if (preference == mChamberUnlocked) {
+            Settings.Secure.putInt(getActivity().getContentResolver(),
+                    Settings.Secure.CHAMBER_OF_SECRETS,
+                    (Boolean) newValue ? 1 : 0);
+            return true;
         }
         return false;
     }
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 31e1f31aba0..b638a91a40a 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -62,6 +62,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
     private static final String KEY_SCREEN_SAVER = "screensaver";
     private static final String KEY_VOLUME_WAKE = "pref_volume_wake";
     private static final String KEY_ANIMATION_OPTIONS = "category_animation_options";
+    private static final String KEY_LISTVIEW_ANIMATION = "listview_animation";
+    private static final String KEY_LISTVIEW_INTERPOLATOR = "listview_interpolator";
     private static final String KEY_POWER_CRT_MODE = "system_power_crt_mode";
     private static final String KEY_WAKEUP_WHEN_PLUGGED_UNPLUGGED = "wakeup_when_plugged_unplugged";
     private static final String KEY_WAKEUP_CATEGORY = "category_wakeup_options";
@@ -81,15 +83,17 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
     private PreferenceScreen mBatteryPulse;
     private CheckBoxPreference mVolumeWake;
     private ListPreference mCrtMode;
+    private ListPreference mListViewAnimation;
+    private ListPreference mListViewInterpolator;
     private CheckBoxPreference mWakeUpWhenPluggedOrUnplugged;
     private PreferenceCategory mWakeUpOptions;
 
     private final Configuration mCurConfig = new Configuration();
-    
+
     private ListPreference mScreenTimeoutPreference;
     private Preference mScreenSaverPreference;
 
-    private ContentObserver mAccelerometerRotationObserver = 
+    private ContentObserver mAccelerometerRotationObserver =
             new ContentObserver(new Handler()) {
         @Override
         public void onChange(boolean selfChange) {
@@ -198,15 +202,32 @@ && getResources().getBoolean(
         PreferenceCategory animationOptions =
             (PreferenceCategory) prefSet.findPreference(KEY_ANIMATION_OPTIONS);
         mCrtMode = (ListPreference) prefSet.findPreference(KEY_POWER_CRT_MODE);
-        if (!electronBeamFadesConfig && mCrtMode != null) {
-            int crtMode = Settings.System.getInt(getContentResolver(),
-                    Settings.System.SYSTEM_POWER_CRT_MODE, 1);
-            mCrtMode.setValue(String.valueOf(crtMode));
-            mCrtMode.setSummary(mCrtMode.getEntry());
-            mCrtMode.setOnPreferenceChangeListener(this);
-        } else if (animationOptions != null) {
-            prefSet.removePreference(animationOptions);
+        if (mCrtMode != null) {
+            if (!electronBeamFadesConfig) {
+                int crtMode = Settings.System.getInt(getContentResolver(),
+                        Settings.System.SYSTEM_POWER_CRT_MODE, 1);
+                mCrtMode.setValue(String.valueOf(crtMode));
+                mCrtMode.setSummary(mCrtMode.getEntry());
+                mCrtMode.setOnPreferenceChangeListener(this);
+            } else if (animationOptions != null) {
+                animationOptions.removePreference(mCrtMode);
+            }
         }
+
+        mListViewAnimation = (ListPreference) prefSet.findPreference(KEY_LISTVIEW_ANIMATION);
+        int listviewanimation = Settings.System.getInt(getContentResolver(),
+                Settings.System.LISTVIEW_ANIMATION, 0);
+        mListViewAnimation.setValue(String.valueOf(listviewanimation));
+        mListViewAnimation.setSummary(mListViewAnimation.getEntry());
+        mListViewAnimation.setOnPreferenceChangeListener(this);
+
+        mListViewInterpolator = (ListPreference) prefSet.findPreference(KEY_LISTVIEW_INTERPOLATOR);
+        int listviewinterpolator = Settings.System.getInt(getContentResolver(),
+                Settings.System.LISTVIEW_INTERPOLATOR, 0);
+        mListViewInterpolator.setValue(String.valueOf(listviewinterpolator));
+        mListViewInterpolator.setSummary(mListViewInterpolator.getEntry());
+        mListViewInterpolator.setOnPreferenceChangeListener(this);
+        mListViewInterpolator.setEnabled(listviewanimation > 0);
     }
 
     private void updateTimeoutPreferenceDescription(long currentTimeout) {
@@ -467,6 +488,23 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
                     value);
             mCrtMode.setSummary(mCrtMode.getEntries()[index]);
         }
+        if (KEY_LISTVIEW_ANIMATION.equals(key)) {
+            int value = Integer.parseInt((String) objValue);
+            int index = mListViewAnimation.findIndexOfValue((String) objValue);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.LISTVIEW_ANIMATION,
+                    value);
+            mListViewAnimation.setSummary(mListViewAnimation.getEntries()[index]);
+            mListViewInterpolator.setEnabled(value > 0);
+        }
+        if (KEY_LISTVIEW_INTERPOLATOR.equals(key)) {
+            int value = Integer.parseInt((String) objValue);
+            int index = mListViewInterpolator.findIndexOfValue((String) objValue);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.LISTVIEW_INTERPOLATOR,
+                    value);
+            mListViewInterpolator.setSummary(mListViewInterpolator.getEntries()[index]);
+        }
         if (KEY_WAKEUP_WHEN_PLUGGED_UNPLUGGED.equals(key)) {
             Settings.System.putInt(getContentResolver(),
                     Settings.System.WAKEUP_WHEN_PLUGGED_UNPLUGGED,
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index adbfa9a55f6..93dba7a1531 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -69,12 +69,14 @@ public class SecuritySettings extends RestrictedSettingsFragment
     private static final String KEY_DEVICE_ADMIN_CATEGORY = "device_admin_category";
     private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout";
     private static final String KEY_OWNER_INFO_SETTINGS = "owner_info_settings";
+    private static final String KEY_ALWAYS_BATTERY_PREF = "lockscreen_battery_status";
     private static final String KEY_ENABLE_WIDGETS = "keyguard_enable_widgets";
     private static final String KEY_INTERFACE_SETTINGS = "lock_screen_settings";
     private static final String KEY_TARGET_SETTINGS = "lockscreen_targets";
     private static final String LOCKSCREEN_QUICK_UNLOCK_CONTROL = "quick_unlock_control";
     private static final String LOCK_NUMPAD_RANDOM = "lock_numpad_random";
     private static final String LOCK_BEFORE_UNLOCK = "lock_before_unlock";
+    private static final String KEY_ADVANCED_REBOOT = "advanced_reboot";
 
     private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
     private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST = 124;
@@ -117,11 +119,14 @@ public class SecuritySettings extends RestrictedSettingsFragment
     private CheckBoxPreference mToggleVerifyApps;
     private CheckBoxPreference mPowerButtonInstantlyLocks;
     private Preference mEnableKeyguardWidgets;
+    private ListPreference mAdvancedReboot;
 
     private CheckBoxPreference mQuickUnlockScreen;
     private ListPreference mLockNumpadRandom;
     private CheckBoxPreference mLockBeforeUnlock;
 
+    private CheckBoxPreference mBatteryStatus;
+
     private Preference mNotificationAccess;
 
     private boolean mIsPrimary;
@@ -156,6 +161,10 @@ private PreferenceScreen createPreferenceHierarchy() {
         // Add package manager to check if features are available
         PackageManager pm = getPackageManager();
 
+        // App security settings
+        addPreferencesFromResource(R.xml.security_settings_app_slim);
+        mBlacklist = (PreferenceScreen) root.findPreference(KEY_BLACKLIST);
+
         // Add options for lock/unlock screen
         int resid = 0;
         if (!mLockPatternUtils.isSecure()) {
@@ -326,6 +335,8 @@ private PreferenceScreen createPreferenceHierarchy() {
             }
         }
 
+        mBatteryStatus = (CheckBoxPreference) root.findPreference(KEY_ALWAYS_BATTERY_PREF);
+
         // Show password
         mShowPassword = (CheckBoxPreference) root.findPreference(KEY_SHOW_PASSWORD);
         mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
@@ -372,9 +383,11 @@ private PreferenceScreen createPreferenceHierarchy() {
             }
         }
 
-        // App security settings
-        addPreferencesFromResource(R.xml.security_settings_app_slim);
-        mBlacklist = (PreferenceScreen) root.findPreference(KEY_BLACKLIST);
+        mAdvancedReboot = (ListPreference) root.findPreference(KEY_ADVANCED_REBOOT);
+        mAdvancedReboot.setValue(String.valueOf(Settings.Secure.getInt(
+                getContentResolver(), Settings.Secure.ADVANCED_REBOOT, 0)));
+        mAdvancedReboot.setSummary(mAdvancedReboot.getEntry());
+        mAdvancedReboot.setOnPreferenceChangeListener(this);
 
         // Determine options based on device telephony support
         if (!pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
@@ -583,6 +596,13 @@ public void onResume() {
             }
         }
 
+        if (mBatteryStatus != null) {
+            mBatteryStatus.setChecked(Settings.System.getIntForUser(getContentResolver(),
+                    Settings.System.LOCKSCREEN_ALWAYS_SHOW_BATTERY, 0,
+                    UserHandle.USER_CURRENT) != 0);
+            mBatteryStatus.setOnPreferenceChangeListener(this);
+        }
+
         updateBlacklistSummary();
     }
 
@@ -706,6 +726,15 @@ public boolean onPreferenceChange(Preference preference, Object value) {
             Settings.Secure.putInt(getContentResolver(),
                     Settings.Secure.LOCK_BEFORE_UNLOCK,
                     ((Boolean) value) ? 1 : 0);
+        } else if (preference == mAdvancedReboot) {
+            Settings.Secure.putInt(getContentResolver(), Settings.Secure.ADVANCED_REBOOT,
+                    Integer.valueOf((String) value));
+            mAdvancedReboot.setValue(String.valueOf(value));
+            mAdvancedReboot.setSummary(mAdvancedReboot.getEntry());
+        } else if (preference == mBatteryStatus) {
+            Settings.System.putIntForUser(getContentResolver(),
+                    Settings.System.LOCKSCREEN_ALWAYS_SHOW_BATTERY,
+                    ((Boolean) value) ? 1 : 0, UserHandle.USER_CURRENT);
         }
         return true;
     }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 0a911fa7ee5..4d24f7571d8 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -88,6 +88,7 @@
 import com.android.settings.slim.BatteryIconStyle;
 import com.android.settings.slim.blacklist.BlacklistSettings;
 import com.android.settings.slim.DisplayRotation;
+import com.android.settings.slim.quicksettings.QuickSettingsTiles;
 import com.android.settings.slim.QuietHours;
 import com.android.settings.slim.themes.ThemeEnabler;
 import com.android.settings.tts.TextToSpeechSettings;
@@ -361,8 +362,10 @@ public boolean onIsMultiPane() {
         KeyboardLayoutPickerFragment.class.getName(),
         BlacklistSettings.class.getName(),
         QuietHours.class.getName(),
+        QuickSettingsTiles.class.getName(),
         BatteryIconStyle.class.getName(),
-        DisplayRotation.class.getName()
+        DisplayRotation.class.getName(),
+        ApnSettings.class.getName()
     };
 
     @Override
@@ -556,7 +559,8 @@ public void onBuildHeaders(List<Header> headers) {
     private void updateHeaderList(List<Header> target) {
         final boolean showDev = mDevelopmentPreferences.getBoolean(
                 DevelopmentSettings.PREF_SHOW,
-                android.os.Build.TYPE.equals("eng"));
+                android.os.Build.TYPE.equals("eng"))
+                || android.os.Build.VERSION.CODENAME.equals("UNOFFICIAL");
         int i = 0;
 
         final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
@@ -613,9 +617,13 @@ private void updateHeaderList(List<Header> target) {
                 } else {
                     // Only show if NFC is on and we have the HCE feature
                     NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
-                    if (!adapter.isEnabled() || !getPackageManager().hasSystemFeature(
-                            PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
-                        target.remove(i);
+                    if (adapter == null || !adapter.isEnabled()
+                            || !getPackageManager().hasSystemFeature(
+                                    PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
+                       target.remove(i);
+                       if (adapter == null) {
+                           Log.e(LOG_TAG, "NFC feature advertised but the default adapter is NULL!");
+                       }
                     }
                 }
             } else if (id == R.id.development_settings) {
@@ -1160,8 +1168,11 @@ public static class TrustedCredentialsSettingsActivity extends Settings { /* emp
     public static class PaymentSettingsActivity extends Settings { /* empty */ }
     public static class PrintSettingsActivity extends Settings { /* empty */ }
     public static class PrintJobSettingsActivity extends Settings { /* empty */ }
+    public static class ApnSettingsActivity extends Settings { /* empty */ }
+    public static class ApnEditorActivity extends Settings { /* empty */ }
     public static class BlacklistSettingsActivity extends Settings { /* empty */ }
     public static class QuietHoursSettingsActivity extends Settings { /* empty */ }
+    public static class QuickSettingsTilesSettingsActivity extends Settings { /* empty */ }
     public static class BatteryIconStyleSettingsActivity extends Settings { /* empty */ }
     public static class DisplayRotationSettingsActivity extends Settings { /* empty */ }
 }
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 25c97061d2b..2f5150bb69f 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -37,6 +37,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.UserHandle;
 import android.os.Vibrator;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -47,6 +48,9 @@
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.util.Log;
+import android.view.VolumePanel;
+
+import com.android.settings.widget.SeekBarPreference;
 
 import java.util.List;
 
@@ -65,10 +69,12 @@ public class SoundSettings extends SettingsPreferenceFragment implements
     private static final String KEY_DTMF_TONE = "dtmf_tone";
     private static final String KEY_SOUND_EFFECTS = "sound_effects";
     private static final String KEY_HAPTIC_FEEDBACK = "haptic_feedback";
+    private static final String KEY_VIBRATION_DURATION = "vibration_duration";
     private static final String KEY_EMERGENCY_TONE = "emergency_tone";
     private static final String KEY_SOUND_SETTINGS = "sound_settings";
     private static final String KEY_LOCK_SOUNDS = "lock_sounds";
     private static final String KEY_VOLUME_ADJUST_SOUNDS = "volume_adjust_sounds";
+    private static final String KEY_VOLUME_OVERLAY = "volume_overlay";
     private static final String KEY_RINGTONE = "ringtone";
     private static final String KEY_NOTIFICATION_SOUND = "notification_sound";
     private static final String KEY_CATEGORY_CALLS = "category_calls_and_notification";
@@ -89,9 +95,11 @@ public class SoundSettings extends SettingsPreferenceFragment implements
     private CheckBoxPreference mDtmfTone;
     private CheckBoxPreference mSoundEffects;
     private CheckBoxPreference mHapticFeedback;
+    private SeekBarPreference mVibrationDuration;
     private Preference mMusicFx;
     private CheckBoxPreference mLockSounds;
     private Preference mRingtonePreference;
+    private ListPreference mEmergencyTonePreference;
     private Preference mNotificationPreference;
 
     private Runnable mRingtoneLookupRunnable;
@@ -103,6 +111,11 @@ public class SoundSettings extends SettingsPreferenceFragment implements
     private Intent mDockIntent;
     private CheckBoxPreference mDockAudioMediaEnabled;
     private CheckBoxPreference mVolumeAdustSound;
+    private ListPreference mVolumeOverlay;
+
+    private Vibrator mVib;
+
+    private boolean mFirstVibration = false;
 
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
@@ -136,6 +149,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
 
+        mVib = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
         addPreferencesFromResource(R.xml.sound_settings);
 
         if (TelephonyManager.PHONE_TYPE_CDMA != activePhoneType) {
@@ -169,6 +183,14 @@ public void onCreate(Bundle savedInstanceState) {
         mHapticFeedback.setPersistent(false);
         mHapticFeedback.setChecked(Settings.System.getInt(resolver,
                 Settings.System.HAPTIC_FEEDBACK_ENABLED, 1) != 0);
+        int userMillis = Settings.System.getInt(resolver,
+                Settings.System.MINIMUM_VIBRATION_DURATION, 0);
+        mVibrationDuration = (SeekBarPreference) findPreference(KEY_VIBRATION_DURATION);
+        mVibrationDuration.setInterval(1);
+        mVibrationDuration.setDefault(0);
+        mVibrationDuration.isMilliseconds(true);
+        mVibrationDuration.setInitValue(userMillis);
+        mVibrationDuration.setOnPreferenceChangeListener(this);
         mLockSounds = (CheckBoxPreference) findPreference(KEY_LOCK_SOUNDS);
         mLockSounds.setPersistent(false);
         mLockSounds.setChecked(Settings.System.getInt(resolver,
@@ -177,18 +199,18 @@ public void onCreate(Bundle savedInstanceState) {
         mRingtonePreference = findPreference(KEY_RINGTONE);
         mNotificationPreference = findPreference(KEY_NOTIFICATION_SOUND);
 
-        Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
-        if (vibrator == null || !vibrator.hasVibrator()) {
+        if (mVib == null || !mVib.hasVibrator()) {
             removePreference(KEY_VIBRATE);
             removePreference(KEY_HAPTIC_FEEDBACK);
+            removePreference(KEY_VIBRATION_DURATION);
         }
 
         if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) {
-            ListPreference emergencyTonePreference =
+            mEmergencyTonePreference =
                 (ListPreference) findPreference(KEY_EMERGENCY_TONE);
-            emergencyTonePreference.setValue(String.valueOf(Settings.Global.getInt(
+            mEmergencyTonePreference.setValue(String.valueOf(Settings.Global.getInt(
                 resolver, Settings.Global.EMERGENCY_TONE, FALLBACK_EMERGENCY_TONE_VALUE)));
-            emergencyTonePreference.setOnPreferenceChangeListener(this);
+            mEmergencyTonePreference.setOnPreferenceChangeListener(this);
         }
 
         mSoundSettings = (PreferenceGroup) findPreference(KEY_SOUND_SETTINGS);
@@ -233,6 +255,14 @@ public void run() {
                 Settings.System.VOLUME_ADJUST_SOUNDS_ENABLED, 1) == 1);
         mVolumeAdustSound.setOnPreferenceChangeListener(this);
 
+        mVolumeOverlay = (ListPreference) findPreference(KEY_VOLUME_OVERLAY);
+        mVolumeOverlay.setOnPreferenceChangeListener(this);
+        int volumeOverlay = Settings.System.getIntForUser(resolver,
+                Settings.System.MODE_VOLUME_OVERLAY, VolumePanel.VOLUME_OVERLAY_EXPANDABLE,
+                UserHandle.USER_CURRENT);
+        mVolumeOverlay.setValue(Integer.toString(volumeOverlay));
+        mVolumeOverlay.setSummary(mVolumeOverlay.getEntry());
+
         initDockSettings();
     }
 
@@ -351,8 +381,7 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
     }
 
     public boolean onPreferenceChange(Preference preference, Object objValue) {
-        final String key = preference.getKey();
-        if (KEY_EMERGENCY_TONE.equals(key)) {
+        if (preference == mEmergencyTonePreference) {
             try {
                 int value = Integer.parseInt((String) objValue);
                 Settings.Global.putInt(getContentResolver(),
@@ -360,11 +389,24 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
             } catch (NumberFormatException e) {
                 Log.e(TAG, "could not persist emergency tone setting", e);
             }
-        }
-        if (KEY_VOLUME_ADJUST_SOUNDS.equals(key)) {
+        } else if (preference == mVolumeAdustSound) {
             Settings.System.putInt(getContentResolver(),
                 Settings.System.VOLUME_ADJUST_SOUNDS_ENABLED,
                 (Boolean) objValue ? 1 : 0);
+        } else if (preference == mVolumeOverlay) {
+            int value = Integer.valueOf((String) objValue);
+            int index = mVolumeOverlay.findIndexOfValue((String) objValue);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.MODE_VOLUME_OVERLAY, value);
+            mVolumeOverlay.setSummary(mVolumeOverlay.getEntries()[index]);
+        } else if (preference == mVibrationDuration) {
+            int value = Integer.parseInt((String) objValue);
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.MINIMUM_VIBRATION_DURATION, value);
+            if (mFirstVibration && (value % 5 == 0) && mVib != null) {
+                mVib.vibrate(1);
+            }
+            mFirstVibration = true;
         }
         return true;
     }
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 4d24d096850..028d675bfbc 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -35,7 +35,6 @@
 import android.os.RemoteException;
 import android.os.SystemProperties;
 import android.preference.CheckBoxPreference;
-import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
@@ -56,8 +55,8 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
+import com.android.settings.widget.SeekBarPreference;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -119,6 +118,9 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
     // presentation.
     private static final long DELAY_UPDATE_SERVICES_MILLIS = 1000;
 
+    // Default longpress duration
+    private static final int LONGPRESS_TIME_DEFAULT = 500;
+
     // Dialog IDs.
     private static final int DIALOG_ID_NO_ACCESSIBILITY_SERVICES = 1;
 
@@ -128,9 +130,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
 
     static final Set<ComponentName> sInstalledServices = new HashSet<ComponentName>();
 
-    private final Map<String, String> mLongPressTimeoutValuetoTitleMap =
-            new HashMap<String, String>();
-
     private final Configuration mCurConfig = new Configuration();
 
     private final Handler mHandler = new Handler();
@@ -193,14 +192,12 @@ public void onChange() {
     private CheckBoxPreference mTogglePowerButtonEndsCallPreference;
     private CheckBoxPreference mToggleLockScreenRotationPreference;
     private CheckBoxPreference mToggleSpeakPasswordPreference;
-    private ListPreference mSelectLongPressTimeoutPreference;
+    private SeekBarPreference mSelectLongPressTimeoutPreference;
     private Preference mNoServicesMessagePreference;
     private PreferenceScreen mCaptioningPreferenceScreen;
     private PreferenceScreen mDisplayMagnificationPreferenceScreen;
     private PreferenceScreen mGlobalGesturePreferenceScreen;
 
-    private int mLongPressTimeoutDefault;
-
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -241,8 +238,6 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             String stringValue = (String) newValue;
             Settings.Secure.putInt(getContentResolver(),
                     Settings.Secure.LONG_PRESS_TIMEOUT, Integer.parseInt(stringValue));
-            mSelectLongPressTimeoutPreference.setSummary(
-                    mLongPressTimeoutValuetoTitleMap.get(stringValue));
             return true;
         }
         return false;
@@ -353,19 +348,13 @@ private void initializeAllPreferences() {
 
         // Long press timeout.
         mSelectLongPressTimeoutPreference =
-                (ListPreference) findPreference(SELECT_LONG_PRESS_TIMEOUT_PREFERENCE);
+                (SeekBarPreference) findPreference(SELECT_LONG_PRESS_TIMEOUT_PREFERENCE);
+        mSelectLongPressTimeoutPreference.setDefault(LONGPRESS_TIME_DEFAULT);
+        mSelectLongPressTimeoutPreference.isMilliseconds(true);
+        mSelectLongPressTimeoutPreference.setInterval(1);
+        mSelectLongPressTimeoutPreference.minimumValue(80);
+        mSelectLongPressTimeoutPreference.multiplyValue(20);
         mSelectLongPressTimeoutPreference.setOnPreferenceChangeListener(this);
-        if (mLongPressTimeoutValuetoTitleMap.size() == 0) {
-            String[] timeoutValues = getResources().getStringArray(
-                    R.array.long_press_timeout_selector_values);
-            mLongPressTimeoutDefault = Integer.parseInt(timeoutValues[0]);
-            String[] timeoutTitles = getResources().getStringArray(
-                    R.array.long_press_timeout_selector_titles);
-            final int timeoutValueCount = timeoutValues.length;
-            for (int i = 0; i < timeoutValueCount; i++) {
-                mLongPressTimeoutValuetoTitleMap.put(timeoutValues[i], timeoutTitles[i]);
-            }
-        }
 
         // Captioning.
         mCaptioningPreferenceScreen = (PreferenceScreen) findPreference(
@@ -513,10 +502,9 @@ private void updateSystemPreferences() {
 
         // Long press timeout.
         final int longPressTimeout = Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.LONG_PRESS_TIMEOUT, mLongPressTimeoutDefault);
-        String value = String.valueOf(longPressTimeout);
-        mSelectLongPressTimeoutPreference.setValue(value);
-        mSelectLongPressTimeoutPreference.setSummary(mLongPressTimeoutValuetoTitleMap.get(value));
+                Settings.Secure.LONG_PRESS_TIMEOUT, LONGPRESS_TIME_DEFAULT);
+        // Minimum 80 is 4 intervals of the 20 multiplier
+        mSelectLongPressTimeoutPreference.setInitValue((longPressTimeout / 20) - 4);
 
         // Captioning.
         final boolean captioningEnabled = Settings.Secure.getInt(getContentResolver(),
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index face65931d5..f7bde6adaf1 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -1408,11 +1408,10 @@ public void onClick(View v) {
             refreshButtons();
             mPm.movePackage(mAppEntry.info.packageName, mPackageMoveObserver, moveFlags);
         } else if (v == mAppOpsButton) {
-            Bundle args = new Bundle();
-            args.putString(AppOpsDetails.ARG_PACKAGE_NAME, mAppEntry.info.packageName);
-            PreferenceActivity pa = (PreferenceActivity) getActivity();
-            pa.startPreferencePanel(AppOpsDetails.class.getName(), args,
-                    R.string.app_ops_settings, null, this, 2);
+            Intent intent = new Intent(
+                    android.provider.Settings.ACTION_APP_OPS_DETAILS_SETTINGS,
+                    Uri.parse("package:" + mAppEntry.info.packageName));
+            startActivity(intent);
         }
     }
 
diff --git a/src/com/android/settings/applications/LinearColorBar.java b/src/com/android/settings/applications/LinearColorBar.java
index f374c293b32..79c8b886d1d 100644
--- a/src/com/android/settings/applications/LinearColorBar.java
+++ b/src/com/android/settings/applications/LinearColorBar.java
@@ -16,8 +16,8 @@
 import android.widget.LinearLayout;
 
 public class LinearColorBar extends LinearLayout {
-    static final int LEFT_COLOR = 0xff0099cc;
-    static final int MIDDLE_COLOR = 0xff0099cc;
+    static final int LEFT_COLOR = 0xffcccccc;
+    static final int MIDDLE_COLOR = 0xffcccccc;
     static final int RIGHT_COLOR = 0xff888888;
     static final int GRAY_COLOR = 0xff555555;
     static final int WHITE_COLOR = 0xffffffff;
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 513764f1789..b61b81b293e 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -912,7 +912,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         mViewPager.setAdapter(adapter);
         mViewPager.setOnPageChangeListener(adapter);
         PagerTabStrip tabs = (PagerTabStrip) rootView.findViewById(R.id.tabs);
-        tabs.setTabIndicatorColorResource(android.R.color.holo_blue_light);
+        tabs.setTabIndicatorColorResource(R.color.tab_selector);
 
         // We have to do this now because PreferenceFrameLayout looks at it
         // only when the view is added.
@@ -1086,6 +1086,7 @@ void updateOptionsMenu() {
             mOptionsMenu.findItem(SHOW_RUNNING_SERVICES).setVisible(showingBackground);
             mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground);
             mOptionsMenu.findItem(RESET_APP_PREFERENCES).setVisible(false);
+            mShowBackground = showingBackground;
         } else {
             mOptionsMenu.findItem(SORT_ORDER_ALPHA).setVisible(mSortOrder != SORT_ORDER_ALPHA);
             mOptionsMenu.findItem(SORT_ORDER_SIZE).setVisible(mSortOrder != SORT_ORDER_SIZE);
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index 52c48416f96..8eb0496cd53 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -434,6 +434,9 @@ public void doCreate(Bundle savedInstanceState) {
             @Override
             public void onClick(View v) {
                 mAdapter.setShowBackground(true);
+                if (mOwner != null) {
+                    mOwner.getActivity().invalidateOptionsMenu();
+                }
             }
         });
         mForegroundProcessText = (TextView)findViewById(R.id.foregroundText);
@@ -441,6 +444,9 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 mAdapter.setShowBackground(false);
+                if (mOwner != null) {
+                    mOwner.getActivity().invalidateOptionsMenu();
+                }
             }
         });
 
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
index 12637974bfc..56d7b577cb3 100755
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -394,6 +394,14 @@ void setName(String name) {
                 mName = mDevice.getAddress();
             } else {
                 mName = name;
+            }
+            dispatchAttributesChanged();
+        }
+    }
+    void setAliasName(String name) {
+        if (!mName.equals(name)) {
+            if (!TextUtils.isEmpty(name)) {
+                mName = name;
                 mDevice.setAlias(name);
             }
             dispatchAttributesChanged();
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index 335d88835d4..c37e6e64fe7 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -238,7 +238,7 @@ public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference prefere
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference == mDeviceNamePref) {
-            mCachedDevice.setName((String) newValue);
+            mCachedDevice.setAliasName((String) newValue);
         } else if (preference instanceof CheckBoxPreference) {
             LocalBluetoothProfile prof = getProfileOf(preference);
             onProfileClicked(prof, (CheckBoxPreference) preference);
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
index ed5085a2a50..307f5410d36 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.deviceinfo;
 
+import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.ActivityManagerNative;
 import android.app.ActivityThread;
 import android.app.DownloadManager;
@@ -25,28 +27,40 @@
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.hardware.usb.UsbManager;
+import android.media.MediaScannerConnection;
+import android.media.MediaScannerConnection.OnScanCompletedListener;
+import android.net.Uri;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.UserManager;
+import android.os.Environment.UserEnvironment;
 import android.os.storage.StorageManager;
 import android.os.storage.StorageVolume;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.provider.MediaStore;
 import android.text.format.Formatter;
+import android.util.Log;
+import android.widget.Toast;
 
 import com.android.settings.R;
 import com.android.settings.deviceinfo.StorageMeasurement.MeasurementDetails;
 import com.android.settings.deviceinfo.StorageMeasurement.MeasurementReceiver;
+import com.android.settings.deviceinfo.UsageBarPreference.OnRequestMediaRescanListener;
 import com.google.android.collect.Lists;
 
+import java.io.File;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
-public class StorageVolumePreferenceCategory extends PreferenceCategory {
+public class StorageVolumePreferenceCategory extends PreferenceCategory
+    implements OnRequestMediaRescanListener, OnScanCompletedListener {
+
+    public static final String TAG = "StorageVolumePreferenceCategory";
+
     public static final String KEY_CACHE = "cache";
 
     private static final int ORDER_USAGE_BAR = -2;
@@ -55,6 +69,8 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
     /** Physical volume being measured, or {@code null} for internal. */
     private final StorageVolume mVolume;
     private final StorageMeasurement mMeasure;
+    private final boolean mIsInternal;
+    private final boolean mIsPrimary;
 
     private final Resources mResources;
     private final StorageManager mStorageManager;
@@ -121,6 +137,8 @@ private StorageVolumePreferenceCategory(Context context, StorageVolume volume) {
         super(context);
 
         mVolume = volume;
+        mIsInternal = mVolume == null;
+        mIsPrimary = mVolume != null ? mVolume.isPrimary() : false;
         mMeasure = StorageMeasurement.getInstance(context, volume);
 
         mResources = context.getResources();
@@ -150,8 +168,17 @@ public void init() {
         final List<UserInfo> otherUsers = getUsersExcluding(currentUser);
         final boolean showUsers = mVolume == null && otherUsers.size() > 0;
 
+        boolean allowMediaScan = false;
+        if ((mIsInternal && Environment.isExternalStorageEmulated()) || mIsPrimary) {
+            allowMediaScan = true;
+        } else if (mVolume != null && !mVolume.isRemovable()) {
+            allowMediaScan = true;
+        }
+
         mUsageBarPreference = new UsageBarPreference(context);
         mUsageBarPreference.setOrder(ORDER_USAGE_BAR);
+        mUsageBarPreference.setOnRequestMediaRescanListener(this);
+        mUsageBarPreference.setAllowMediaScan(allowMediaScan);
         addPreference(mUsageBarPreference);
 
         mItemTotal = buildItem(R.string.memory_size, 0);
@@ -283,7 +310,7 @@ private void updatePreferencesFromState() {
                 mFormatPreference.setSummary(mResources.getString(R.string.mtp_ptp_mode_summary));
             }
         } else if (mFormatPreference != null) {
-            mFormatPreference.setEnabled(true);
+            mFormatPreference.setEnabled(mMountTogglePreference.isEnabled());
             mFormatPreference.setSummary(mResources.getString(R.string.sd_format_summary));
         }
     }
@@ -477,4 +504,38 @@ private List<UserInfo> getUsersExcluding(UserInfo excluding) {
         }
         return users;
     }
+
+    @Override
+    public void onRequestMediaRescan() {
+        final int currentUser = ActivityManager.getCurrentUser();
+        final UserEnvironment currentEnv = new UserEnvironment(currentUser);
+
+        File path = null;
+        if ((mIsInternal && Environment.isExternalStorageEmulated()) || mIsPrimary) {
+            path = currentEnv.getExternalStorageDirectory();
+        } else {
+            path = mVolume.getPathFile();
+        }
+
+        Log.d(TAG, "Request scan of " + path.getAbsolutePath());
+        MediaScannerConnection.scanFile(
+                getContext(), new String[]{path.getAbsolutePath()}, null, this);
+    }
+
+    @Override
+    public void onScanCompleted(String path, final Uri uri) {
+        if (uri != null) {
+            measure();
+        }
+        ((Activity)getContext()).runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mUsageBarPreference.notifyScanCompleted();
+                if (uri != null) {
+                    Toast.makeText(getContext(),
+                        R.string.storage_rescan_media_complete, Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/UsageBarPreference.java b/src/com/android/settings/deviceinfo/UsageBarPreference.java
index 371c7728837..4002256c7fe 100644
--- a/src/com/android/settings/deviceinfo/UsageBarPreference.java
+++ b/src/com/android/settings/deviceinfo/UsageBarPreference.java
@@ -17,9 +17,13 @@
 package com.android.settings.deviceinfo;
 
 import android.content.Context;
+import android.os.Handler;
 import android.preference.Preference;
 import android.util.AttributeSet;
 import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
 
 import com.android.settings.R;
 import com.google.android.collect.Lists;
@@ -31,23 +35,42 @@
  * Creates a percentage bar chart inside a preference.
  */
 public class UsageBarPreference extends Preference {
+
+    public interface OnRequestMediaRescanListener {
+        void onRequestMediaRescan();
+    }
+
+    private ImageView mRescanMedia = null;
+    private ProgressBar mRescanMediaWaiting = null;
     private PercentageBarChart mChart = null;
 
+    private boolean mAllowMediaScan;
+
+    private OnRequestMediaRescanListener mOnRequestMediaRescanListener;
+
     private final List<PercentageBarChart.Entry> mEntries = Lists.newArrayList();
 
+    private Handler mHandler;
+
     public UsageBarPreference(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        setLayoutResource(R.layout.preference_memoryusage);
+        init();
     }
 
     public UsageBarPreference(Context context) {
         super(context);
-        setLayoutResource(R.layout.preference_memoryusage);
+        init();
     }
 
     public UsageBarPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
+        init();
+    }
+
+    private void init() {
         setLayoutResource(R.layout.preference_memoryusage);
+        mHandler = new Handler();
+        mAllowMediaScan = false;
     }
 
     public void addEntry(int order, float percentage, int color) {
@@ -55,12 +78,50 @@ public void addEntry(int order, float percentage, int color) {
         Collections.sort(mEntries);
     }
 
+    protected void setOnRequestMediaRescanListener(OnRequestMediaRescanListener listener) {
+        mOnRequestMediaRescanListener = listener;
+    }
+
+    protected void setAllowMediaScan(boolean allow) {
+        mAllowMediaScan = allow;
+        notifyScanCompleted();
+    }
+
+    protected void notifyScanCompleted() {
+        if (mRescanMedia != null) {
+            mRescanMedia.setVisibility(mAllowMediaScan ? View.VISIBLE : View.INVISIBLE);
+            mRescanMediaWaiting.setVisibility(View.GONE);
+        }
+    }
+
     @Override
     protected void onBindView(View view) {
         super.onBindView(view);
 
         mChart = (PercentageBarChart) view.findViewById(R.id.percentage_bar_chart);
         mChart.setEntries(mEntries);
+
+        mRescanMediaWaiting =
+                (ProgressBar) view.findViewById(R.id.memory_usage_rescan_media_waiting);
+
+        mRescanMedia = (ImageView) view.findViewById(R.id.memory_usage_rescan_media);
+        mRescanMedia.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mOnRequestMediaRescanListener != null) {
+                    mRescanMedia.setVisibility(View.GONE);
+                    mRescanMediaWaiting.setVisibility(View.VISIBLE);
+                    mHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            mOnRequestMediaRescanListener.onRequestMediaRescan();
+                        }
+                    });
+                }
+            }
+        });
+
+        notifyScanCompleted();
     }
 
     public void commit() {
diff --git a/src/com/android/settings/fuelgauge/BatterySipper.java b/src/com/android/settings/fuelgauge/BatterySipper.java
index fcc8f697044..43ae437ec96 100644
--- a/src/com/android/settings/fuelgauge/BatterySipper.java
+++ b/src/com/android/settings/fuelgauge/BatterySipper.java
@@ -132,10 +132,12 @@ void getQuickNameIconForUid(Uid uidObj) {
         final String uidString = Integer.toString(uid);
         if (sUidCache.containsKey(uidString)) {
             UidToDetail utd = sUidCache.get(uidString);
-            defaultPackageName = utd.packageName;
-            name = utd.name;
-            icon = utd.icon;
-            return;
+            if (utd != null) {
+                defaultPackageName = utd.packageName;
+                name = utd.name;
+                icon = utd.icon;
+                return;
+            }
         }
         PackageManager pm = mContext.getPackageManager();
         String[] packages = pm.getPackagesForUid(uid);
diff --git a/src/com/android/settings/fuelgauge/Utils.java b/src/com/android/settings/fuelgauge/Utils.java
index 1ff358ea1b2..9a06c9f2fcb 100644
--- a/src/com/android/settings/fuelgauge/Utils.java
+++ b/src/com/android/settings/fuelgauge/Utils.java
@@ -44,15 +44,15 @@ public static String formatElapsedTime(Context context, double millis, boolean i
         }
 
         int days = 0, hours = 0, minutes = 0;
-        if (seconds > SECONDS_PER_DAY) {
+        if (seconds >= SECONDS_PER_DAY) {
             days = seconds / SECONDS_PER_DAY;
             seconds -= days * SECONDS_PER_DAY;
         }
-        if (seconds > SECONDS_PER_HOUR) {
+        if (seconds >= SECONDS_PER_HOUR) {
             hours = seconds / SECONDS_PER_HOUR;
             seconds -= hours * SECONDS_PER_HOUR;
         }
-        if (seconds > SECONDS_PER_MINUTE) {
+        if (seconds >= SECONDS_PER_MINUTE) {
             minutes = seconds / SECONDS_PER_MINUTE;
             seconds -= minutes * SECONDS_PER_MINUTE;
         }
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 7361d621cf2..dfd85bbd8fa 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -177,16 +177,20 @@ public void onCreate(Bundle icicle) {
         mIm = (InputManager)getActivity().getSystemService(Context.INPUT_SERVICE);
         updateInputDevices();
 
-        mStylusGestures = (PreferenceScreen) findPreference(KEY_STYLUS_GESTURES);
-        mStylusIconEnabled = (CheckBoxPreference) findPreference(KEY_STYLUS_ICON_ENABLED);
-        // remove stylus preference for non stylus devices
-        if (!getResources().getBoolean(com.android.internal.R.bool.config_stylusGestures)) {
-            PreferenceGroup pointerSettingsCategory = (PreferenceGroup)
-                    findPreference(KEY_POINTER_SETTINGS_CATEGORY);
-            pointerSettingsCategory.removePreference(mStylusGestures);
-            pointerSettingsCategory.removePreference(mStylusIconEnabled);
-        } else {
-            mStylusIconEnabled.setOnPreferenceChangeListener(this);
+        if (!mIsOnlyImeSettings) {
+            mStylusGestures = (PreferenceScreen) findPreference(KEY_STYLUS_GESTURES);
+            mStylusIconEnabled = (CheckBoxPreference) findPreference(KEY_STYLUS_ICON_ENABLED);
+            // remove stylus preference for non stylus devices
+            if (!getResources().getBoolean(com.android.internal.R.bool.config_stylusGestures)) {
+                PreferenceGroup pointerSettingsCategory = (PreferenceGroup)
+                        findPreference(KEY_POINTER_SETTINGS_CATEGORY);
+                if(pointerSettingsCategory != null) {
+                    pointerSettingsCategory.removePreference(mStylusGestures);
+                    pointerSettingsCategory.removePreference(mStylusIconEnabled);
+                }
+            } else {
+                mStylusIconEnabled.setOnPreferenceChangeListener(this);
+            }
         }
 
         // Spell Checker
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 06a6650565d..d57c7549488 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -250,7 +250,10 @@ public void onModeChanged(int mode, boolean restricted) {
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         if (isChecked) {
-            setLocationMode(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+            final int lastMode = Settings.Secure.getInt(getContentResolver(),
+                    Settings.Secure.LOCATION_LAST_MODE,
+                    Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+            setLocationMode(lastMode);
         } else {
             setLocationMode(Settings.Secure.LOCATION_MODE_OFF);
         }
diff --git a/src/com/android/settings/location/LocationSettingsBase.java b/src/com/android/settings/location/LocationSettingsBase.java
index 86c2ee5e873..dec93dc070c 100644
--- a/src/com/android/settings/location/LocationSettingsBase.java
+++ b/src/com/android/settings/location/LocationSettingsBase.java
@@ -94,6 +94,10 @@ public void setLocationMode(int mode) {
         intent.putExtra(CURRENT_MODE_KEY, mCurrentMode);
         intent.putExtra(NEW_MODE_KEY, mode);
         getActivity().sendBroadcast(intent, android.Manifest.permission.WRITE_SECURE_SETTINGS);
+        if (mode != Settings.Secure.LOCATION_MODE_OFF) {
+            Settings.Secure.putInt(getContentResolver(),
+                    Settings.Secure.LOCATION_LAST_MODE, mode);
+        }
         Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCATION_MODE, mode);
         refreshLocationMode();
     }
diff --git a/src/com/android/settings/net/NetworkPolicyEditor.java b/src/com/android/settings/net/NetworkPolicyEditor.java
index bfdaf99020d..ad2afa0466a 100644
--- a/src/com/android/settings/net/NetworkPolicyEditor.java
+++ b/src/com/android/settings/net/NetworkPolicyEditor.java
@@ -36,12 +36,12 @@
 import android.text.TextUtils;
 import android.text.format.Time;
 
-import com.android.internal.util.Objects;
 import com.google.android.collect.Lists;
 import com.google.android.collect.Sets;
 
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.Objects;
 
 /**
  * Utility class to modify list of {@link NetworkPolicy}. Specifically knows
@@ -160,7 +160,8 @@ private static NetworkPolicy buildDefaultPolicy(NetworkTemplate template) {
     }
 
     public int getPolicyCycleDay(NetworkTemplate template) {
-        return getPolicy(template).cycleDay;
+        final NetworkPolicy policy = getPolicy(template);
+        return (policy != null) ? policy.cycleDay : -1;
     }
 
     public void setPolicyCycleDay(NetworkTemplate template, int cycleDay, String cycleTimezone) {
@@ -173,7 +174,8 @@ public void setPolicyCycleDay(NetworkTemplate template, int cycleDay, String cyc
     }
 
     public long getPolicyWarningBytes(NetworkTemplate template) {
-        return getPolicy(template).warningBytes;
+        final NetworkPolicy policy = getPolicy(template);
+        return (policy != null) ? policy.warningBytes : WARNING_DISABLED;
     }
 
     public void setPolicyWarningBytes(NetworkTemplate template, long warningBytes) {
@@ -185,7 +187,8 @@ public void setPolicyWarningBytes(NetworkTemplate template, long warningBytes) {
     }
 
     public long getPolicyLimitBytes(NetworkTemplate template) {
-        return getPolicy(template).limitBytes;
+        final NetworkPolicy policy = getPolicy(template);
+        return (policy != null) ? policy.limitBytes : LIMIT_DISABLED;
     }
 
     public void setPolicyLimitBytes(NetworkTemplate template, long limitBytes) {
@@ -265,7 +268,7 @@ public boolean isMobilePolicySplit(String subscriberId) {
         boolean has4g = false;
         for (NetworkPolicy policy : mPolicies) {
             final NetworkTemplate template = policy.template;
-            if (Objects.equal(subscriberId, template.getSubscriberId())) {
+            if (Objects.equals(subscriberId, template.getSubscriberId())) {
                 switch (template.getMatchRule()) {
                     case MATCH_MOBILE_3G_LOWER:
                         has3g = true;
@@ -309,8 +312,16 @@ private boolean setMobilePolicySplitInternal(String subscriberId, boolean split)
             final NetworkPolicy policy3g = getPolicy(template3g);
             final NetworkPolicy policy4g = getPolicy(template4g);
 
-            final NetworkPolicy restrictive = policy3g.compareTo(policy4g) < 0 ? policy3g
-                    : policy4g;
+            NetworkPolicy restrictive = null;
+            if ((policy3g == null) && (policy4g == null)) {
+                return false;
+            } else if (policy3g == null) {
+                restrictive = policy4g;
+            } else if (policy4g == null) {
+                restrictive = policy3g;
+            } else {
+                restrictive = policy3g.compareTo(policy4g) < 0 ? policy3g : policy4g;
+            }
             mPolicies.remove(policy3g);
             mPolicies.remove(policy4g);
             mPolicies.add(new NetworkPolicy(templateAll, restrictive.cycleDay,
@@ -321,6 +332,9 @@ private boolean setMobilePolicySplitInternal(String subscriberId, boolean split)
         } else if (!beforeSplit && split) {
             // duplicate existing policy into two rules
             final NetworkPolicy policyAll = getPolicy(templateAll);
+            if (policyAll == null) {
+                return false;
+            }
             mPolicies.remove(policyAll);
             mPolicies.add(new NetworkPolicy(template3g, policyAll.cycleDay, policyAll.cycleTimezone,
                     policyAll.warningBytes, policyAll.limitBytes, SNOOZE_NEVER, SNOOZE_NEVER,
diff --git a/src/com/android/settings/slim/CustomCarrier.java b/src/com/android/settings/slim/CustomCarrier.java
new file mode 100755
index 00000000000..b26227bcae0
--- /dev/null
+++ b/src/com/android/settings/slim/CustomCarrier.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2013 SlimRoms Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.slim;
+
+import android.content.Context;
+import android.preference.EditTextPreference;
+import android.provider.Settings;
+import android.util.AttributeSet;
+
+public class CustomCarrier extends EditTextPreference {
+
+    private static final String TAG = "CustomCarrier";
+
+    private Context mContext;
+    private String mCustomCarrierName;
+
+    public CustomCarrier(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+
+        mContext = context;
+
+        // determine the current value
+        String id = getText();
+
+        if (id != null && id.length() > 0) {
+            mCustomCarrierName = id;
+        } else {
+            mCustomCarrierName = "";
+        }
+
+        getEditText().setHint(mCustomCarrierName);
+    }
+
+    public CustomCarrier(Context context, AttributeSet attrs) {
+        this(context, attrs, com.android.internal.R.attr.editTextPreferenceStyle);
+    }
+
+    public CustomCarrier(Context context) {
+        this(context, null);
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        if (positiveResult) {
+            String customCarrierName = getEditText().getText().toString();
+            setText(customCarrierName);
+        }
+    }
+
+    @Override
+    public void setText(String text) {
+        Settings.System.putString(mContext.getContentResolver(),
+                    Settings.System.NOTIFICATION_CUSTOM_CARRIER_LABEL, text);
+    }
+
+    @Override
+    public String getText() {
+        return Settings.System.getString(getContext().getContentResolver(),
+                Settings.System.NOTIFICATION_CUSTOM_CARRIER_LABEL);
+    }
+
+    @Override
+    public void onSetInitialValue(boolean restoreValue, Object defaultValue) {
+        // Do nothing
+    }
+}
diff --git a/src/com/android/settings/slim/LockscreenInterface.java b/src/com/android/settings/slim/LockscreenInterface.java
index 263031911ac..d10a6218806 100644
--- a/src/com/android/settings/slim/LockscreenInterface.java
+++ b/src/com/android/settings/slim/LockscreenInterface.java
@@ -30,6 +30,7 @@
 import android.util.Log;
 import android.widget.Toast;
 
+import com.android.internal.util.slim.DeviceUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -44,8 +45,10 @@ public class LockscreenInterface extends SettingsPreferenceFragment implements
 
     private static final String PREF_LOCKSCREEN_EIGHT_TARGETS = "lockscreen_eight_targets";
     private static final String PREF_LOCKSCREEN_SHORTCUTS = "lockscreen_shortcuts";
+    private static final String PREF_LOCKSCREEN_TORCH = "lockscreen_torch";
 
     private CheckBoxPreference mLockscreenEightTargets;
+    private CheckBoxPreference mGlowpadTorch;
     private Preference mShortcuts;
 
     private boolean mCheckPreferences;
@@ -78,6 +81,17 @@ private PreferenceScreen createCustomLockscreenView() {
                 Settings.System.LOCKSCREEN_EIGHT_TARGETS, 0) == 1);
         mLockscreenEightTargets.setOnPreferenceChangeListener(this);
 
+        mGlowpadTorch = (CheckBoxPreference) findPreference(
+                PREF_LOCKSCREEN_TORCH);
+        mGlowpadTorch.setChecked(Settings.System.getInt(
+                getActivity().getApplicationContext().getContentResolver(),
+                Settings.System.LOCKSCREEN_GLOWPAD_TORCH, 0) == 1);
+        mGlowpadTorch.setOnPreferenceChangeListener(this);
+
+        if (!DeviceUtils.deviceSupportsTorch(getActivity().getApplicationContext())) {
+            prefs.removePreference(mGlowpadTorch);
+        }
+
         mShortcuts = (Preference) findPreference(PREF_LOCKSCREEN_SHORTCUTS);
         mShortcuts.setEnabled(!mLockscreenEightTargets.isChecked());
 
@@ -104,6 +118,11 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
         if (preference == mLockscreenEightTargets) {
             showDialogInner(DLG_ENABLE_EIGHT_TARGETS, (Boolean) objValue);
             return true;
+        } else if (preference == mGlowpadTorch) {
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.LOCKSCREEN_GLOWPAD_TORCH,
+                    (Boolean) objValue ? 1 : 0);
+            return true;
         }
         return false;
     }
diff --git a/src/com/android/settings/slim/NotificationDrawerQsSettings.java b/src/com/android/settings/slim/NotificationDrawerQsSettings.java
index c0ab54557c2..25b2cf46621 100644
--- a/src/com/android/settings/slim/NotificationDrawerQsSettings.java
+++ b/src/com/android/settings/slim/NotificationDrawerQsSettings.java
@@ -40,20 +40,26 @@ public class NotificationDrawerQsSettings extends SettingsPreferenceFragment
 
     public static final String TAG = "NotificationDrawerSettings";
 
-    private static final String PREF_NOTIFICATION_HIDE_CARRIER =
-            "notification_hide_carrier";
+    private static final String PREF_NOTIFICATION_HIDE_LABELS =
+            "notification_hide_labels";
     private static final String PREF_NOTIFICATION_ALPHA =
             "notification_alpha";
     private static final String PRE_QUICK_PULLDOWN =
             "quick_pulldown";
+    private static final String PRE_SMART_PULLDOWN =
+            "smart_pulldown";
+    private static final String PRE_COLLAPSE_PANEL =
+            "collapse_panel";
     private static final String PREF_TILES_STYLE =
             "quicksettings_tiles_style";
     private static final String PREF_TILE_PICKER =
             "tile_picker";
 
-    CheckBoxPreference mHideCarrier;
+    ListPreference mHideLabels;
     SeekBarPreference mNotificationAlpha;
     ListPreference mQuickPulldown;
+    ListPreference mSmartPulldown;
+    CheckBoxPreference mCollapsePanel;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -63,20 +69,20 @@ public void onCreate(Bundle savedInstanceState) {
 
         PreferenceScreen prefs = getPreferenceScreen();
 
-        mHideCarrier = (CheckBoxPreference) findPreference(PREF_NOTIFICATION_HIDE_CARRIER);
-        boolean hideCarrier = Settings.System.getInt(getActivity().getContentResolver(),
-                Settings.System.NOTIFICATION_HIDE_CARRIER, 0) == 1;
-        mHideCarrier.setChecked(hideCarrier);
-        mHideCarrier.setOnPreferenceChangeListener(this);
+        mHideLabels = (ListPreference) findPreference(PREF_NOTIFICATION_HIDE_LABELS);
+        int hideCarrier = Settings.System.getInt(getContentResolver(),
+                Settings.System.NOTIFICATION_HIDE_LABELS, 0);
+        mHideLabels.setValue(String.valueOf(hideCarrier));
+        mHideLabels.setOnPreferenceChangeListener(this);
+        updateHideNotificationLabelsSummary(hideCarrier);
 
         PackageManager pm = getPackageManager();
         boolean isMobileData = pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY);
 
-        if (!DeviceUtils.isPhone(getActivity())
-            || !DeviceUtils.deviceSupportsMobileData(getActivity())) {
-            // Nothing for tablets, large screen devices and non mobile devices which doesn't show
-            // information in notification drawer.....remove options
-            prefs.removePreference(mHideCarrier);
+        if (!DeviceUtils.isPhone(getActivity())) {
+            // Nothing for tablets and large screen devices which doesn't show
+            // information in notification drawer.....remove option
+            prefs.removePreference(mHideLabels);
         }
 
         float transparency;
@@ -90,20 +96,34 @@ public void onCreate(Bundle savedInstanceState) {
         }
         mNotificationAlpha = (SeekBarPreference) findPreference(PREF_NOTIFICATION_ALPHA);
         mNotificationAlpha.setInitValue((int) (transparency * 100));
-        mNotificationAlpha.setProperty(Settings.System.NOTIFICATION_ALPHA);
         mNotificationAlpha.setOnPreferenceChangeListener(this);
 
         mQuickPulldown = (ListPreference) findPreference(PRE_QUICK_PULLDOWN);
+        mSmartPulldown = (ListPreference) findPreference(PRE_SMART_PULLDOWN);
         if (!DeviceUtils.isPhone(getActivity())) {
             prefs.removePreference(mQuickPulldown);
+            prefs.removePreference(mSmartPulldown);
         } else {
+            // Quick Pulldown
             mQuickPulldown.setOnPreferenceChangeListener(this);
             int statusQuickPulldown = Settings.System.getInt(getContentResolver(),
                     Settings.System.QS_QUICK_PULLDOWN, 0);
             mQuickPulldown.setValue(String.valueOf(statusQuickPulldown));
-            updatePulldownSummary(statusQuickPulldown);
+            updateQuickPulldownSummary(statusQuickPulldown);
+
+            // Smart Pulldown
+            mSmartPulldown.setOnPreferenceChangeListener(this);
+            int smartPulldown = Settings.System.getIntForUser(getContentResolver(),
+                    Settings.System.QS_SMART_PULLDOWN, 0, UserHandle.USER_CURRENT);
+            mSmartPulldown.setValue(String.valueOf(smartPulldown));
+            updateSmartPulldownSummary(smartPulldown);
         }
 
+        mCollapsePanel = (CheckBoxPreference) findPreference(PRE_COLLAPSE_PANEL);
+        mCollapsePanel.setChecked(Settings.System.getIntForUser(getContentResolver(),
+                Settings.System.QS_COLLAPSE_PANEL, 0, UserHandle.USER_CURRENT) == 1);
+        mCollapsePanel.setOnPreferenceChangeListener(this);
+
         updateQuickSettingsOptions();
     }
 
@@ -114,6 +134,7 @@ private void updateQuickSettingsOptions() {
                 Settings.System.QUICK_SETTINGS_TILES, UserHandle.USER_CURRENT);
         boolean hideSettingsPanel = qsConfig != null && qsConfig.isEmpty();
         mQuickPulldown.setEnabled(!hideSettingsPanel);
+        mSmartPulldown.setEnabled(!hideSettingsPanel);
         tilesStyle.setEnabled(!hideSettingsPanel);
         if (hideSettingsPanel) {
             tilesPicker.setSummary(getResources().getString(R.string.disable_qs));
@@ -131,10 +152,11 @@ public void onResume() {
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mHideCarrier) {
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.NOTIFICATION_HIDE_CARRIER,
-                    (Boolean) newValue ? 1 : 0);
+        if (preference == mHideLabels) {
+            int hideLabels = Integer.valueOf((String) newValue);
+            Settings.System.putInt(getContentResolver(), Settings.System.NOTIFICATION_HIDE_LABELS,
+                    hideLabels);
+            updateHideNotificationLabelsSummary(hideLabels);
             return true;
         } else if (preference == mNotificationAlpha) {
             float valNav = Float.parseFloat((String) newValue);
@@ -145,13 +167,24 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             int statusQuickPulldown = Integer.valueOf((String) newValue);
             Settings.System.putInt(getContentResolver(), Settings.System.QS_QUICK_PULLDOWN,
                     statusQuickPulldown);
-            updatePulldownSummary(statusQuickPulldown);
+            updateQuickPulldownSummary(statusQuickPulldown);
+            return true;
+        } else if (preference == mSmartPulldown) {
+            int smartPulldown = Integer.valueOf((String) newValue);
+            Settings.System.putInt(getContentResolver(), Settings.System.QS_SMART_PULLDOWN,
+                    smartPulldown);
+            updateSmartPulldownSummary(smartPulldown);
+            return true;
+        } else if (preference == mCollapsePanel) {
+            Settings.System.putIntForUser(getContentResolver(),
+                    Settings.System.QS_COLLAPSE_PANEL,
+                    (Boolean) newValue ? 1 : 0, UserHandle.USER_CURRENT);
             return true;
         }
         return false;
     }
 
-    private void updatePulldownSummary(int value) {
+    private void updateQuickPulldownSummary(int value) {
         Resources res = getResources();
 
         if (value == 0) {
@@ -165,4 +198,38 @@ private void updatePulldownSummary(int value) {
         }
     }
 
+    private void updateSmartPulldownSummary(int value) {
+        Resources res = getResources();
+
+        if (value == 0) {
+            // Smart pulldown deactivated
+            mSmartPulldown.setSummary(res.getString(R.string.smart_pulldown_off));
+        } else {
+            String type = res.getString(value == 2
+                    ? R.string.smart_pulldown_persistent
+                    : R.string.smart_pulldown_dismissable);
+            mSmartPulldown.setSummary(res.getString(R.string.smart_pulldown_summary, type));
+        }
+    }
+
+    private void updateHideNotificationLabelsSummary(int value) {
+        Resources res = getResources();
+
+        StringBuilder text = new StringBuilder();
+
+        switch (value) {
+        case 1  : text.append(res.getString(R.string.notification_hide_labels_carrier));
+                break;
+        case 2  : text.append(res.getString(R.string.notification_hide_labels_wifi));
+                break;
+        case 3  : text.append(res.getString(R.string.notification_hide_labels_all));
+                break;
+        default : text.append(res.getString(R.string.notification_hide_labels_disable));
+                break;
+        }
+
+        text.append(" " + res.getString(R.string.notification_hide_labels_text));
+
+        mHideLabels.setSummary(text.toString());
+    }
 }
diff --git a/src/com/android/settings/slim/NotificationDrawerStyle.java b/src/com/android/settings/slim/NotificationDrawerStyle.java
index 44ae0754cf1..f5fe9e5e3d8 100644
--- a/src/com/android/settings/slim/NotificationDrawerStyle.java
+++ b/src/com/android/settings/slim/NotificationDrawerStyle.java
@@ -107,7 +107,6 @@ public void onCreate(Bundle savedInstanceState) {
         }
         mWallpaperAlpha = (SeekBarPreference) findPreference(PREF_NOTIFICATION_WALLPAPER_ALPHA);
         mWallpaperAlpha.setInitValue((int) (transparency * 100));
-        mWallpaperAlpha.setProperty(Settings.System.NOTIFICATION_BACKGROUND_ALPHA);
         mWallpaperAlpha.setOnPreferenceChangeListener(this);
 
         updateCustomBackgroundSummary();
diff --git a/src/com/android/settings/slim/SoundSettings.java b/src/com/android/settings/slim/SoundSettings.java
index e2271d5b573..dad1d7a9d9e 100644
--- a/src/com/android/settings/slim/SoundSettings.java
+++ b/src/com/android/settings/slim/SoundSettings.java
@@ -55,6 +55,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements
     private static final String KEY_CAMERA_SOUNDS = "camera_sounds";
     private static final String PROP_CAMERA_SOUND = "persist.sys.camera-sound";
     private static final String PREF_LESS_NOTIFICATION_SOUNDS = "less_notification_sounds";
+    private static final String KEY_VOL_MEDIA = "volume_keys_control_media_stream";
 
     // Request code for power notification ringtone picker
     private static final int REQUEST_CODE_POWER_NOTIFICATIONS_RINGTONE = 1;
@@ -69,6 +70,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements
     private Preference mPowerSoundsRingtone;
     private CheckBoxPreference mCameraSounds;
     private ListPreference mAnnoyingNotifications;
+    private CheckBoxPreference mVolumeKeysControlMedia;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -137,6 +139,11 @@ public void onCreate(Bundle savedInstanceState) {
                 0);
         mAnnoyingNotifications.setValue(Integer.toString(notificationThreshold));
         mAnnoyingNotifications.setOnPreferenceChangeListener(this);
+
+        mVolumeKeysControlMedia = (CheckBoxPreference) findPreference(KEY_VOL_MEDIA);
+        mVolumeKeysControlMedia.setChecked(Settings.System.getInt(getContentResolver(),
+                Settings.System.VOLUME_KEYS_CONTROL_MEDIA_STREAM, 0) != 0);
+        mVolumeKeysControlMedia.setOnPreferenceChangeListener(this);
     }
 
     @Override
@@ -196,6 +203,11 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
             Settings.System.putInt(getContentResolver(),
                     Settings.System.MUTE_ANNOYING_NOTIFICATIONS_THRESHOLD, val);
         }
+        if (KEY_VOL_MEDIA.equals(key)) {
+            Settings.System.putInt(getContentResolver(),
+                    Settings.System.VOLUME_KEYS_CONTROL_MEDIA_STREAM,
+                    (Boolean) objValue ? 1 : 0);
+        }
         return true;
     }
 
diff --git a/src/com/android/settings/slim/blacklist/BlacklistSettings.java b/src/com/android/settings/slim/blacklist/BlacklistSettings.java
index b9e90c4fc1c..ccc1d97f4ca 100644
--- a/src/com/android/settings/slim/blacklist/BlacklistSettings.java
+++ b/src/com/android/settings/slim/blacklist/BlacklistSettings.java
@@ -136,8 +136,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.blacklist_prefs:
                 PreferenceFragment prefs = new PreferenceFragment();
                 FragmentTransaction ft = getFragmentManager().beginTransaction();
-                ft.replace(android.R.id.content, prefs);
-                ft.hide(this);
+                ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
+                ft.replace(com.android.internal.R.id.prefs, prefs);
                 ft.addToBackStack(null);
                 ft.commitAllowingStateLoss();
                 return true;
diff --git a/src/com/android/settings/slim/notificationlight/LightSettingsDialog.java b/src/com/android/settings/slim/notificationlight/LightSettingsDialog.java
index 537f4886865..e4c664d976c 100644
--- a/src/com/android/settings/slim/notificationlight/LightSettingsDialog.java
+++ b/src/com/android/settings/slim/notificationlight/LightSettingsDialog.java
@@ -145,7 +145,7 @@ private void setUp(int color, int speedOn, int speedOff, boolean onOffChangeable
 
         @Override
         public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-            mPulseSpeedOff.setEnabled(getPulseSpeedOn() != 1);
+            mPulseSpeedOff.setEnabled(mPulseSpeedOn.isEnabled() && getPulseSpeedOn() != 1);
         }
 
         @Override
diff --git a/src/com/android/settings/slim/quicksettings/QuickSettingsTiles.java b/src/com/android/settings/slim/quicksettings/QuickSettingsTiles.java
index f95be6e0656..f3240ae6cdb 100644
--- a/src/com/android/settings/slim/quicksettings/QuickSettingsTiles.java
+++ b/src/com/android/settings/slim/quicksettings/QuickSettingsTiles.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.slim.quicksettings;
 
+import static com.android.internal.util.slim.QSConstants.TILE_CUSTOM;
+import static com.android.internal.util.slim.QSConstants.TILE_CONTACT;
+import static com.android.internal.util.slim.QSConstants.TILE_CUSTOM_KEY;
 import static com.android.internal.util.slim.QSConstants.TILE_DELIMITER;
 
 import android.app.Activity;
@@ -24,15 +27,21 @@
 import android.app.DialogFragment;
 import android.app.Fragment;
 import android.content.Context;
+import android.content.CursorLoader;
+import android.content.Intent;
 import android.content.DialogInterface;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
 import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.provider.ContactsContract;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.TypedValue;
@@ -47,22 +56,36 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.FrameLayout;
+import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
+import com.android.internal.util.slim.AppHelper;
 import com.android.internal.util.slim.DeviceUtils;
+import com.android.internal.util.slim.LockscreenTargetUtils;
 import com.android.internal.util.slim.QSConstants;
 import com.android.settings.R;
 import com.android.settings.slim.quicksettings.QuickSettingsUtil.TileInfo;
+import com.android.settings.slim.util.IconPicker;
+import com.android.settings.slim.util.IconPicker.OnIconPickListener;
+import com.android.settings.slim.util.ShortcutPickerHelper;
 
 import android.util.Log;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 
-public class QuickSettingsTiles extends Fragment {
+public class QuickSettingsTiles extends Fragment implements View.OnClickListener,
+        View.OnLongClickListener, ShortcutPickerHelper.OnPickListener, OnIconPickListener {
+
+    private static final String TAG = "QuickSettingsTiles";
 
     private static final int MENU_RESET         = Menu.FIRST;
     private static final int MENU_DYNAMICTILES  = MENU_RESET + 1;
@@ -79,12 +102,32 @@ public class QuickSettingsTiles extends Fragment {
     private static final int DLG_HELP          = 6;
     private static final int DLG_DISABLED      = 7;
     private static final int DLG_DYNAMICTILES  = 8;
+    private static final int DLG_CUSTOM_TILE = 9;
+    private static final int DLG_CUSTOM_TILE_EXTRAS = 10;
+
+    private static final int NUMBER_ACTIONS = 5;
+    private static final int PICK_CONTACT = 145;
 
     private DraggableGridView mDragView;
     private ViewGroup mContainer;
     private LayoutInflater mInflater;
     private Resources mSystemUiResources;
     private TileAdapter mTileAdapter;
+    private ShortcutPickerHelper mPicker;
+    private IconPicker mIconPicker;
+    private File mTemporaryImage;
+
+    private ImageButton[] mDialogIcon = new ImageButton[NUMBER_ACTIONS];
+    private Button[] mDialogLabel = new Button[NUMBER_ACTIONS];
+
+    private Drawable mEmptyIcon;
+    private String mEmptyLabel;
+
+    private String mCurrentCustomTile = null;
+
+    private boolean mShortPress = true;
+
+    private int mCurrentAction = 0;
 
     private int mTileTextSize;
     private int mTileTextPadding;
@@ -98,6 +141,12 @@ public View onCreateView(LayoutInflater inflater,
         mContainer.setClipToPadding(false);
         mInflater = inflater;
 
+        mIconPicker = new IconPicker(getActivity(), this);
+        mPicker = new ShortcutPickerHelper(getActivity(), this);
+        mEmptyLabel = getResources().getString(R.string.lockscreen_target_empty);
+        mEmptyIcon = getResources().getDrawable(R.drawable.ic_empty);
+        mTemporaryImage = new File(getActivity().getCacheDir() + "/custom_tile.tmp");
+
         PackageManager pm = getActivity().getPackageManager();
         if (pm != null) {
             try {
@@ -161,7 +210,14 @@ void genTiles() {
         ArrayList<String> tiles = QuickSettingsUtil.getTileListFromString(
                 QuickSettingsUtil.getCurrentTiles(getActivity()));
         for (String tileindex : tiles) {
-            QuickSettingsUtil.TileInfo tile = QuickSettingsUtil.TILES.get(tileindex);
+            QuickSettingsUtil.TileInfo tile = null;
+            if (tileindex.contains(TILE_CUSTOM)) {
+                tile = QuickSettingsUtil.TILES.get(TILE_CUSTOM);
+            } else if (tileindex.contains(TILE_CONTACT)) {
+                tile = QuickSettingsUtil.TILES.get(TILE_CONTACT);
+            } else {
+                tile = QuickSettingsUtil.TILES.get(tileindex);
+            }
             if (tile != null) {
                 addTile(tile.getTitleResId(), tile.getIcon(), 0, false);
             }
@@ -188,7 +244,10 @@ void addTile(int titleId, String iconSysId, int iconRegId, boolean newTile) {
             iv.setImageDrawable(getResources().getDrawable(iconRegId));
         } else {
             final boolean isUserTile =
-                    titleId == QuickSettingsUtil.TILES.get(QSConstants.TILE_USER).getTitleResId();
+                    titleId == QuickSettingsUtil.TILES.get(
+                            QSConstants.TILE_USER).getTitleResId()
+                            ||  titleId == QuickSettingsUtil.TILES.get(
+                            TILE_CONTACT).getTitleResId();
             if (mSystemUiResources != null && iconSysId != null) {
                 int resId = mSystemUiResources.getIdentifier(iconSysId, null, null);
                 if (resId > 0) {
@@ -227,6 +286,10 @@ void addTile(int titleId, String iconSysId, int iconRegId, boolean newTile) {
                         && DeviceUtils.deviceSupportsVibrator(getActivity())
                 || titleId == QuickSettingsUtil.TILES.get(
                             QSConstants.TILE_MUSIC).getTitleResId()
+                || titleId == QuickSettingsUtil.TILES.get(
+                            QSConstants.TILE_CUSTOM).getTitleResId()
+                || titleId == QuickSettingsUtil.TILES.get(
+                            QSConstants.TILE_CONTACT).getTitleResId()
                 || QuickSettingsUtil.isTileAvailable(QSConstants.TILE_NETWORKMODE)
                         && titleId == QuickSettingsUtil.TILES.get(
                             QSConstants.TILE_NETWORKMODE).getTitleResId()) {
@@ -259,6 +322,14 @@ public void onRearrange(int oldIndex, int newIndex) {
             public void onDelete(int index) {
                 ArrayList<String> tiles = QuickSettingsUtil.getTileListFromString(
                         QuickSettingsUtil.getCurrentTiles(getActivity()));
+                String tileIndex = tiles.get(index);
+                if (tileIndex.contains(TILE_CUSTOM)) {
+                    QuickSettingsUtil.deleteCustomTile(
+                            getActivity(), findCustomKey(tileIndex));
+                } else if (tileIndex.contains(TILE_CONTACT)) {
+                    QuickSettingsUtil.deleteActions(getActivity(),
+                            Settings.System.TILE_CONTACT_ACTIONS, findCustomKey(tileIndex));
+                }
                 tiles.remove(index);
                 QuickSettingsUtil.saveCurrentTiles(getActivity(),
                         mDragView.getChildCount() == 1 ?
@@ -290,6 +361,16 @@ public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
                     if (tiles.get(arg2).equals(QSConstants.TILE_MUSIC)) {
                         showDialogInner(DLG_MUSIC);
                     }
+                    if (tiles.get(arg2).contains(TILE_CUSTOM)) {
+                        mCurrentCustomTile = findCustomKey(tiles.get(arg2));
+                        showDialogInner(DLG_CUSTOM_TILE);
+                    }
+                    if (tiles.get(arg2).contains(TILE_CONTACT)) {
+                        mCurrentCustomTile = findCustomKey(tiles.get(arg2));
+                        Intent intent = new Intent(
+                                Intent.ACTION_PICK, ContactsContract.Contacts.CONTENT_URI);
+                        startActivityForResult(intent, PICK_CONTACT);
+                    }
                     return;
                 }
                 showDialogInner(DLG_SHOW_LIST);
@@ -353,18 +434,362 @@ private boolean isLandscape() {
         return isLandscape;
     }
 
+    private String findCustomKey(String tile) {
+        String[] split = tile.split(TILE_CUSTOM_KEY);
+        return split[1];
+    }
+
+    private View customTileDialogView(String tileKey) {
+        View view = View.inflate(getActivity(), R.layout.custom_tile_dialog, null);
+
+        mCurrentCustomTile = tileKey;
+
+        mDialogIcon[0] = (ImageButton) view.findViewById(R.id.icon);
+        mDialogLabel[0] = (Button) view.findViewById(R.id.action);
+        mDialogIcon[1] = (ImageButton) view.findViewById(R.id.icon_two);
+        mDialogLabel[1] = (Button) view.findViewById(R.id.action_two);
+        mDialogIcon[2] = (ImageButton) view.findViewById(R.id.icon_three);
+        mDialogLabel[2] = (Button) view.findViewById(R.id.action_three);
+        mDialogIcon[3] = (ImageButton) view.findViewById(R.id.icon_four);
+        mDialogLabel[3] = (Button) view.findViewById(R.id.action_four);
+        mDialogIcon[4] = (ImageButton) view.findViewById(R.id.icon_five);
+        mDialogLabel[4] = (Button) view.findViewById(R.id.action_five);
+        ImageButton reset = (ImageButton) view.findViewById(R.id.reset);
+        ImageButton resetTwo = (ImageButton) view.findViewById(R.id.reset_two);
+        ImageButton resetThree = (ImageButton) view.findViewById(R.id.reset_three);
+        ImageButton resetFour = (ImageButton) view.findViewById(R.id.reset_four);
+        ImageButton resetFive = (ImageButton) view.findViewById(R.id.reset_five);
+
+        setDialogIconsAndText(0);
+        setDialogIconsAndText(1);
+        setDialogIconsAndText(2);
+        setDialogIconsAndText(3);
+        setDialogIconsAndText(4);
+
+        for (int i = 0; i < NUMBER_ACTIONS; i++) {
+            mDialogIcon[i].setOnClickListener(QuickSettingsTiles.this);
+            mDialogLabel[i].setOnClickListener(QuickSettingsTiles.this);
+            mDialogLabel[i].setOnLongClickListener(QuickSettingsTiles.this);
+        }
+
+        reset.setOnClickListener(QuickSettingsTiles.this);
+        resetTwo.setOnClickListener(QuickSettingsTiles.this);
+        resetThree.setOnClickListener(QuickSettingsTiles.this);
+        resetFour.setOnClickListener(QuickSettingsTiles.this);
+        resetFive.setOnClickListener(QuickSettingsTiles.this);
+
+        return view;
+    }
+
+    private void setDialogIconsAndText(int index) {
+        mDialogLabel[index].setText(returnFriendlyName(index));
+        mDialogIcon[index].setImageDrawable(returnPackageDrawable(index));
+    }
+
+    private String returnFriendlyName(int index) {
+        String uri = QuickSettingsUtil.getActionsAtIndex(getActivity(),
+                index, 0, mCurrentCustomTile);
+        String longpressUri = QuickSettingsUtil.getActionsAtIndex(getActivity(),
+                index, 1, mCurrentCustomTile);
+
+        if (uri == null && longpressUri == null) {
+            return mEmptyLabel;
+        } else if (uri == null && longpressUri != null) {
+            return getResources().getString(R.string.custom_tile_long_press)
+                    + " " + AppHelper.getShortcutPreferred(
+                    getActivity(), getActivity().getPackageManager(), longpressUri);
+        } else if (uri != null && longpressUri == null) {
+            return AppHelper.getShortcutPreferred(
+                    getActivity(), getActivity().getPackageManager(), uri);
+        } else {
+            return AppHelper.getShortcutPreferred(
+                    getActivity(), getActivity().getPackageManager(), uri)
+                    + "\n" + getResources().getString(R.string.custom_tile_long_press)
+                    + " "+ AppHelper.getShortcutPreferred(
+                    getActivity(), getActivity().getPackageManager(), longpressUri);
+        }
+    }
+
+    private Drawable returnPackageDrawable(int index) {
+        String uri = QuickSettingsUtil.getActionsAtIndex(getActivity(),
+                index, 0, mCurrentCustomTile);
+
+        if (uri == null ) {
+            // Check if long action exists, and use it instead
+            uri = QuickSettingsUtil.getActionsAtIndex(getActivity(),
+                index, 1, mCurrentCustomTile);
+        }
+
+        Drawable icon = null;
+        if (uri != null) {
+            String iconUri = QuickSettingsUtil.getActionsAtIndex(getActivity(),
+                index, 2, mCurrentCustomTile);
+            if (iconUri != null && iconUri.length() > 0) {
+                File f = new File(Uri.parse(iconUri).getPath());
+                if (f.exists()) {
+                    icon = new BitmapDrawable(
+                            getResources(), f.getAbsolutePath());
+                }
+            } else {
+                try {
+                    Intent intent = Intent.parseUri(uri, 0);
+                    icon = LockscreenTargetUtils.getDrawableFromIntent(getActivity(), intent);
+                } catch (URISyntaxException e) {
+                    Log.wtf(TAG, "Invalid uri: " + uri);
+                }
+            }
+        }
+
+        if (icon == null) {
+            return mEmptyIcon;
+        } else {
+            return icon;
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == Activity.RESULT_OK) {
+            if (requestCode == ShortcutPickerHelper.REQUEST_PICK_SHORTCUT
+                    || requestCode == ShortcutPickerHelper.REQUEST_PICK_APPLICATION
+                    || requestCode == ShortcutPickerHelper.REQUEST_CREATE_SHORTCUT) {
+                mPicker.onActivityResult(requestCode, resultCode, data);
+            } else if (requestCode == IconPicker.REQUEST_PICK_SYSTEM
+                    || requestCode == IconPicker.REQUEST_PICK_GALLERY
+                    || requestCode == IconPicker.REQUEST_PICK_ICON_PACK) {
+                mIconPicker.onActivityResult(requestCode, resultCode, data);
+            } else if (requestCode == PICK_CONTACT) {
+                Uri contactData = data.getData();
+                String[] projection = new String[]{
+                        ContactsContract.Contacts.LOOKUP_KEY
+                };
+                String selection = ContactsContract.Contacts.DISPLAY_NAME + " IS NOT NULL";
+                CursorLoader cursorLoader = new CursorLoader(getActivity().getBaseContext(),
+                        contactData, projection, selection, null, null);
+                Cursor cursor = cursorLoader.loadInBackground();
+                if (cursor != null) {
+                    try {
+                        if (cursor.moveToFirst()) {
+                            String lookupKey = cursor.getString(cursor
+                                    .getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY));
+                            QuickSettingsUtil.saveCustomExtras(getActivity(),
+                                    lookupKey, mCurrentCustomTile,
+                                    Settings.System.TILE_CONTACT_ACTIONS);
+                        }
+                    } finally {
+                        cursor.close();
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void iconPicked(int requestCode, int resultCode, Intent intent) {
+        if (requestCode == IconPicker.REQUEST_PICK_GALLERY) {
+            if (resultCode == Activity.RESULT_OK) {
+                if (mTemporaryImage.length() == 0 || !mTemporaryImage.exists()) {
+                    Toast.makeText(getActivity(),
+                            getResources().getString(R.string.shortcut_image_not_valid),
+                            Toast.LENGTH_LONG).show();
+                    return;
+                }
+
+                File imageFile = new File(getActivity().getFilesDir(),
+                        "/custom_tile_" + System.currentTimeMillis() + ".png");
+                String path = imageFile.getAbsolutePath();
+                mTemporaryImage.renameTo(imageFile);
+                imageFile.setReadable(true, false);
+
+                deleteCustomIcon();  // Delete current icon if it exists before saving new.
+                QuickSettingsUtil.saveCustomActions(getActivity(), mCurrentAction, 2,
+                        path, mCurrentCustomTile);
+
+                setDialogIconsAndText(mCurrentAction);
+            } else {
+                if (mTemporaryImage.exists()) {
+                    mTemporaryImage.delete();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void shortcutPicked(String uri, String friendlyName, boolean isApplication) {
+        if (uri == null) {
+            return;
+        }
+
+        Drawable icon = null;
+        try {
+            Intent intent = Intent.parseUri(uri, 0);
+            icon = LockscreenTargetUtils.getDrawableFromIntent(getActivity(), intent);
+        } catch (URISyntaxException e) {
+            Log.wtf(TAG, "Invalid uri: " + uri);
+        }
+
+        boolean changeIcon = false;
+        int setting = 0;
+
+        if (mShortPress) {
+            changeIcon = true;
+        } else {
+            changeIcon = QuickSettingsUtil.getActionsAtIndex(getActivity(),
+                    mCurrentAction, 0, mCurrentCustomTile) == null;
+            setting = 1;
+        }
+
+        if (changeIcon) {
+            deleteCustomIcon();
+        }
+
+        QuickSettingsUtil.saveCustomActions(getActivity(),
+                mCurrentAction, setting, uri, mCurrentCustomTile);
+
+        setDialogIconsAndText(mCurrentAction);
+    }
+
+    private void deleteCustomIcon() {
+        String path = QuickSettingsUtil.getActionsAtIndex(getActivity(),
+                mCurrentAction, 2, mCurrentCustomTile);
+
+        if (path != null) {
+            File f = new File(path);
+            if (f != null && f.exists()) {
+                f.delete();
+            }
+        }
+        QuickSettingsUtil.saveCustomActions(getActivity(),
+                mCurrentAction, 2, " ", mCurrentCustomTile);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch(v.getId()) {
+            case R.id.icon:
+                prepareCustomIcon(0);
+                break;
+            case R.id.icon_two:
+                prepareCustomIcon(1);
+                break;
+            case R.id.icon_three:
+                prepareCustomIcon(2);
+                break;
+            case R.id.icon_four:
+                prepareCustomIcon(3);
+                break;
+            case R.id.icon_five:
+                prepareCustomIcon(4);
+                break;
+            case R.id.action:
+                prepareCustomAction(0, true);
+                break;
+            case R.id.action_two:
+                prepareCustomAction(1, true);
+                break;
+            case R.id.action_three:
+                prepareCustomAction(2, true);
+                break;
+            case R.id.action_four:
+                prepareCustomAction(3, true);
+                break;
+            case R.id.action_five:
+                prepareCustomAction(4, true);
+                break;
+            case R.id.reset:
+                deleteAction(0);
+                break;
+            case R.id.reset_two:
+                deleteAction(1);
+                break;
+            case R.id.reset_three:
+                deleteAction(2);
+                break;
+            case R.id.reset_four:
+                deleteAction(3);
+                break;
+            case R.id.reset_five:
+                deleteAction(4);
+                break;
+        }
+    }
+
+    @Override
+    public boolean onLongClick(View v) {
+        switch(v.getId()) {
+            case R.id.action:
+                prepareCustomAction(0, false);
+                break;
+            case R.id.action_two:
+                prepareCustomAction(1, false);
+                break;
+            case R.id.action_three:
+                prepareCustomAction(2, false);
+                break;
+            case R.id.action_four:
+                prepareCustomAction(3, false);
+                break;
+            case R.id.action_five:
+                prepareCustomAction(4, false);
+                break;
+        }
+        return true;
+    }
+
+    private void prepareCustomIcon(int action) {
+        mCurrentAction = action;
+        String uri = QuickSettingsUtil.getActionsAtIndex(getActivity(),
+                mCurrentAction, 0, mCurrentCustomTile);
+
+        if (uri == null ) {
+            // Check if long action exists, and use it instead
+            uri = QuickSettingsUtil.getActionsAtIndex(getActivity(),
+                    mCurrentAction, 1, mCurrentCustomTile);
+        }
+
+        if (uri != null) {
+            try {
+                mTemporaryImage.createNewFile();
+                mTemporaryImage.setWritable(true, false);
+                // Layout will scale down for us
+                mIconPicker.pickGalleryWithSize(
+                    getId(), mTemporaryImage, 360);
+            } catch (IOException e) {
+                Log.d(TAG, "Could not create temporary icon", e);
+            }
+        } else {
+            Toast.makeText(getActivity(), R.string.custom_tile_null_warning,
+                    Toast.LENGTH_LONG).show();
+        }
+    }
+
+    private void prepareCustomAction(int action, boolean shortpress) {
+        mCurrentAction = action;
+        mShortPress = shortpress;
+        mPicker.pickShortcut(getId());
+    }
+
+    private void deleteAction(int action) {
+        mCurrentAction = action;
+        QuickSettingsUtil.deleteCustomActions(
+                getActivity(), mCurrentAction, mCurrentCustomTile);
+        setDialogIconsAndText(mCurrentAction);
+    }
+
     private void showDialogInner(int id) {
-        DialogFragment newFragment = MyAlertDialogFragment.newInstance(id);
+        DialogFragment newFragment =
+                MyAlertDialogFragment.newInstance(id, mCurrentCustomTile);
         newFragment.setTargetFragment(this, 0);
         newFragment.show(getFragmentManager(), "dialog " + id);
     }
 
     public static class MyAlertDialogFragment extends DialogFragment {
 
-        public static MyAlertDialogFragment newInstance(int id) {
+        public static MyAlertDialogFragment newInstance(int id, String tileKey) {
             MyAlertDialogFragment frag = new MyAlertDialogFragment();
             Bundle args = new Bundle();
             args.putInt("id", id);
+            args.putString("tileKey", tileKey);
             frag.setArguments(args);
             return frag;
         }
@@ -376,6 +801,7 @@ QuickSettingsTiles getOwner() {
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             int id = getArguments().getInt("id");
+            final String tileKey = getArguments().getString("tileKey");
             switch (id) {
                 case DLG_DISABLED:
                     return new AlertDialog.Builder(getActivity())
@@ -579,16 +1005,26 @@ public void onClick(DialogInterface dialog, final int position) {
                             new Thread(new Runnable() {
                                 @Override
                                 public void run() {
-                                    ArrayList<String> curr =
-                                            QuickSettingsUtil.getTileListFromString(
-                                                QuickSettingsUtil.getCurrentTiles(getActivity()));
-                                    curr.add(getOwner().mTileAdapter.getTileId(position));
+                                    String tiles = QuickSettingsUtil.getCurrentTiles(getActivity());
+                                    String picked = getOwner().mTileAdapter.getTileId(position);
+                                    ArrayList<String> curr = new ArrayList<String>();
+                                    // A blank string indicates tiles are currently disabled
+                                    // Avoid index being off by one when we add a new tile
+                                    if (!tiles.equals("")) {
+                                        curr = QuickSettingsUtil.getTileListFromString(tiles);
+                                    }
+                                    if (picked.contains(TILE_CUSTOM)
+                                            || picked.contains(TILE_CONTACT)) {
+                                        curr.add(picked
+                                                + TILE_CUSTOM_KEY + System.currentTimeMillis());
+                                    } else {
+                                        curr.add(picked);
+                                    }
                                     QuickSettingsUtil.saveCurrentTiles(getActivity(),
                                             QuickSettingsUtil.getTileStringFromList(curr));
                                 }
                             }).start();
-                            TileInfo info =
-                                QuickSettingsUtil.TILES.get(
+                            TileInfo info = QuickSettingsUtil.TILES.get(
                                     getOwner().mTileAdapter.getTileId(position));
                             getOwner().addTile(info.getTitleResId(), info.getIcon(), 0, true);
                         }
@@ -656,6 +1092,124 @@ public void onClick(DialogInterface dialog, int which) {
                         }
                     })
                     .create();
+                case DLG_CUSTOM_TILE:
+                    return new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.custom_tile_dialog_title)
+                    .setView(getOwner().customTileDialogView(tileKey))
+                    .setCancelable(false)
+                    .setPositiveButton(R.string.dlg_ok,
+                        new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            if (QuickSettingsUtil.getCustomExtras(getActivity(),
+                                    Settings.System.CUSTOM_TOGGLE_EXTRAS,
+                                    tileKey) == null) {
+                                QuickSettingsUtil.saveCustomExtras(getActivity(),
+                                        Integer.toString(1), tileKey,
+                                        Settings.System.CUSTOM_TOGGLE_EXTRAS);
+                            }
+                            getOwner().showDialogInner(DLG_CUSTOM_TILE_EXTRAS);
+                        }
+                    })
+                    .create();
+                case DLG_CUSTOM_TILE_EXTRAS:
+                    int actions = 0;
+                    boolean matchIncluded = false;
+                    String checkClick = null;
+                    for (int i = 0; i < getOwner().NUMBER_ACTIONS; i++) {
+                        checkClick = QuickSettingsUtil.getActionsAtIndex(getActivity(),
+                                i, 0, tileKey);
+                        if (checkClick != null) {
+                            actions++;
+                        }
+                    }
+                    // User selected multiple click actions
+                    // Only now is this preference relevant
+                    if (actions > 1) {
+                        matchIncluded = true;
+                    }
+
+                    String setting = QuickSettingsUtil.getCustomExtras(getActivity(),
+                            Settings.System.CUSTOM_TOGGLE_EXTRAS,
+                            tileKey);
+                    final boolean[] checkBox = new boolean[matchIncluded ? 2 : 1];
+                    if (setting != null) {
+                        switch (Integer.parseInt(setting)) {
+                            case 0:
+                                checkBox[0] = false;
+                                if (matchIncluded) {
+                                    checkBox[1] = false;
+                                }
+                                break;
+                            case 1:
+                                checkBox[0] = true;
+                                if (matchIncluded) {
+                                    checkBox[1] = false;
+                                }
+                                break;
+                            case 2:
+                                checkBox[0] = false;
+                                if (matchIncluded) {
+                                    checkBox[1] = true;
+                                }
+                                break;
+                            case 3:
+                                checkBox[0] = true;
+                                if (matchIncluded) {
+                                    checkBox[1] = true;
+                                }
+                                break;
+                        }
+                    } else {
+                        checkBox[0] = false;
+                        if (matchIncluded) {
+                            checkBox[1] = false;
+                        }
+                    }
+
+                    final String[] entry = new String[matchIncluded ? 2 : 1];
+
+                    entry[0] = getResources().getString(
+                            R.string.custom_toggle_collapse_check);
+                    if (matchIncluded) {
+                        entry[1] = getResources().getString(
+                                R.string.custom_toggle_match_state_check);
+                    }
+
+                    return new AlertDialog.Builder(getActivity())
+                    .setTitle(R.string.custom_toggle_extras)
+                    .setNegativeButton(R.string.cancel, null)
+                    .setMultiChoiceItems(entry, checkBox,
+                        new  DialogInterface.OnMultiChoiceClickListener() {
+                        public void onClick(DialogInterface dialog, int indexSelected,
+                                boolean isChecked) {
+                            checkBox[indexSelected] = isChecked;
+                        }
+                    })
+                    .setPositiveButton(R.string.dlg_ok,
+                        new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            int userValue = 0;
+                            for (int i = 0; i < checkBox.length; i++) {
+                                boolean addIt = checkBox[i];
+                                switch (i) {
+                                    case 0:
+                                        if (addIt) {
+                                            userValue += 1;
+                                        }
+                                        break;
+                                    case 1:
+                                        if (addIt) {
+                                            userValue += 2;
+                                        }
+                                        break;
+                                }
+                            }
+                            QuickSettingsUtil.saveCustomExtras(getActivity(),
+                                    Integer.toString(userValue), tileKey,
+                                    Settings.System.CUSTOM_TOGGLE_EXTRAS);
+                        }
+                    })
+                    .create();
             }
             throw new IllegalArgumentException("unknown id " + id);
         }
@@ -729,7 +1283,11 @@ public String getTileId(int position) {
         public boolean isEnabled(int position) {
             String usedTiles = QuickSettingsUtil.getCurrentTiles(
                     getContext());
-            return !(usedTiles.contains(mTiles[position].tile.getId()));
+            String tile = mTiles[position].tile.getId();
+            if (TILE_CUSTOM.equals(tile) || TILE_CONTACT.equals(tile)) {
+                return true;
+            }
+            return !usedTiles.contains(tile);
         }
     }
 }
diff --git a/src/com/android/settings/slim/quicksettings/QuickSettingsTilesStyle.java b/src/com/android/settings/slim/quicksettings/QuickSettingsTilesStyle.java
index 2fc67f22ed5..14fa8dfc618 100644
--- a/src/com/android/settings/slim/quicksettings/QuickSettingsTilesStyle.java
+++ b/src/com/android/settings/slim/quicksettings/QuickSettingsTilesStyle.java
@@ -159,10 +159,11 @@ private PreferenceScreen refreshSettings() {
             Settings.System.putFloat(getContentResolver(),
                     Settings.System.QUICK_TILES_BG_ALPHA, 0.0f);
         }
-        mQsTileAlpha = (SeekBarPreference) findPreference(PREF_QUICK_TILES_ALPHA);
-        mQsTileAlpha.setInitValue((int) (transparency * 100));
-        mQsTileAlpha.setProperty(Settings.System.QUICK_TILES_BG_ALPHA);
-        mQsTileAlpha.setOnPreferenceChangeListener(this);
+        if (mQsTileAlpha == null) {
+            mQsTileAlpha = (SeekBarPreference) findPreference(PREF_QUICK_TILES_ALPHA);
+            mQsTileAlpha.setInitValue((int) (transparency * 100));
+            mQsTileAlpha.setOnPreferenceChangeListener(this);
+        }
 
         mTilesPerRow = (ListPreference) prefs.findPreference(PREF_TILES_PER_ROW);
         int tilesPerRow = Settings.System.getInt(getActivity().getContentResolver(),
diff --git a/src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java b/src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java
index 2d41f8ef3c6..aa4fc2ee4cd 100644
--- a/src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java
+++ b/src/com/android/settings/slim/quicksettings/QuickSettingsUtil.java
@@ -26,6 +26,10 @@
 import static com.android.internal.util.slim.QSConstants.TILE_BLUETOOTH;
 import static com.android.internal.util.slim.QSConstants.TILE_BRIGHTNESS;
 import static com.android.internal.util.slim.QSConstants.TILE_BUGREPORT;
+import static com.android.internal.util.slim.QSConstants.TILE_CONTACT;
+import static com.android.internal.util.slim.QSConstants.TILE_CUSTOM;
+import static com.android.internal.util.slim.QSConstants.TILE_CUSTOM_KEY;
+import static com.android.internal.util.slim.QSConstants.TILE_CUSTOM_DELIMITER;
 import static com.android.internal.util.slim.QSConstants.TILE_DELIMITER;
 import static com.android.internal.util.slim.QSConstants.TILE_EXPANDEDDESKTOP;
 import static com.android.internal.util.slim.QSConstants.TILE_IMESWITCHER;
@@ -36,6 +40,7 @@
 import static com.android.internal.util.slim.QSConstants.TILE_MUSIC;
 import static com.android.internal.util.slim.QSConstants.TILE_NETWORKMODE;
 import static com.android.internal.util.slim.QSConstants.TILE_NFC;
+import static com.android.internal.util.slim.QSConstants.TILE_QUICKRECORD;
 import static com.android.internal.util.slim.QSConstants.TILE_QUIETHOURS;
 import static com.android.internal.util.slim.QSConstants.TILE_RINGER;
 import static com.android.internal.util.slim.QSConstants.TILE_SCREENTIMEOUT;
@@ -61,6 +66,7 @@
 import com.android.internal.util.slim.DeviceUtils;
 import com.android.settings.R;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -155,6 +161,15 @@ public class QuickSettingsUtil {
         registerTile(new QuickSettingsUtil.TileInfo(
                 TILE_THEME, R.string.title_tile_theme,
                 "com.android.systemui:drawable/ic_qs_theme_manual"));
+        registerTile(new QuickSettingsUtil.TileInfo(
+                TILE_QUICKRECORD, R.string.title_tile_quick_record,
+                "com.android.systemui:drawable/ic_qs_quickrecord"));
+        registerTile(new QuickSettingsUtil.TileInfo(
+                TILE_CUSTOM, R.string.title_tile_custom,
+                "com.android.systemui:drawable/ic_qs_settings"));
+        registerTile(new QuickSettingsUtil.TileInfo(
+                TILE_CONTACT, R.string.title_tile_contact,
+                "com.android.systemui:drawable/ic_qs_default_user"));
     }
 
     private static void registerTile(QuickSettingsUtil.TileInfo info) {
@@ -296,6 +311,31 @@ public static void saveCurrentTiles(Context context, String tiles) {
     public static void resetTiles(Context context) {
         Settings.System.putString(context.getContentResolver(),
                 Settings.System.QUICK_SETTINGS_TILES, null);
+        Settings.System.putString(context.getContentResolver(),
+                Settings.System.CUSTOM_TOGGLE_EXTRAS, null);
+        Settings.System.putString(context.getContentResolver(),
+                Settings.System.CUSTOM_TOGGLE_ACTIONS, null);
+        Settings.System.putString(context.getContentResolver(),
+                Settings.System.TILE_CONTACT_ACTIONS, null);
+    }
+
+    public static void deleteCustomTile(Context context, String tileKey) {
+        deleteActions(context,
+                Settings.System.CUSTOM_TOGGLE_EXTRAS, tileKey);
+        for (int i = 0; i < 5; i++) {
+            deleteCustomIcon(getActionsAtIndex(context, i, 2, tileKey));
+        }
+        deleteActions(context,
+                Settings.System.CUSTOM_TOGGLE_ACTIONS, tileKey);
+    }
+
+    private static void deleteCustomIcon(String file) {
+        if (file != null) {
+            File f = new File(file);
+            if (f != null && f.exists()) {
+                f.delete();
+            }
+        }
     }
 
     public static String mergeInNewTileString(String oldString, String newString) {
@@ -343,6 +383,160 @@ public static String getDefaultTiles(Context context) {
         return TextUtils.join(TILE_DELIMITER, TILES_DEFAULT);
     }
 
+    public static String getCustomExtras(Context context, String setting, String tileKey) {
+        ArrayList<String> array = getCustomArray(context, setting);
+        String action = null;
+        for (int i = 0; i < array.size(); i++) {
+            if (array.get(i) != null && array.get(i).contains(tileKey)) {
+                String[] split = array.get(i).split(TILE_CUSTOM_KEY);
+                action = split[0];
+            }
+        }
+        return action;
+    }
+
+    public static String getActionsAtIndex(
+            Context context, int index, int actionIndex, String tileKey) {
+        String actions = Settings.System.getString(
+                context.getContentResolver(),
+                Settings.System.CUSTOM_TOGGLE_ACTIONS);
+        String returnAction = null;
+        if (actions != null && actions.contains(tileKey)) {
+            for (String action : actions.split("\\|")) {
+                if (action.contains(tileKey) && action.endsWith(Integer.toString(index))) {
+                    String[] split = action.split(TILE_CUSTOM_KEY);
+                    String[] returned = split[0].split(TILE_CUSTOM_DELIMITER);
+                    returnAction = returned[actionIndex];
+                    if (returnAction.equals(" ")) {
+                        returnAction = null;
+                    }
+                }
+            }
+        }
+        return returnAction;
+    }
+
+    public static void deleteActions(Context context, String setting, String tileKey) {
+        ArrayList<String> array = getCustomArray(context, setting);
+        for (int i = 0; i < array.size(); i++) {
+            if (array.get(i) != null && array.get(i).contains(tileKey)) {
+                array.remove(i);
+            }
+        }
+        Settings.System.putString(
+                context.getContentResolver(), setting, getTileStringFromList(array));
+    }
+
+    public static ArrayList<String> getCustomArray(Context context, String setting) {
+        String actions = Settings.System.getString(
+                context.getContentResolver(), setting);
+        if (actions == null) {
+            ArrayList<String> list = new ArrayList<String>();
+            list.add(null);
+            return list;
+        } else {
+            return new ArrayList<String>(Arrays.asList(actions.split("\\" + TILE_DELIMITER)));
+        }
+    }
+
+    public static void saveCustomExtras(
+            Context context, String action, String tilekey, String setting) {
+        String oldSetting = Settings.System.getString(
+                context.getContentResolver(),
+                setting);
+        ArrayList<String> oldList = getCustomArray(context, setting);
+        ArrayList<String> newList = new ArrayList<String>();
+        newList.add(action + TILE_CUSTOM_KEY + tilekey);
+
+        for (String tile : oldList) {
+            if (tile != null && !tile.contains(tilekey)) {
+                newList.add(tile);
+            }
+        }
+
+        Settings.System.putString(
+                context.getContentResolver(), setting, getTileStringFromList(newList));
+    }
+
+    public static void saveCustomActions(
+            Context context, int index, int actionIndex, String action, String tileKey) {
+        String setting = Settings.System.CUSTOM_TOGGLE_ACTIONS;
+        String oldSetting = Settings.System.getString(
+                context.getContentResolver(), setting);
+        ArrayList<String> oldList = getCustomArray(context, setting);
+        ArrayList<String> newList = new ArrayList<String>();
+
+        String clickAction = " ";
+        String longAction = " ";
+        String icon = " ";
+
+        if (oldSetting != null && oldSetting.contains(tileKey)) {
+            for (String act : oldSetting.split("\\|")) {
+                if (act.contains(tileKey) && act.endsWith(Integer.toString(index))) {
+                    String[] split = act.split(TILE_CUSTOM_KEY);
+                    String[] returned = split[0].split(TILE_CUSTOM_DELIMITER);
+                    clickAction = returned[0];
+                    longAction = returned[1];
+                    icon = returned[2];
+                }
+            }
+        }
+
+        switch (actionIndex) {
+            case 0:
+                clickAction = action;
+                break;
+            case 1:
+                longAction = action;
+                break;
+            case 2:
+                icon = action;
+                break;
+        }
+
+        newList.add(clickAction
+                + TILE_CUSTOM_DELIMITER + longAction
+                + TILE_CUSTOM_DELIMITER + icon
+                + TILE_CUSTOM_KEY + tileKey + " " + Integer.toString(index));
+
+        for (String tile : oldList) {
+            if (tile != null) {
+                if (tile.contains(tileKey)) {
+                    if (!tile.endsWith(Integer.toString(index))) {
+                        newList.add(tile);
+                    }
+                } else {
+                    newList.add(tile);
+                }
+            }
+        }
+
+        Settings.System.putString(
+                context.getContentResolver(), setting, getTileStringFromList(newList));
+    }
+
+    public static void deleteCustomActions(Context context, int index, String tileKey) {
+        String setting = Settings.System.CUSTOM_TOGGLE_ACTIONS;
+        String oldSetting = Settings.System.getString(
+                context.getContentResolver(), setting);
+        ArrayList<String> oldList = getCustomArray(context, setting);
+        ArrayList<String> newList = new ArrayList<String>();
+
+        for (int i = 0; i < oldList.size(); i++) {
+            if (oldList.get(i).contains(tileKey)
+                    && oldList.get(i).endsWith(Integer.toString(index))) {
+                String[] split = oldList.get(i).split(TILE_CUSTOM_KEY);
+                String[] returned = split[0].split(TILE_CUSTOM_DELIMITER);
+                deleteCustomIcon(returned[2]);
+            } else {
+                newList.add(oldList.get(i));
+            }
+        }
+
+        Settings.System.putString(
+                context.getContentResolver(), setting, getTileStringFromList(newList));
+    }
+
     public static class TileInfo {
         private String mId;
         private int mTitleResId;
diff --git a/src/com/android/settings/slim/themes/ThemeEnabler.java b/src/com/android/settings/slim/themes/ThemeEnabler.java
index ad4f9c6b40e..2924ada5849 100644
--- a/src/com/android/settings/slim/themes/ThemeEnabler.java
+++ b/src/com/android/settings/slim/themes/ThemeEnabler.java
@@ -18,13 +18,11 @@
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.database.ContentObserver;
-import android.os.Handler;
-import android.os.UserHandle;
-import android.provider.Settings;
 import android.widget.CompoundButton;
 import android.widget.Switch;
-import android.widget.Toast;
+
+import com.android.internal.util.slim.ButtonsConstants;
+import com.android.internal.util.slim.SlimActions;
 
 import com.android.settings.R;
 
@@ -32,50 +30,19 @@ public class ThemeEnabler implements CompoundButton.OnCheckedChangeListener {
     private final Context mContext;
     private Switch mSwitch;
     private boolean mStateMachineEvent;
-    private boolean mEnabled;
-
-    private boolean mAttached;
-    private SettingsObserver mSettingsObserver;
-
-    private final class SettingsObserver extends ContentObserver {
-        SettingsObserver(Handler handler) {
-            super(handler);
-        }
-
-        void observe() {
-            mContext.getContentResolver().registerContentObserver(
-                    Settings.Secure.getUriFor(
-                    Settings.Secure.UI_THEME_AUTO_MODE),
-                    false, this);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            setSwitchState();
-        }
-    }
 
     public ThemeEnabler(Context context, Switch switch_) {
         mContext = context;
         mSwitch = switch_;
-        mSettingsObserver = new SettingsObserver(new Handler());
     }
 
     public void resume() {
         mSwitch.setOnCheckedChangeListener(this);
-        if (!mAttached) {
-            mAttached = true;
-            mSettingsObserver.observe();
-        }
         setSwitchState();
     }
 
     public void pause() {
         mSwitch.setOnCheckedChangeListener(null);
-        if (mAttached) {
-            mAttached = false;
-            mContext.getContentResolver().unregisterContentObserver(mSettingsObserver);
-        }
     }
 
     public void setSwitch(Switch switch_) {
@@ -87,10 +54,6 @@ public void setSwitch(Switch switch_) {
     }
 
     public void setSwitchState() {
-        mEnabled = Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                Settings.Secure.UI_THEME_AUTO_MODE, 0,
-                UserHandle.USER_CURRENT) != 1;
-
         boolean state = mContext.getResources().getConfiguration().uiThemeMode
                     == Configuration.UI_THEME_MODE_HOLO_DARK;
         mStateMachineEvent = true;
@@ -102,21 +65,8 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         if (mStateMachineEvent) {
             return;
         }
-        if (!mEnabled) {
-            Toast.makeText(mContext, R.string.theme_auto_switch_mode_error,
-                    Toast.LENGTH_SHORT).show();
-            setSwitchState();
-            return;
-        }
-        // Handle a switch change
-        // we currently switch between holodark and hololight till either
-        // theme engine is ready or lightheme is ready. Currently due of
-        // missing light themeing hololight = system base theme
-        Settings.Secure.putIntForUser(mContext.getContentResolver(),
-                Settings.Secure.UI_THEME_MODE, isChecked
-                    ? Configuration.UI_THEME_MODE_HOLO_DARK
-                    : Configuration.UI_THEME_MODE_HOLO_LIGHT,
-                UserHandle.USER_CURRENT);
+        SlimActions.processAction(mContext, ButtonsConstants.ACTION_THEME_SWITCH, false);
+        setSwitchState();
     }
 
 }
diff --git a/src/com/android/settings/slim/util/IconPicker.java b/src/com/android/settings/slim/util/IconPicker.java
index 900b40ef0bd..a8104cd7e20 100644
--- a/src/com/android/settings/slim/util/IconPicker.java
+++ b/src/com/android/settings/slim/util/IconPicker.java
@@ -69,6 +69,29 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         mIconListener.iconPicked(requestCode, resultCode, data);
     }
 
+    public void pickGalleryWithSize(final int fragmentId, final File image, int size) {
+        Intent iconPackIntent = new Intent(ICON_ACTION);
+        ComponentName component = iconPackIntent.resolveActivity(mParent.getPackageManager());
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT, null);
+        intent.setType("image/*");
+        intent.putExtra("crop", "true");
+        intent.putExtra("scale", true);
+        intent.putExtra("scaleUpIfNeeded", false);
+        intent.putExtra("outputFormat", Bitmap.CompressFormat.PNG.toString());
+        intent.putExtra("aspectX", 1);
+        intent.putExtra("aspectY", 1);
+        intent.putExtra("outputX", size);
+        intent.putExtra("outputY", size);
+        try {
+            intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(image));
+            intent.putExtra("return-data", false);
+            startFragmentOrActivityForResult(
+                    intent, REQUEST_PICK_GALLERY, fragmentId);
+        } catch (ActivityNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
     public void pickIcon(final int fragmentId, final File image) {
         Intent iconPackIntent = new Intent(ICON_ACTION);
         ComponentName component = iconPackIntent.resolveActivity(mParent.getPackageManager());
@@ -125,23 +148,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
             });
             dialog.show();
         } else if (type == REQUEST_PICK_GALLERY) {
-            Intent intent = new Intent(Intent.ACTION_GET_CONTENT, null);
-            intent.setType("image/*");
-            intent.putExtra("crop", "true");
-            intent.putExtra("scale", true);
-            intent.putExtra("scaleUpIfNeeded", false);
-            intent.putExtra("outputFormat", Bitmap.CompressFormat.PNG.toString());
-            intent.putExtra("aspectX", 1);
-            intent.putExtra("aspectY", 1);
-            intent.putExtra("outputX", 162);
-            intent.putExtra("outputY", 162);
-            try {
-                intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(image));
-                intent.putExtra("return-data", false);
-                startFragmentOrActivityForResult(intent, type, fragmentId);
-            } catch (ActivityNotFoundException e) {
-                e.printStackTrace();
-            }
+            pickGalleryWithSize(fragmentId, image, 162);
         } else if (type == REQUEST_PICK_ICON_PACK) {
             Intent iconPackIntent = new Intent(ICON_ACTION);
             startFragmentOrActivityForResult(iconPackIntent, type, fragmentId);
diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java
index 19de100b1b7..4e16bfc9f8d 100644
--- a/src/com/android/settings/widget/ChartDataUsageView.java
+++ b/src/com/android/settings/widget/ChartDataUsageView.java
@@ -34,12 +34,12 @@
 import android.view.MotionEvent;
 import android.view.View;
 
-import com.android.internal.util.Objects;
 import com.android.settings.R;
 import com.android.settings.widget.ChartSweepView.OnSweepListener;
 
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Objects;
 
 /**
  * Specific {@link ChartView} that displays {@link ChartNetworkSeriesView} along
@@ -466,7 +466,7 @@ public TimeAxis() {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(mMin, mMax, mSize);
+            return Objects.hash(mMin, mMax, mSize);
         }
 
         @Override
@@ -548,7 +548,7 @@ public static class DataAxis implements ChartAxis {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(mMin, mMax, mSize);
+            return Objects.hash(mMin, mMax, mSize);
         }
 
         @Override
diff --git a/src/com/android/settings/widget/SeekBarPreference.java b/src/com/android/settings/widget/SeekBarPreference.java
index f7e41aa33ab..a515e0d5c79 100644
--- a/src/com/android/settings/widget/SeekBarPreference.java
+++ b/src/com/android/settings/widget/SeekBarPreference.java
@@ -19,15 +19,17 @@ public class SeekBarPreference extends Preference
         implements OnSeekBarChangeListener {
 
     public static int maximum = 100;
-    public static int interval = 5;
-
-    private String property;
+    public int interval = 5;
 
     private TextView monitorBox;
     private SeekBar bar;
 
     int defaultValue = 60;
+    int mSetDefault = -1;
+    int mMultiply = -1;
+    int mMinimum = -1;
     boolean mDisablePercentageValue = false;
+    boolean mIsMilliSeconds = false;
 
     private OnPreferenceChangeListener changer;
 
@@ -42,28 +44,16 @@ protected View onCreateView(ViewGroup parent) {
 
         monitorBox = (TextView) layout.findViewById(R.id.monitor_box);
         bar = (SeekBar) layout.findViewById(R.id.seek_bar);
-        int progress;
-        try{
-            progress = (int) (Settings.System.getFloat(
-                    getContext().getContentResolver(), property) * 100);
-        } catch (Exception e) {
-            progress = defaultValue;
-        }
         bar.setOnSeekBarChangeListener(this);
-        bar.setProgress(progress);
-        if (!mDisablePercentageValue) {
-            monitorBox.setText(progress + "%");
-        }
+        bar.setProgress(defaultValue);
+
         return layout;
     }
 
     public void setInitValue(int progress) {
         defaultValue = progress;
-        if (bar!=null) {
-            bar.setProgress(progress);
-            if (!mDisablePercentageValue) {
-                monitorBox.setText(progress + "%");
-            }
+        if (bar != null) {
+            bar.setProgress(defaultValue);
         }
     }
 
@@ -86,28 +76,50 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
         progress = Math.round(((float) progress) / interval) * interval;
         seekBar.setProgress(progress);
 
-        if (!mDisablePercentageValue) {
-            monitorBox.setText(progress + "%");
+        if (mMultiply != -1) {
+            progress = progress * mMultiply;
+        }
+
+        if (mMinimum != -1) {
+            progress += mMinimum;
         }
-        changer.onPreferenceChange(this, Integer.toString(progress));
-    }
 
-    public void setValue(int progress){
-        if (bar!=null) {
-            bar.setProgress(progress);
-            if (!mDisablePercentageValue) {
+        if (progress == mSetDefault) {
+            monitorBox.setText(R.string.default_string);
+        } else {
+            if (mIsMilliSeconds) {
+                monitorBox.setText(progress + " ms");
+            } else if (!mDisablePercentageValue) {
                 monitorBox.setText(progress + "%");
+            } else {
+                monitorBox.setText(progress);
             }
-            changer.onPreferenceChange(this, Integer.toString(progress));
         }
+        changer.onPreferenceChange(this, Integer.toString(progress));
     }
 
     public void disablePercentageValue(boolean disable) {
         mDisablePercentageValue = disable;
     }
 
-    public void setProperty(String property) {
-        this.property = property;
+    public void setInterval(int inter) {
+        interval = inter;
+    }
+
+    public void setDefault(int defaultVal) {
+        mSetDefault = defaultVal;
+    }
+
+    public void multiplyValue(int val) {
+        mMultiply = val;
+    }
+
+    public void minimumValue(int val) {
+        mMinimum = val;
+    }
+
+    public void isMilliseconds(boolean millis) {
+        mIsMilliSeconds = millis;
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 1caf58bcd1c..39490876166 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -100,7 +100,8 @@ public class WifiSettings extends RestrictedSettingsFragment
     private static final int MENU_ID_SCAN = Menu.FIRST + 5;
     private static final int MENU_ID_CONNECT = Menu.FIRST + 6;
     private static final int MENU_ID_FORGET = Menu.FIRST + 7;
-    private static final int MENU_ID_MODIFY = Menu.FIRST + 8;
+    private static final int MENU_ID_FORGET_ALL = Menu.FIRST + 8;
+    private static final int MENU_ID_MODIFY = Menu.FIRST + 9;
 
     private static final int WIFI_DIALOG_ID = 1;
     private static final int WPS_PBC_DIALOG_ID = 2;
@@ -474,6 +475,9 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
             menu.add(Menu.NONE, MENU_ID_WPS_PIN, 0, R.string.wifi_menu_wps_pin)
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+            menu.add(Menu.NONE, MENU_ID_FORGET_ALL, 0, R.string.wifi_menu_forget_all)
+                    .setEnabled(wifiIsEnabled)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
             if (mP2pSupported) {
                 menu.add(Menu.NONE, MENU_ID_P2P, 0, R.string.wifi_menu_p2p)
                         .setEnabled(wifiIsEnabled)
@@ -535,6 +539,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     onAddNetworkPressed();
                 }
                 return true;
+            case MENU_ID_FORGET_ALL:
+                forgetAll();
+                return true;
             case MENU_ID_ADVANCED:
                 if (getActivity() instanceof PreferenceActivity) {
                     ((PreferenceActivity) getActivity()).startPreferencePanel(
@@ -1032,6 +1039,22 @@ public void onClick(DialogInterface dialogInterface, int button) {
         changeNextButtonState(false);
     }
 
+    private void forgetAll() {
+        List<WifiConfiguration> configs = mWifiManager.getConfiguredNetworks();
+        if (configs != null) {
+            for (int i=0; i<configs.size(); i++) {
+                mWifiManager.removeNetwork(i);
+            }
+            if (mWifiManager.isWifiEnabled()) {
+                mScanner.resume();
+            }
+            updateAccessPoints();
+
+            // We need to rename/replace "Next" button in wifi setup context.
+            changeNextButtonState(false);
+        }
+    }
+
     /**
      * Refreshes acccess points and ask Wifi module to scan networks again.
      */