Merge "Tap & pay: change empty state UX and strings." into klp-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4218e7e..51ff2f2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1034,7 +1034,6 @@
 
         <!-- Second and third-level settings -->
 
-
         <!-- Lock screen settings -->
         <activity android:name="ConfirmLockPattern"/>
 
@@ -1050,6 +1049,11 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="ChooseLockGeneric$InternalActivity" android:exported="false"
+            android:label="@string/lockpassword_choose_lock_generic_header"
+            android:excludeFromRecents="true"
+        />
+
         <activity android:name="ChooseLockPattern" android:exported="false"/>
 
         <activity android:name="ChooseLockPassword" android:exported="false"
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
index 470f5c0..de40bd0 100644
--- a/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
+++ b/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
index e3aa8db..73ebdb8 100644
--- a/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
+++ b/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
index 9e27d2f..e1d6138 100644
--- a/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
+++ b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_item_bg_pressed.9.png b/res/drawable-hdpi/appwidget_item_bg_pressed.9.png
index 0da4a1d..785dbaa 100644
--- a/res/drawable-hdpi/appwidget_item_bg_pressed.9.png
+++ b/res/drawable-hdpi/appwidget_item_bg_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_grayedout_printer.png b/res/drawable-hdpi/ic_grayedout_printer.png
new file mode 100644
index 0000000..5e54970
--- /dev/null
+++ b/res/drawable-hdpi/ic_grayedout_printer.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
index aa80a7c..79636c0 100644
--- a/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
+++ b/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
index e49e8a9..ac2c80a 100644
--- a/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
+++ b/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
index a54ecd0..87e21cc 100644
--- a/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
+++ b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_item_bg_pressed.9.png b/res/drawable-mdpi/appwidget_item_bg_pressed.9.png
index 9a5001b..df1be8d 100644
--- a/res/drawable-mdpi/appwidget_item_bg_pressed.9.png
+++ b/res/drawable-mdpi/appwidget_item_bg_pressed.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_grayedout_printer.png b/res/drawable-mdpi/ic_grayedout_printer.png
new file mode 100644
index 0000000..5e54970
--- /dev/null
+++ b/res/drawable-mdpi/ic_grayedout_printer.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
index defdbb9..45d9301 100644
--- a/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
index 582d0e1..35ae2c8 100644
--- a/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
index 9732dd7..06419a1 100644
--- a/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
+++ b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png b/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png
index 3160e85..80d9bfb 100644
--- a/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png
+++ b/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_grayedout_printer.png b/res/drawable-xhdpi/ic_grayedout_printer.png
new file mode 100644
index 0000000..5e54970
--- /dev/null
+++ b/res/drawable-xhdpi/ic_grayedout_printer.png
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_item_bg_pressed.9.png b/res/drawable-xxhdpi/appwidget_item_bg_pressed.9.png
new file mode 100644
index 0000000..a3427e8
--- /dev/null
+++ b/res/drawable-xxhdpi/appwidget_item_bg_pressed.9.png
Binary files differ
diff --git a/res/layout/empty_print_state.xml b/res/layout/empty_print_state.xml
new file mode 100644
index 0000000..135b3dd
--- /dev/null
+++ b/res/layout/empty_print_state.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/empty_printers_list_service_disabled"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:visibility="gone">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dip"
+            android:src="@drawable/ic_grayedout_printer"
+            android:contentDescription="@string/print_service_disabled">
+        </ImageView>
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="?android:attr/textColorSecondary">
+        </TextView>
+
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/res/layout/empty_printers_list_service_enabled.xml b/res/layout/empty_printers_list_service_enabled.xml
new file mode 100644
index 0000000..78c8b43
--- /dev/null
+++ b/res/layout/empty_printers_list_service_enabled.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/empty_printers_list_service_enabled"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:visibility="gone">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dip"
+            android:src="@drawable/ic_grayedout_printer"
+            android:contentDescription="@string/print_searching_for_printers">
+        </ImageView>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="?android:attr/textColorSecondary"
+            android:text="@string/print_searching_for_printers">
+        </TextView>
+
+        <ProgressBar
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:indeterminate="true"
+            style="@android:style/Widget.Holo.ProgressBar.Horizontal">
+        </ProgressBar>
+
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/res/layout/print_job_summary.xml b/res/layout/print_job_summary.xml
new file mode 100644
index 0000000..d755de2
--- /dev/null
+++ b/res/layout/print_job_summary.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="15dip"
+    android:layout_marginEnd="6dip"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="top|start"
+    android:orientation="vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground">
+
+    <View
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/listDivider">
+    </View>
+
+    <TextView android:id="@+android:id/summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary">
+    </TextView>
+
+</LinearLayout>
diff --git a/res/layout/printer_dropdown_item.xml b/res/layout/printer_dropdown_item.xml
new file mode 100644
index 0000000..ad393b8
--- /dev/null
+++ b/res/layout/printer_dropdown_item.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="48dip"
+    android:gravity="center_vertical"
+    android:paddingStart="@*android:dimen/preference_item_padding_side"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="8dip"
+        android:duplicateParentState="true"
+        android:contentDescription="@null"
+        android:visibility="gone">
+    </ImageView>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:textIsSelectable="false">
+        </TextView>
+
+        <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textIsSelectable="false"
+            android:visibility="gone"
+            android:textColor="?android:attr/textColorSecondary">
+        </TextView>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5f6531b..9e23f33 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hoë akkuraatheid"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterybesparend"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Toestelsensors"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Ligging af"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Onlangse liggingversoeke"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Geen programme het onlangs ligging versoek nie"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimum geheuegebruik"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Looptyd"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Dienste"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Tydsduur"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ure"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 uur"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 uur"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Wys stelsel"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Gebruik Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiektipe"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7baee9b..c7a472b 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"ሁነታ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ከፍተኛ ትክክለኝነት"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"የባትሪ ኃይል መቆጠብ"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"የመሣሪያ ዳሳሾች"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"አካባቢ ጠፍቷል"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"የቅርብ ጊዜ የአካባቢ ጥያቄዎች"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ምንም መተግበሪያዎች በቅርብ ጊዜ አካባቢ አልጠየቁም"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ከፍተኛ የራም አጠቃቀም"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"የሚያሄድበት ጊዜ ርዝመት"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"አገልግሎቶች"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"የቆይታ ጊዜ"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ሰዓታት"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ሰዓታት"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ሰዓታት"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 ቀን"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"ስርዓት አሳይ"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"ዩ ኤስ ኤስ ይጠቀሙ"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"የስታቲስቲክስ አይነት"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 2c1c8dc..d47281e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"الوضع"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"دقة عالية"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"توفير شحن البطارية"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"أجهزة استشعار الجهاز"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"الموقع قيد الإيقاف"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"طلبات الموقع الأخيرة"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"لم تطلب أي تطبيقات الوصول إلى الموقع مؤخرًا"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"الحد الأقصى لاستخدام ذاكرة الوصول العشوائي"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"مدة التشغيل"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"الخدمات"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"المدة"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ساعات"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ساعات"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ساعة"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"يوم واحد"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"إظهار النظام"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"‏استخدام Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"نوع الإحصائيات"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index f8d49f2..3b5aac4 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1639,6 +1639,16 @@
     <skip />
     <!-- no translation found for services_subtitle (4296402367067266425) -->
     <skip />
+    <!-- no translation found for menu_proc_stats_duration (2323483592994720196) -->
+    <skip />
+    <!-- no translation found for menu_duration_3h (4714866438374738385) -->
+    <skip />
+    <!-- no translation found for menu_duration_6h (1940846763432184132) -->
+    <skip />
+    <!-- no translation found for menu_duration_12h (7890465404584356294) -->
+    <skip />
+    <!-- no translation found for menu_duration_1d (3393631127622285458) -->
+    <skip />
     <!-- no translation found for menu_show_system (8864603400415567635) -->
     <skip />
     <!-- no translation found for menu_use_uss (467765290771543089) -->
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index cdaa222..637f57c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Висока точност"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Запазване на батерията"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Сензори на устройството"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Местоположението е изключено"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Скорошни заявки за местопол."</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Нито едно приложение не е заявило достъп до местоположението наскоро"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Максимално използване на RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Време на използване"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Услуги"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Продължителност"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 часа"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 часа"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 часа"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 ден"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Показване на системните процеси"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Използване на USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистически данни"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ff9fb34..55d917d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisió"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Estalvi de bateria"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensors del dispositiu"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Ubicació desactivada"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Sol·licituds d\'ubicació recents"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Cap aplicació ha sol·licitat la ubicació recentment"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Ús màxim de RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Temps d\'execució"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Serveis"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durada"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 hores"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 hores"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 hores"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dia"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostra el sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Fes servir Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipus d\'estadístiques"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d1454fe..aa15250d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Režim"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Vysoká přesnost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Úspora baterie"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Senzory zařízení"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Poloha vypnuta"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedávné žádosti o určení polohy"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"V poslední době žádné aplikace o polohu nepožádaly."</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Minimální využití paměti RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Doba běhu"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Služby"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Doba trvání"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 hodiny"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 hodin"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 hodin"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 den"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Zobrazit systém"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Použít USS (jedinečnou velikost sady)"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Typ statistik"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 042e8f6..12bec9c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Tilstand"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Høj nøjagtighed"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batteribesparelse"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Enhedssensorer"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Placering fra"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Seneste placeringsanmodninger"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ingen apps har anmodet om placering for nylig"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimalt RAM-forbrug"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Visningstid"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Tjenester"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Varighed"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 timer"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 timer"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 timer"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Vis systemet"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Brug Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiktype"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e05f8ee..cc5efef 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -267,7 +267,7 @@
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proxy-Einstellungen"</string>
     <string name="cancel" msgid="6859253417269739139">"Abbrechen"</string>
     <string name="settings_label" msgid="1626402585530130914">"Einstellungen"</string>
-    <string name="settings_label_launcher" msgid="8344735489639482340">"Einstellungen"</string>
+    <string name="settings_label_launcher" msgid="8344735489639482340">"Einstellung"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Einstellungsverknüpfung"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flugmodus"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Mehr..."</string>
@@ -1002,8 +1002,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hohe Genauigkeit"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Stromsparfunktion"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Gerätesensoren"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Standort aus"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Letzte Standortanfragen"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Keine App hat kürzlich den Standort abgefragt."</string>
@@ -1536,6 +1535,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximale RAM-Nutzung"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Laufzeit"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Dienste"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Dauer"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 Stunden"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 Stunden"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 Stunden"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 Tag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Systemprozesse anzeigen"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"USS verwenden"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiktyp"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 04860ec..1671355 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Λειτουργία"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Υψηλή ακρίβεια"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Εξοικονόμησης μπαταρίας"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Αισθητήρες συσκευής"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Τοποθεσία απενεργοποιημένη"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Πρόσφατα αιτήματα τοποθεσίας"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Καμία εφαρμογή δεν ζήτησε πρόσφατα την τοποθεσία σας."</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Μέγιστη χρήση RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Χρόνος εκτέλεσης"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Υπηρεσίες"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Διάρκεια"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ώρες"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ώρες"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ώρες"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 ημέρα"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Εμφάνιση συστήματος"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Χρήση Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Τύπος στατιστικών στοιχείων"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6f0c0d9..3ec33ca 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"High accuracy"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Battery saving"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Device sensors"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Location off"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximum RAM use"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Running time"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duration"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 hours"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 hours"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 hours"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 day"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Show system"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Use Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Stats type"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 6f0c0d9..3ec33ca 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"High accuracy"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Battery saving"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Device sensors"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Location off"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recent location requests"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"No apps have requested location recently"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximum RAM use"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Running time"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duration"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 hours"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 hours"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 hours"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 day"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Show system"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Use Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Stats type"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 0f990df..f8ad616 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Precisión alta"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ahorro de batería"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensores del dispositivo"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Ubicación desactivada"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicit. ubicación recientes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ninguna aplicación solicitó la ubicación recientemente."</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Uso máximo de RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Tiempo de ejecución"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servicios"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duración"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 horas"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 horas"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 día"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Usar USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estadística"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 48521a8..1eca175 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisión"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ahorro de batería"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensores del dispositivo"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Ubicacación desactivada"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitudes de ubicación recientes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ninguna aplicación ha solicitado la ubicación recientemente"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Uso de RAM máximo"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Duración"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servicios"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duración"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 horas"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 horas"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 día"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Usar USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estadísticas"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index e855563..df5963e 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Režiim"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Väga täpne"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Aku säästmine"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Seadme andurid"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Asukoht on väljas"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Hiljutised asukohapäringud"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ükski rakendus pole hiljuti asukohateavet küsinud"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM-i maksimaalne kasutus"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Tööaeg"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Teenused"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Kestus"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 tundi"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 tundi"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 tundi"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 päev"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Süsteemi kuvamine"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"USS-i kasutamine"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistika tüüp"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 428a421..a85801a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"حالت"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"دقت زیاد"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"صرفه‌جویی در باتری"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"حسگرهای دستگاه"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"موقعیت مکانی خاموش"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"درخواست‌های اخیر موقعیت مکانی"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"به تازگی هیچ برنامه‌ای موقعیت مکانی را درخواست نکرده است"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"‏حداکثر استفاده از RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"مدت اجرا"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"خدمات"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"مدت"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"۳ ساعت"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"۶ ساعت"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"۱۲ ساعت"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"۱ روز"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"نمایش سیستم"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"‏استفاده از Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"نوع آمار"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 7de6798..07bb140 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -182,8 +182,7 @@
     <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"Käynnistä <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Tili:"</string>
-    <!-- no translation found for proxy_settings_title (9049437837600320881) -->
-    <skip />
+    <string name="proxy_settings_title" msgid="9049437837600320881">"Välityspalvelin"</string>
     <string name="proxy_clear_text" msgid="5555400754952012657">"Tyhjennä"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Välityspalvelimen portti"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Ohita välityspalvelin seuraavasti:"</string>
@@ -990,14 +989,10 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Jaettu internetyhteys katkaistaan laitteesta <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ohje"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiiliverkot"</string>
-    <!-- no translation found for manage_mobile_plan_title (7630170375010107744) -->
-    <skip />
-    <!-- no translation found for sms_application_title (6134351177937015839) -->
-    <skip />
-    <!-- no translation found for sms_change_default_dialog_title (1958688831875804286) -->
-    <skip />
-    <!-- no translation found for sms_change_default_dialog_text (8183679628429465443) -->
-    <skip />
+    <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiilisopimus"</string>
+    <string name="sms_application_title" msgid="6134351177937015839">"Oletusarvoinen tekstiviestisovellus"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vaihdetaanko tekstiviestisovellus?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"Valitaanko tekstiviestisovellukseksi <xliff:g id="NEW_APP">%s</xliff:g> sovelluksen <xliff:g id="CURRENT_APP">%s</xliff:g> sijaan?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Tuntematon SIM-kortin operaattori"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Ei tunnettua käyttäjien hallintasivustoa: %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Aseta SIM-kortti ja käynnistä uudelleen"</string>
@@ -1006,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Tila"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Suuri tarkkuus"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Virransäästötila"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Laitteen anturit"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Sijainti ei käytössä"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Viimeisimmät sijaintipyynnöt"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Mikään sovellus ei ole pyytänyt sijaintia äskettäin"</string>
@@ -1553,6 +1547,11 @@
     <skip />
     <string name="process_stats_run_time" msgid="6520628955709369115">"Käyttöaika"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Palvelut"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Kesto"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 tuntia"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 tuntia"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 tuntia"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 päivä"</string>
     <!-- no translation found for menu_show_system (8864603400415567635) -->
     <skip />
     <!-- no translation found for menu_use_uss (467765290771543089) -->
@@ -1772,8 +1771,7 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Manuaalinen synkronointi epäonnistui"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Tämän kohteen synkronointi on tällä hetkellä pois käytöstä. Voit muuttaa asetuksia ottamalla taustatiedot ja automaattisen synkronoinnin väliaikaisesti käyttöön."</string>
-    <!-- no translation found for wimax_settings (2655139497028469039) -->
-    <skip />
+    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC -osoite"</string>
     <string name="enter_password" msgid="4131758584074246224">"Poista tallennustilan salaus antamalla salasana."</string>
     <string name="try_again" msgid="4272075051293936921">"Yritä uudelleen."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ea2943b..16eba5f 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Haute précision"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économiser la pile"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Capteurs de l\'appareil"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Localisation désactivée"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Demandes localisation récentes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Aucune application n\'a récemment demandé l\'accès à votre position"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Taux d\'utilisation maximal de la mémoire vive"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Durée d\'exécution"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durée"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 heures"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 heures"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 heures"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 jour"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Afficher le système"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utiliser USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Type de statistiques"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8f71702..94466f6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Haute précision"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économie de batterie"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Capteurs de l\'appareil"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Localisation désactivée"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Demandes localisation récentes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Aucune demande d\'accès à votre position n\'a récemment été envoyée pour une application."</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Taux d\'utilisation maximal de la RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Durée d\'exécution"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durée"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 heures"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 heures"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 heures"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 jour"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Afficher les processus système"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utiliser l\'USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Type de statistiques"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4bc5211..011f542 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"मोड"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च सटीकता"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"बैटरी की बचत"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"उपकरण के सेंसर"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"स्थान बंद"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"हाल ही के स्थान अनुरोध"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"किसी भी एप्स ने हाल ही में स्थान का अनुरोध नहीं किया है"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"अधिकतम RAM उपयोग"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"रन टाइम"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"सेवाएं"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"अवधि"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 घंटे"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 घंटे"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 घंटे"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 दिन"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"सिस्टम दिखाएं"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss का उपयोग करें"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"आंकड़ों का प्रकार"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c50b1f9..0d5744b 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Način"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka preciznost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Štednja baterije"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Senzori uređaja"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Lokacija je isključena"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedavni zahtjevi za lokaciju"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nijedna aplikacija nije nedavno zatražila lokaciju"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimalna upotreba RAM-a"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Vrijeme izvođenja"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Usluge"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trajanje"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 sata"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 sati"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 sati"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dan"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Prikaži sustav"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Upotrijebi USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Vrsta statističkih podataka"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c73a37c..eec4b66 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mód"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Nagyon pontos"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Energiatakarékos"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Az eszköz érzékelői"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Hely kikapcsolva"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Legutóbbi helylekérdezések"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Az utóbbi időben egy alkalmazás sem kért le helyadatokat."</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximális RAM-használat"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Futási idő"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Szolgáltatások"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Időtartam"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 óra"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 óra"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 óra"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 nap"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Rendszerfolyamatok megjelenítése"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Egyedi készletméret használata"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statisztika típusa"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 34b51c7..42aedb0 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Ռեժիմ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Բարձր ճշգրտություն"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Մարտկոցի տնտեսում"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Սարքի սենսորները"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Տեղադրությունն անջատված"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Տեղանքի վերջին հարցումները"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Որևէ ծրագիր տեղադրության հարցում չի կատարել վերջերս"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM-ի առավելագույն օգտագործում"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Աշխատաժամանակ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Ծառայություններ"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Տևողությունը"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ժամ"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ժամ"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ժամ"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 օր"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Ցույց տալ համակարգը"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Օգտագործել Uss-ը"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Վիճակագրության տեսակը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 1959bac..fae0ddb 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Akurasi tinggi"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Hemat baterai"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensor perangkat"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Lokasi mati"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Permintaan lokasi terbaru"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Tidak ada aplikasi yang meminta lokasi baru-baru ini"</string>
@@ -1077,7 +1076,7 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Harus membuat pola untuk membuka layar"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Perlihatkan pola"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Bergetar saat disentuh"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Tombol daya mengunci dengan seketika"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Tombol daya langsung kunci"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Setel pola pembuka kunci"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Ubah pola pembuka kunci"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cara membuat pola pembuka kunci"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Penggunaan RAM maksimum"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Waktu berjalan"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Layanan"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durasi"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 jam"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 jam"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 jam"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 hari"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Tampilkan sistem"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Gunakan Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Jenis statistik"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index dc1f462..eb93c6e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modalità"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisione"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Risparmio della batteria"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensori dispositivo"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Geolocalizzazione non attiva"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Richieste di posizione recenti"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nessuna applicazione ha richiesto la posizione di recente"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Utilizzo massimo della RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Run-time"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servizi"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durata"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ore"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ore"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ore"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 giorno"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostra sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utilizza Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo di statistiche"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b8b7029..aeb9237 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"מצב"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"רמת דיוק גבוהה"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"חיסכון בעוצמת סוללה"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"חיישני המכשיר"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"מיקום כבוי"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"בקשות של מיקומים אחרונים"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"אין אפליקציות שביקשו מיקום לאחרונה"</string>
@@ -1142,8 +1141,8 @@
     <string name="filter_dlg_title" msgid="8693024463731076091">"בחר אפשרויות סינון"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"הכל"</string>
     <string name="filter_apps_disabled" msgid="5364447573326472890">"מנוטרל"</string>
-    <string name="filter_apps_third_party" msgid="7786348047690140979">"ההורדה בוצעה"</string>
-    <string name="filter_apps_running" msgid="7767071454371350486">"פועל"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"הורדו"</string>
+    <string name="filter_apps_running" msgid="7767071454371350486">"פועלות"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"‏אחסון USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"‏בכרטיס SD"</string>
     <string name="disabled" msgid="9206776641295849915">"מושבת"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"‏שימוש מרבי ב-RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"משך ההפעלה"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"שירותים"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"משך זמן"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 שעות"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 שעות"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 שעות"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"יום אחד"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"הצג מערכת"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"‏השתמש ב-Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"סוג נתונים סטטיסטיים"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 88707cb..6ea84e4 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -645,7 +645,7 @@
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"無視してスキップ"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"スキップしない"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"警告: 追加のデータ通信料が発生する可能性があります。\n\nタブレットのセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
-    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告: 追加のデータ通信料が発生する可能性があります。\n\nタブレットのセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告: 追加のデータ通信料が発生する可能性があります。\n\n端末のセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"警告: インターネットに接続しないと、タブレットはソフトウェアが最新であることを確認できません。"</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"警告: インターネットに接続しないと、携帯端末はソフトウェアが最新であることを確認できません。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"タブレットからこのWi-Fiネットワークに接続できませんでした。"</string>
@@ -1003,8 +1003,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"モード"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"バッテリー節約"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"端末センサー"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"現在地OFF"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近の位置情報リクエスト"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"位置情報を最近リクエストしたアプリはありません"</string>
@@ -1537,6 +1536,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"最大RAM使用量"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"実行時間"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"サービス"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"期間"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3時間"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6時間"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12時間"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1日"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"システムを表示"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Ussを使用"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"統計タイプ"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index ed0dc12..f7ca1d0 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"რეჟიმი"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"მაღალი სიზუსტე"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ბატარეის დაზოგვა"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"მოწყობილობის სენსორები"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"მდებარეობა გამორთულია"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"მდებარეობის ბოლო მოთხოვნები"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ბოლო დროს აპებს მდებარეობის ინფორმაცია არ მოუთხოვია"</string>
@@ -1429,7 +1428,7 @@
     <string name="disable_service_message" msgid="2012273739481042318">"ღილაკზე OK შეხებით <xliff:g id="SERVICE">%1$s</xliff:g> გაჩერდება."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"სერვისები დაყენებული არ არის"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"გჭირდებათ ეკრანის წამკითხავი?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack უზრუნველყოფს გახმოვანებულ უკუკავშირს უსინათლო და დაქვეითებული მხედველობის მქონე მომხმარებლისთვის. გსურთ მისი უფასო ინსტალაცია Android Market-იდან?"</string>
+    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack უზრუნველყოფს გახმოვანებულ უკუკავშირს უსინათლო და მცირე მხედველობის მომხმარებლისთვის. გსურთ მისი უფასო ინსტალაცია Android Market-იდან?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"აღწერა არ არის მოწოდებული."</string>
     <string name="settings_button" msgid="3006713718908152930">"პარამეტრები"</string>
     <string name="print_settings" msgid="4742428530112487843">"ბეჭდვა"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM-ის მაქსიმალური გამოყენება"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"გაშვების დრო"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"სერვისები"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ხანგრძლივობა"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 საათი"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 საათი"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 საათი"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 დღე"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"სისტემის ჩვენება"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss-ის გამოყენება"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"სტატისტიკის ტიპი"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 2273ad4..b9a94db 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"របៀប"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ភាព​ត្រឹមត្រូវ​ខ្ពស់"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ការ​សន្សំ​ថ្ម"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"ឧបករណ៍​ចាប់​សញ្ញា​របស់​ឧបករណ៍"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"បិទទីតាំង"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"សំណើ​ទីតាំង​ថ្មី"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"បច្ចុប្បន្ន​គ្មាន​កម្មវិធី​បាន​ស្នើ​ទីតាំង"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ការ​ប្រើ​អង្គ​ចងចាំ​អតិបរមា"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"ពេល​ដំណើរការ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"សេវាកម្ម"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"រយៈពេល"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"៣ ម៉ោង"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"៦ ម៉ោង"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"១២ ម៉ោង"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"១ ថ្ងៃ"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"បង្ហាញ​ប្រព័ន្ធ"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"ប្រើ Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"ប្រភេទ​ស្ថានភាព"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e738473..11368d0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"모드"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"높은 정확성"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"배터리 절약"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"기기 센서"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"위치 정보 사용 안함"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"최근 위치 요청"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"최근에 위치 정보를 요청한 앱이 없습니다."</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"최대 RAM 사용"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"재생 시간"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"서비스"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"기간"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3시간"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6시간"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12시간"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1일"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"시스템 표시"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss(Unique Set Size) 사용"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"통계 유형"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 7c1c4ed..ca20618 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"ໂຫມດ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ຄວາມຖືກຕ້ອງສູງ"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ປະຢັດໄຟ"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"ອຸປະກອນເຊັນເຊີ"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"ຂໍ້ມູນສະຖານທີ່ແມ່ນປິດຢູ່"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"ການຮ້ອງຂໍຂໍ້ມູນສະຖານທີ່ຫຼ້າສຸດ"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ຫຼ້າສຸດນີ້ບໍ່ມີແອັບຯໃດເອີ້ນໃຊ້ຂໍ້ມູນຕຳແໜ່ງ"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"ການນຳໃຊ້ RAM ສູງສຸດ"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"ເວລາເຮັດວຽກ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"ບໍລິການ"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ໄລຍະເວລາ"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ຊົ່ວໂມງ"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ຊົ່ວໂມງ"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ຊົ່ວໂມງ"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 ມື້"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"ສະແດງລະບົບ"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"ໃຊ້ USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"ປະເພດສະຖິຕິ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7f25145..21685a7 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Režimas"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Itin tikslu"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Akumuliatoriaus tausojimas"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Įrenginio jutikliai"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Vietovė išjungta"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Pastarosios vietovės užklausos"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nė viena programa pastaruoju metu nepateikė užklausų dėl vietovės"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimalus laisvosios prieigos atminties naudojimas"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Rodymo laikas"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Paslaugos"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trukmė"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 val."</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 val."</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 val."</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 d."</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Rodyti sistemos procesus"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Naudoti USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistikos tipas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9935fad..f968c07 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Režīms"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Augsta precizitāte"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Akumulatora jaudas taupīšana"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Ierīces sensori"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Atrašanās vieta izslēgta"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Neseni vietu pieprasījumi"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Pēdējā laikā nevienā lietotnē nav pieprasīta atrašanās vietas informācija."</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimālais RAM lietojums"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Ilgums"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Pakalpojumi"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Ilgums"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 stundas"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 stundas"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 stundas"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 diena"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Rādīt sistēmas procesus"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Lietot unikālo kopas lielumu"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistikas veids"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index ab8b57f..93a1683 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Горим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Өндөр нарийвчлалтай"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Батерей хэмнэх"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Төхөөрөмжийн мэдрэгчид"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Байршил идэвхгүй"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Саяхны байршлын хүсэлтүүд"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Саяхан байршлын мэдээлэл хүссэн апп байхгүй"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Хамгийн их RAM ашиглалт"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Ажилласан хугацаа"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Үйлчилгээнүүд"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Үргэлжлэх хугацаа"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 цаг"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 цаг"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 цаг"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 өдөр"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Системийг харуулах"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss ашиглах"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Статистикийн төрөл"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index c6d504b..5620905 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Kejituan tinggi"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Penjimatan bateri"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Penderia peranti"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Lokasi dimatikan"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Permintaan lokasi terbaharu"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Tiada aplikasi yang telah meminta lokasi baru-baru ini"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Penggunaan RAM maksimum"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Masa berjalan"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Perkhidmatan"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Tempoh"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 jam"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 jam"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 jam"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 hari"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Tunjukkan sistem"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Gunakan Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Jenis statistik"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6b99210..7d33254 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Høy nøyaktighet"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparing"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Enhetssensorer"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Posisjon deaktivert"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nylige stedsforespørsler"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ingen apper har bedt om posisjonen din i det siste"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimal RAM-bruk"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Kjøringstid"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Tjenester"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Varighet"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 timer"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 timer"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 timer"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"Én dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Vis system"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Bruk Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistikktype"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 30de39f..63b3d21 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Grote nauwkeurigheid"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Accubesparing"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Apparaatsensoren"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Locatie uit"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recente locatieverzoeken"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Er zijn geen apps die uw locatie onlangs hebben aangevraagd"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximaal RAM-gebruik"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Uitvoeringstijd"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duur"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 uur"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 uur"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 uur"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Systeem weergeven"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"USS gebruiken"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiektype"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 49171d9..5508315 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Tryb lokalizacji"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Wysoka dokładność"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Oszczędzanie baterii"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Czujniki urządzenia"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Obsługa lokalizacji wyłączona"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Ostatnie prośby o lokalizację"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Żadne aplikacje nie poprosiły ostatnio o lokalizację"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksymalne użycie pamięci RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Czas pracy"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Usługi"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Czas trwania"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 godziny"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 godzin"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 godzin"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dzień"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Pokaż systemowe"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Użyj USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Typ statystyk"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index dda5e09..0c7856e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisão"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Poupança de bateria"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensores do dispositivo"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Localização desativada"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Pedidos de localização recentes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nenhuma aplicação solicitou a localização recentemente"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Utilização máxima da RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Tempo de execução"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Serviços"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duração"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 horas"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 horas"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dia"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utilizar Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estatísticas"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 50377fc..c274afd 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Modo"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Alta precisão"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economia de bateria"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensores do dispositivo"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Local desativado"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicit. de localiz. recentes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nenhum aplicativo solicitou a localização recentemente"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Uso máximo de RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Tempo de execução"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Serviços"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duração"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 horas"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 horas"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dia"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Mostrar sistema"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Usar Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipo de estatísticas"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index c8dce7f..dc67360 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -2413,6 +2413,16 @@
     <skip />
     <!-- no translation found for services_subtitle (4296402367067266425) -->
     <skip />
+    <!-- no translation found for menu_proc_stats_duration (2323483592994720196) -->
+    <skip />
+    <!-- no translation found for menu_duration_3h (4714866438374738385) -->
+    <skip />
+    <!-- no translation found for menu_duration_6h (1940846763432184132) -->
+    <skip />
+    <!-- no translation found for menu_duration_12h (7890465404584356294) -->
+    <skip />
+    <!-- no translation found for menu_duration_1d (3393631127622285458) -->
+    <skip />
     <!-- no translation found for menu_show_system (8864603400415567635) -->
     <skip />
     <!-- no translation found for menu_use_uss (467765290771543089) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 8c00e6f..1e8938a 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Precizie ridicată"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Economisirea bateriei"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Senzorii dispozitivului"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Locație dezactivată"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitări recente de localiz."</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nicio aplicație nu a solicitat locația recent"</string>
@@ -1536,6 +1535,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Utilizare maximă RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Durată de rulare"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Servicii"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durată"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ore"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ore"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ore"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"O zi"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Afișați sistemul"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Utilizați Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Tipul de statistici"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5a65f40..379f1ea 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Высокая точность"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Сокращение энергопотребления"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Датчики устройства"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Отправка геоданных отключена"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Последние запросы места"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"В последнее время приложения не запрашивали геоданные"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Использование оперативной памяти (максимальное значение)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Время работы"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Сервисы"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Период"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ч."</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ч."</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ч."</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 д."</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Системные процессы"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Использовать USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистических данных"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 362a23a..96d94e4 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Režim"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Vysoká presnosť"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Šetrenie batérie"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Zariadenie sníma"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Poloha je vypnutá"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedávne žiadosti o polohu"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"V poslednom čase žiadne aplikácie o polohu nepožiadali"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximálne využitie pamäte RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Spustené"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Služby"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trvanie"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 hodiny"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 hodín"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 hodín"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 deň"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Zobraziť systém"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Použiť Uss (jedinečnú veľkosť súpravy)"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Typ štatistík"</string>
@@ -1809,8 +1813,8 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limit procesov na pozadí"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Zobraziť všetky ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Zobraziť dialóg Aplikácia neodpovedá pre aplikácie na pozadí"</string>
-    <string name="experimental_webview" msgid="4492200819033780927">"Použiť skúšob. zobr. webu"</string>
-    <string name="experimental_webview_summary" msgid="3431620080869482446">"Aplikácie použijú najnov. zobr. webu (beta)"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Experimentálne WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Aplikácie použijú najnovšie WebView (beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Využitie dát"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus počítania dát"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Dátové služby pri roamingu"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e09d47b..7b85551 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Način"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka natančnost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Varč. z energijo akumulatorja"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Tipala naprave"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Lokacija je izklopljena"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedavne zahteve za lokacijo"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"V zadnjem času ni nobena aplikacija zahtevala lokacijskih podatkov"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Največja uporaba RAM-a"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Trajanje izvajanja"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Storitve"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trajanje"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ure"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ur"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ur"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dan"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Prikaz sistemskih"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uporaba USS-ja"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Vrsta statističnih podatkov"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index db75fbd..5e5e560 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Велика прецизност"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Уштеда батерије"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Сензори за уређаје"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Локација је искључена"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Недавни захтеви за локацију"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ниједна апликација није скоро тражила локацију"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Максимално коришћење RAM-а"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Трајање"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Услуге"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Трајање"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 сата"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 сати"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 сати"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 дан"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Прикажи систем"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Користи јединствену величину скупа"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистичких података"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 767330b..a902f36 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Läge"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hög exakthet"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterisparfunktion"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Enhetssensorer"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Plats av"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nya platsbegäranden"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Inga appar har begärt uppgifter om plats nyligen"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximal RAM-användning"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Speltid"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Tjänster"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Längd"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 timmar"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 timmar"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 timmar"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Visa system"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Använd USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Statistiktyp"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index fe4590c..0b580e1 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -813,7 +813,7 @@
     <string name="status_data_state" msgid="5503181397066522950">"Hali ya mtandao wa simu ya mkononi"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Hali ya huduma"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Nguvu za mawimbi"</string>
-    <string name="status_roaming" msgid="2638800467430913403">"Urandaji"</string>
+    <string name="status_roaming" msgid="2638800467430913403">"Uko nje ya mtandao wako wa kawaida"</string>
     <string name="status_operator" msgid="2274875196954742087">"Mtandao"</string>
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Anwani ya Wi-Fi ya MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Anwani ya Bluetooth"</string>
@@ -995,8 +995,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Hali"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Usahihi wa hali ya juu"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Inayookoa betri"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Sensa za Kifaa"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Eneo limezimwa"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Maombi ya hivi karibuni ya kutambua eneo"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Hakuna programu iliyotaka kutambua eneo hivi karibuni"</string>
@@ -1147,8 +1146,8 @@
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Hifadhi ya USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Hifadhi ya kadi ya SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Kiwango cha kukadiria upya"</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Futa data za programu?"</string>
-    <string name="clear_data_dlg_text" msgid="8847257251846779938">"Data hizi zote za programu zitafutwa kabisa. Hii inajumuisha faili, mipangilio, akaunti, hifadhidata zote na kuendelea."</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Ungependa kufuta data ya programu?"</string>
+    <string name="clear_data_dlg_text" msgid="8847257251846779938">"Data hii yote ya programu itafutwa kabisa. Hii inajumuisha faili, mipangilio, akaunti, hifadhidata zote na nyingineyo."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Sawa"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Ghairi"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1529,6 +1528,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Upeo wa matumizi ya RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Muda wa kuendesha"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Huduma"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Muda"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"Saa 3"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"Saa 6"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"Saa 12"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"Siku 1"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Onyesha mfumo"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Tumia USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Aina ya takwimu"</string>
@@ -1664,7 +1668,7 @@
     <string name="device_admin_add_title" msgid="7705551449705676363">"Msimamizi wa kifaa"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Kuwasha kisimamizi kutaruhusu programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> kufanya mambo yafuatayo:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Msimamizi huyu ni amilifu na anaruhusu programu <xliff:g id="APP_NAME">%1$s</xliff:g> kutenda uendeshi ifuatayo:"</string>
-    <string name="untitled_apn" msgid="1230060359198685513">"Hakuna Kichwa"</string>
+    <string name="untitled_apn" msgid="1230060359198685513">"Haina Kichwa"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Kawaida"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Arifa"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Mlio na mtetemo wa simu"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index dc221f8..4a37a6a 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"โหมด"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ความแม่นยำสูง"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ประหยัดแบตเตอรี่"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"เซ็นเซอร์ของอุปกรณ์"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"ปิดตำแหน่ง"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"คำขอตำแหน่งล่าสุด"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ไม่มีแอปใดทำการขอตำแหน่งเมื่อเร็วๆ นี้"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"การใช้ RAM สูงสุด"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"เวลาที่แสดง"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"บริการ"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ระยะเวลา"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ชั่วโมง"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 ชั่วโมง"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 ชั่วโมง"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 วัน"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"แสดงระบบ"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"ใช้ Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"ประเภทสถิติ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index e3af5ba..21e2303 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Napakatumpak"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Pagtitipid ng baterya"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Mga sensor ng device"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Naka-off ang lokasyon"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Mga bagong hiling sa lokasyon"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Walang apps ang humiling ng lokasyon kamakailan"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maximum na paggamit ng RAM"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Oras ng paggana"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Mga Serbisyo"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Tagal"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 oras"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 na oras"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 oras"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 araw"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Ipakita ang system"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Gamitin ang Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Uri ng mga stats"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d6a31bf..8970407 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Mod"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Yüksek doğruluk"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Pil tasarrufu"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Cihaz sensörleri"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Konum bilgisi kapalı"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Son konum istekleri"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Yakın zamanda hiçbir uygulama konum bilgisi isteğinde bulunmadı"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Maksimum RAM kullanımı"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Çalışma süresi"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Hizmetler"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Süre"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 saat"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 saat"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 saat"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 gün"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Sistem işlemlerini göster"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss\'yi (Benzersiz Grup Büyüklüğü) kullan"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"İstatistik türü"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5a5a59f..f837834 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Висока точність"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Заощадження заряду акумулятора"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Датчики пристрою"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Надсилання геоданих вимкнено"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Останні запити геоданих"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Жодна програма не запитувала місцезнаходження останнім часом"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Макс. використання оперативної пам’яті"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Час виконання"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Служби"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Тривалість"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 години"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 годин"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 годин"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 день"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Показувати систему"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Використовувати USS (Unique Set Size)"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Тип статистики"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 99ebc9c..0a51450 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Chế độ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Độ chính xác cao"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Tiết kiệm pin"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Cảm biến thiết bị"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Tắt vị trí"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Yêu cầu vị trí gần đây"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Không có ứng dụng nào yêu cầu vị trí gần đây"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Sử dụng RAM tối đa"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Thời gian chạy"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Dịch vụ"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Thời lượng"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 giờ"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 giờ"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 giờ"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 ngày"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Hiển thị hệ thống"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Sử dụng Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Kiểu trạng thái"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 965ac61..eba5c95 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -992,7 +992,7 @@
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"手机套餐"</string>
     <string name="sms_application_title" msgid="6134351177937015839">"默认短信应用"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"要更改短信应用吗?"</string>
-    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"使用“<xliff:g id="NEW_APP">%s</xliff:g>”(取代“<xliff:g id="CURRENT_APP">%s</xliff:g>”)作为您的短信应用?"</string>
+    <string name="sms_change_default_dialog_text" msgid="8183679628429465443">"要使用“<xliff:g id="NEW_APP">%s</xliff:g>”(取代“<xliff:g id="CURRENT_APP">%s</xliff:g>”)作为您的短信应用吗?"</string>
     <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"未知的 SIM 运营商"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s没有已知的配置网站"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"请插入 SIM 卡,然后重新启动"</string>
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"准确度高"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"耗电量低"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"设备传感器"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"位置信息:关闭"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的位置信息请求"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"最近没有任何应用申请使用位置信息"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM 最高使用率"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"运行时间"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"服务"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"时间长度"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3小时"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6小时"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12小时"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1天"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"显示系统"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"使用 USS"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"统计信息类型"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 1bd6c03..634b1c1 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精確度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"節約電池用量"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"裝置感應器"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"位置關閉"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的定位要求"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"最近沒有應用程式要求存取位置資料"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM 最高使用量"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"執行時間"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"服務"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"持續時間"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 小時"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 小時"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 小時"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 天"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"顯示系統"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"使用 Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"統計資料類型"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index af42545..8c5eae4 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1001,8 +1001,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"模式"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"高精確度"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"節約耗電量"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"裝置感應器"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"定位服務已關閉"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"最近的定位要求"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"最近沒有應用程式要求存取位置資訊"</string>
@@ -1535,6 +1534,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"RAM 最高使用量"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"執行時間"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"服務"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"時間長度"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 小時"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 小時"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 小時"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 天"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"顯示系統"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"使用 Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"統計資料類型"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 187da87..041f2df 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1002,8 +1002,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"Imodi"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Ukulunga okuphezulu"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ukulondolozwa kwebhetri"</string>
-    <!-- no translation found for location_mode_sensors_only_title (4884675860035486077) -->
-    <skip />
+    <string name="location_mode_sensors_only_title" msgid="4884675860035486077">"Izinzwa zedivayisi"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Indawo ivaliwe"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Izicelo zendawo zakamuva"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Azikho izinhlelo zokusebenza ezicele indawo kamuva nje"</string>
@@ -1542,6 +1541,11 @@
     <string name="process_stats_max_ram_use" msgid="3273876448926689261">"Ukusetshenziswa kwe-RAM okukhulu"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"Isikhathi sokuqalisa"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"Amasevisi"</string>
+    <string name="menu_proc_stats_duration" msgid="2323483592994720196">"Ubude besikhathi"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 amahora"</string>
+    <string name="menu_duration_6h" msgid="1940846763432184132">"6 amahora"</string>
+    <string name="menu_duration_12h" msgid="7890465404584356294">"12 amahora"</string>
+    <string name="menu_duration_1d" msgid="3393631127622285458">"1 usuku"</string>
     <string name="menu_show_system" msgid="8864603400415567635">"Bonisa isistimu"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Sebenzisa i-Uss"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"Uhlobo lwezibalo"</string>
diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml
index 3d12d7c..f290f38 100644
--- a/res/values/donottranslate.xml
+++ b/res/values/donottranslate.xml
@@ -37,5 +37,4 @@
     <string name="download_print_service_query">market://search?q=print service</string>
     <!-- Default query string to search for a NFC payment service. -->
     <string name="download_nfc_payment_service_query">market://search?q=nfc payment</string>
-
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1af1581..3c45bbc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3453,11 +3453,32 @@
     <!-- Title for the prompt if no printers are available and the system is searching for such. [CHAR LIMIT=50] -->
     <string name="print_searching_for_printers">Searching for printers</string>
 
+    <!-- Title for the prompt if no printers are available because the print service is disabled. [CHAR LIMIT=50] -->
+    <string name="print_service_disabled">Service disabled</string>
+
     <!-- Title for the menu item to open the print jobs screen. [CHAR LIMIT=25] -->
     <string name="print_print_jobs">Print jobs</string>
 
-    <!-- Title for the print jobs screen. [CHAR LIMIT=25] -->
-    <string name="print_active_print_jobs">Active print jobs</string>
+    <!-- Title for the print job settings screen. [CHAR LIMIT=25] -->
+    <string name="print_print_job">Print job</string>
+
+    <!-- Title for the button to restart a print job. [CHAR LIMIT=25] -->
+    <string name="print_restart">Restart</string>
+
+    <!-- Title for the button to cancel a print job. [CHAR LIMIT=25] -->
+    <string name="print_cancel">Cancel</string>
+
+    <!-- Template for the summary of a print job. [CHAR LIMIT=25] -->
+    <string name="print_job_summary"><xliff:g id="printer">%1$s</xliff:g>\n<xliff:g id="time">%2$s</xliff:g></string>
+
+    <!-- Template for the label of the state for a ongoing print job. [CHAR LIMIT=25] -->
+    <string name="print_printing_state_title_template">Printing <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+
+    <!-- Template for the label of the state for a failed print job. [CHAR LIMIT=25] -->
+    <string name="print_failed_state_title_template">Printer error <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+
+    <!-- Template for the label of the state for a blocked print job. [CHAR LIMIT=25] -->
+    <string name="print_blocked_state_title_template">Printer blocked <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
 
     <!-- App Fuel Gauge strings -->
     <skip />
diff --git a/res/xml/print_job_settings.xml b/res/xml/print_job_settings.xml
new file mode 100644
index 0000000..a78cec1
--- /dev/null
+++ b/res/xml/print_job_settings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/print_print_job">
+
+    <Preference
+            android:key="print_job_preference">
+    </Preference>
+
+    <Preference
+            android:key="print_job_message_preference"
+            android:layout="@layout/print_job_summary">
+    </Preference>
+
+</PreferenceScreen>
diff --git a/res/xml/print_settings.xml b/res/xml/print_settings.xml
index dc31968..8a29563 100644
--- a/res/xml/print_settings.xml
+++ b/res/xml/print_settings.xml
@@ -17,4 +17,17 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
         android:title="@string/print_settings_title">
+
+    <PreferenceCategory
+            android:key="print_jobs_category"
+            android:title="@string/print_print_jobs"
+            android:order="0">
+    </PreferenceCategory>
+
+    <PreferenceCategory
+            android:key="print_services_category"
+            android:title="@string/print_settings_title"
+            android:order="1">
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 017adfa..49de366 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -60,6 +60,9 @@
         return false;
     }
 
+    public static class InternalActivity extends ChooseLockGeneric {
+    }
+
     public static class ChooseLockGenericFragment extends SettingsPreferenceFragment {
         private static final int MIN_PASSWORD_LENGTH = 4;
         private static final String KEY_UNLOCK_BACKUP_INFO = "unlock_backup_info";
@@ -97,7 +100,9 @@
             // Defaults to needing to confirm credentials
             final boolean confirmCredentials = getActivity().getIntent()
                 .getBooleanExtra(CONFIRM_CREDENTIALS, true);
-            mPasswordConfirmed = !confirmCredentials;
+            if (getActivity() instanceof ChooseLockGeneric.InternalActivity) {
+                mPasswordConfirmed = !confirmCredentials;
+            }
 
             if (savedInstanceState != null) {
                 mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
@@ -341,7 +346,8 @@
         }
 
         private Intent getBiometricSensorIntent() {
-            Intent fallBackIntent = new Intent().setClass(getActivity(), ChooseLockGeneric.class);
+            Intent fallBackIntent = new Intent().setClass(getActivity(),
+                    ChooseLockGeneric.InternalActivity.class);
             fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true);
             fallBackIntent.putExtra(CONFIRM_CREDENTIALS, false);
             fallBackIntent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE,
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index c6f5212..f43738f 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -161,6 +161,9 @@
             super.onCreate(savedInstanceState);
             mLockPatternUtils = new LockPatternUtils(getActivity());
             Intent intent = getActivity().getIntent();
+            if (!(getActivity() instanceof ChooseLockPassword)) {
+                throw new SecurityException("Fragment contained in wrong activity");
+            }
             mRequestedQuality = Math.max(intent.getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
                     mRequestedQuality), mLockPatternUtils.getRequestedPasswordQuality());
             mPasswordMinLength = Math.max(
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index c3045e2..328312c 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -308,6 +308,9 @@
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
+            if (!(getActivity() instanceof ChooseLockPattern)) {
+                throw new SecurityException("Fragment contained in wrong activity");
+            }
         }
 
         @Override
@@ -338,7 +341,7 @@
             topLayout.setDefaultTouchRecepient(mLockPatternView);
 
             final boolean confirmCredentials = getActivity().getIntent()
-                    .getBooleanExtra("confirm_credentials", false);
+                    .getBooleanExtra("confirm_credentials", true);
 
             if (savedInstanceState == null) {
                 if (confirmCredentials) {
diff --git a/src/com/android/settings/HelpUtils.java b/src/com/android/settings/HelpUtils.java
index a4c46b0..22e2f76 100644
--- a/src/com/android/settings/HelpUtils.java
+++ b/src/com/android/settings/HelpUtils.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -95,9 +96,15 @@
 
             // Set the intent to the help menu item, show the help menu item in the overflow
             // menu, and make it visible.
-            helpMenuItem.setIntent(intent);
-            helpMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-            helpMenuItem.setVisible(true);
+            ComponentName component = intent.resolveActivity(context.getPackageManager());
+            if (component != null) {
+                helpMenuItem.setIntent(intent);
+                helpMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+                helpMenuItem.setVisible(true);
+            } else {
+                helpMenuItem.setVisible(false);
+                return false;
+            }
 
             // return that the help menu item is visible (i.e., true)
             return true;
diff --git a/src/com/android/settings/location/RecentLocationApps.java b/src/com/android/settings/location/RecentLocationApps.java
index 3cd5406..9488db7 100644
--- a/src/com/android/settings/location/RecentLocationApps.java
+++ b/src/com/android/settings/location/RecentLocationApps.java
@@ -20,6 +20,7 @@
 import android.app.AppOpsManager;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -44,12 +45,15 @@
 public class RecentLocationApps {
     private static final String TAG = RecentLocationApps.class.getSimpleName();
     private static final String ANDROID_SYSTEM_PACKAGE_NAME = "android";
+    private static final String GOOGLE_SERVICES_SHARED_UID = "com.google.uid.shared";
+    private static final String GCORE_PACKAGE_NAME = "com.google.android.gms";
 
     private static final int RECENT_TIME_INTERVAL_MILLIS = 15 * 60 * 1000;
 
     private final PreferenceActivity mActivity;
     private final BatteryStatsHelper mStatsHelper;
     private final PackageManager mPackageManager;
+    private final Drawable mGCoreIcon;
 
     // Stores all the packages that requested location within the designated interval
     // key - package name of the app
@@ -59,6 +63,18 @@
         mActivity = activity;
         mPackageManager = activity.getPackageManager();
         mStatsHelper = sipperUtil;
+        Drawable icon = null;
+        try {
+            ApplicationInfo appInfo = mPackageManager.getApplicationInfo(
+                    GCORE_PACKAGE_NAME, PackageManager.GET_META_DATA);
+            icon = mPackageManager.getApplicationIcon(appInfo);
+        } catch (PackageManager.NameNotFoundException e) {
+            if (Log.isLoggable(TAG, Log.INFO)) {
+                Log.i(TAG, "GCore not installed");
+            }
+            icon = null;
+        }
+        mGCoreIcon = icon;
     }
 
     private class UidEntryClickedListener
@@ -187,6 +203,42 @@
     }
 
     /**
+     * Retrieves the icon for given BatterySipper object.
+     *
+     * The icons on location blaming page are actually Uid-based rather than package based. For
+     * those packages that share the same Uid, BatteryStatsHelper picks the one with the most CPU
+     * usage. Both "Contact Sync" and GCore belong to "Google Services" and they share the same Uid.
+     * As a result, sometimes Contact icon may be chosen to represent "Google Services" by
+     * BatteryStatsHelper.
+     *
+     * In order to avoid displaying Contact icon for "Google Services", we hack this method to
+     * always return Puzzle icon for all packages that share the Uid of "Google Services".
+     */
+    private Drawable getIcon(BatterySipper sipper, AppOpsManager.PackageOps ops) {
+        Drawable icon = null;
+        if (mGCoreIcon != null) {
+            try {
+                PackageInfo info = mPackageManager.getPackageInfo(
+                        ops.getPackageName(), PackageManager.GET_META_DATA);
+                if (info != null && GOOGLE_SERVICES_SHARED_UID.equals(info.sharedUserId)) {
+                    if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                        Log.v(TAG, "shareUserId matches GCore, force using puzzle icon");
+                    }
+                    icon = mGCoreIcon;
+                }
+            } catch (PackageManager.NameNotFoundException e) {
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.v(TAG, e.toString());
+                }
+            }
+        }
+        if (icon == null) {
+            icon = sipper.getIcon();
+        }
+        return icon;
+    }
+
+    /**
      * Creates a Preference entry for the given PackageOps.
      *
      * This method examines the time interval of the PackageOps first. If the PackageOps is older
@@ -241,7 +293,7 @@
                 BatterySipper sipper = wrapper.batterySipper();
                 sipper.loadNameAndIcon();
                 pref = createRecentLocationEntry(
-                        sipper.getIcon(),
+                        getIcon(sipper, ops),
                         sipper.getLabel(),
                         highBattery,
                         new UidEntryClickedListener(sipper));
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
new file mode 100644
index 0000000..99499c8
--- /dev/null
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+
+package com.android.settings.print;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.print.PrintJob;
+import android.print.PrintJobId;
+import android.print.PrintJobInfo;
+import android.print.PrintManager;
+import android.print.PrintManager.PrintJobStateChangeListener;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.text.DateFormat;
+
+/**
+ * Fragment for management of a print job.
+ */
+public class PrintJobSettingsFragment extends SettingsPreferenceFragment {
+    private static final int MENU_ITEM_ID_CANCEL = 1;
+    private static final int MENU_ITEM_ID_RESTART = 2;
+
+    private static final String PRINT_JOB_PREFERENCE = "print_job_preference";
+    private static final String PRINT_JOB_MESSAGE_PREFERENCE = "print_job_message_preference";
+
+    private Drawable mListDivider;
+
+    private final PrintJobStateChangeListener mPrintJobStateChangeListener =
+            new PrintJobStateChangeListener() {
+        @Override
+        public void onPrintJobsStateChanged(PrintJobId printJobId) {
+            updateUi();
+        }
+    };
+
+    private PrintManager mPrintManager;
+
+    private Preference mPrintJobPreference;
+    private Preference mMessagePreference;
+
+    private PrintJobId mPrintJobId;
+    private PrintJob mPrintJob;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        addPreferencesFromResource(R.xml.print_job_settings);
+        mPrintJobPreference = findPreference(PRINT_JOB_PREFERENCE);
+        mMessagePreference = findPreference(PRINT_JOB_MESSAGE_PREFERENCE);
+
+        mPrintManager = ((PrintManager) getActivity().getSystemService(
+                Context.PRINT_SERVICE)).getGlobalPrintManagerForUser(
+                        ActivityManager.getCurrentUser());
+
+        getActivity().getActionBar().setTitle(R.string.print_print_job);
+
+        processArguments();
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        getListView().setEnabled(false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mPrintManager.addPrintJobStateChangeListener(
+                mPrintJobStateChangeListener);
+        updateUi();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mPrintManager.removePrintJobStateChangeListener(
+                mPrintJobStateChangeListener);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+
+        MenuItem cancel = menu.add(0, MENU_ITEM_ID_CANCEL, Menu.NONE,
+                getString(R.string.print_cancel));
+        cancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+
+        if (mPrintJob.isFailed()) {
+            MenuItem restart = menu.add(0, MENU_ITEM_ID_RESTART, Menu.NONE,
+                    getString(R.string.print_restart));
+            restart.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_ITEM_ID_CANCEL: {
+                mPrintJob.cancel();
+                finish();
+                return true;
+            }
+
+            case MENU_ITEM_ID_RESTART: {
+                mPrintJob.restart();
+                finish();
+                return true;
+            }
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void processArguments() {
+        mPrintJobId = (PrintJobId) getArguments().getParcelable(
+                PrintSettingsFragment.EXTRA_PRINT_JOB_ID);
+        if (mPrintJobId == null) {
+            finish();
+        }
+    }
+
+    private void updateUi() {
+        mPrintJob = mPrintManager.getPrintJob(mPrintJobId);
+
+        if (mPrintJob == null) {
+            finish();
+        }
+
+        if (mPrintJob.isCancelled() || mPrintJob.isCompleted()) {
+            finish();
+        }
+
+        PrintJobInfo info = mPrintJob.getInfo();
+
+        switch (info.getState()) {
+            case PrintJobInfo.STATE_QUEUED:
+            case PrintJobInfo.STATE_STARTED: {
+                mPrintJobPreference.setTitle(getString(
+                        R.string.print_printing_state_title_template, info.getLabel()));
+            } break;
+
+            case PrintJobInfo.STATE_FAILED: {
+                mPrintJobPreference.setTitle(getString(
+                        R.string.print_failed_state_title_template, info.getLabel()));
+            } break;
+
+            case PrintJobInfo.STATE_BLOCKED: {
+                mPrintJobPreference.setTitle(getString(
+                        R.string.print_blocked_state_title_template, info.getLabel()));
+            } break;
+        }
+
+        mPrintJobPreference.setSummary(getString(R.string.print_job_summary,
+                info.getPrinterName(), DateUtils.formatSameDayTime(
+                        info.getCreationTime(), info.getCreationTime(), DateFormat.SHORT,
+                        DateFormat.SHORT)));
+
+        switch (info.getState()) {
+            case PrintJobInfo.STATE_QUEUED:
+            case PrintJobInfo.STATE_STARTED: {
+                mPrintJobPreference.setIcon(com.android.internal.R.drawable.ic_print);
+            } break;
+
+            case PrintJobInfo.STATE_FAILED:
+            case PrintJobInfo.STATE_BLOCKED: {
+                mPrintJobPreference.setIcon(com.android.internal.R.drawable.ic_print_error);
+            } break;
+        }
+
+        String stateReason = info.getStateReason();
+        if (!TextUtils.isEmpty(stateReason)) {
+            if (getPreferenceScreen().findPreference(PRINT_JOB_MESSAGE_PREFERENCE) == null) {
+                getPreferenceScreen().addPreference(mMessagePreference);
+            }
+            mMessagePreference.setSummary(stateReason);
+            getListView().setDivider(null);
+        } else {
+            getPreferenceScreen().removePreference(mMessagePreference);
+            getListView().setDivider(mListDivider);
+        }
+
+        getActivity().invalidateOptionsMenu();
+    }
+}
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 87db29b..9db2dec 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -27,15 +27,15 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.Loader;
-import android.content.pm.ActivityInfo;
 import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
 import android.database.ContentObserver;
 import android.database.DataSetObserver;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceActivity;
@@ -54,8 +54,11 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.CompoundButton;
 import android.widget.Filter;
 import android.widget.Filterable;
+import android.widget.ImageView;
+import android.widget.ListView;
 import android.widget.SearchView;
 import android.widget.TextView;
 
@@ -69,6 +72,7 @@
 import java.util.List;
 import java.util.Map;
 
+import android.widget.CompoundButton.OnCheckedChangeListener;
 /**
  * Fragment with print service settings.
  */
@@ -83,7 +87,7 @@
             new SettingsContentObserver(new Handler()) {
         @Override
         public void onChange(boolean selfChange, Uri uri) {
-            updateForServiceEnabledState();
+            updateUiForServiceState();
         }
     };
 
@@ -108,15 +112,15 @@
         }
     };
 
-    protected ToggleSwitch mToggleSwitch;
+    private ToggleSwitch mToggleSwitch;
 
-    protected String mPreferenceKey;
+    private String mPreferenceKey;
 
-    protected CharSequence mSettingsTitle;
-    protected Intent mSettingsIntent;
+    private CharSequence mSettingsTitle;
+    private Intent mSettingsIntent;
 
-    protected CharSequence mAddPrintersTitle;
-    protected Intent mAddPrintersIntent;
+    private CharSequence mAddPrintersTitle;
+    private Intent mAddPrintersIntent;
 
     private CharSequence mEnableWarningTitle;
     private CharSequence mEnableWarningMessage;
@@ -135,9 +139,10 @@
 
     @Override
     public void onResume() {
-        mSettingsContentObserver.register(getContentResolver());
         super.onResume();
-        updateForServiceEnabledState();
+        mSettingsContentObserver.register(getContentResolver());
+        updateEmptyView();
+        updateUiForServiceState();
     }
 
     @Override
@@ -149,12 +154,8 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        installActionBarToggleSwitch();
-        processArguments(getArguments());
-        mPrintersAdapter = new PrintersAdapter();
-        mPrintersAdapter.registerDataSetObserver(mDataObserver);
-        getListView().setAdapter(mPrintersAdapter);
-        updateForServiceEnabledState();
+        initComponents();
+        updateUiForArguments();
     }
 
     @Override
@@ -221,7 +222,40 @@
         }
     }
 
-    private void updateForServiceEnabledState() {
+    private void updateEmptyView() {
+        ListView listView = getListView();
+        ViewGroup contentRoot = (ViewGroup) listView.getParent();
+        View emptyView = listView.getEmptyView();
+        if (!mToggleSwitch.isChecked()) {
+            if (emptyView != null
+                    && emptyView.getId() != R.id.empty_printers_list_service_disabled) {
+                contentRoot.removeView(emptyView);
+                emptyView = null;
+            }
+            if (emptyView == null) {
+                emptyView = getActivity().getLayoutInflater().inflate(
+                        R.layout.empty_print_state, contentRoot, false);
+                TextView textView = (TextView) emptyView.findViewById(R.id.message);
+                textView.setText(R.string.print_service_disabled);
+                contentRoot.addView(emptyView);
+                listView.setEmptyView(emptyView);
+            }
+        } else if (mPrintersAdapter.getUnfilteredCount() <= 0) {
+            if (emptyView != null
+                    && emptyView.getId() != R.id.empty_printers_list_service_enabled) {
+                contentRoot.removeView(emptyView);
+                emptyView = null;
+            }
+            if (emptyView == null) {
+                emptyView = getActivity().getLayoutInflater().inflate(
+                        R.layout.empty_printers_list_service_enabled, contentRoot, false);
+                contentRoot.addView(emptyView);
+                listView.setEmptyView(emptyView);
+            }
+        }
+    }
+
+    private void updateUiForServiceState() {
         List<ComponentName> services = SettingsUtils.readEnabledPrintServices(getActivity());
         mServiceEnabled = services.contains(mComponentName);
         if (mServiceEnabled) {
@@ -234,7 +268,10 @@
         getActivity().invalidateOptionsMenu();
     }
 
-    private void installActionBarToggleSwitch() {
+    private void initComponents() {
+        mPrintersAdapter = new PrintersAdapter();
+        mPrintersAdapter.registerDataSetObserver(mDataObserver);
+
         mToggleSwitch = createAndAddActionBarToggleSwitch(getActivity());
         mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
             @Override
@@ -253,9 +290,20 @@
                 return false;
             }
         });
+        mToggleSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                updateEmptyView();
+            }
+        });
+
+        getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
+        getListView().setAdapter(mPrintersAdapter);
     }
 
-    private void processArguments(Bundle arguments) {
+    private void updateUiForArguments() {
+        Bundle arguments = getArguments();
+
         // Key.
         mPreferenceKey = arguments.getString(PrintSettingsFragment.EXTRA_PREFERENCE_KEY);
 
@@ -381,22 +429,21 @@
 
     private static abstract class SettingsContentObserver extends ContentObserver {
 
-    public SettingsContentObserver(Handler handler) {
-        super(handler);
-    }
+        public SettingsContentObserver(Handler handler) {
+            super(handler);
+        }
 
-    public void register(ContentResolver contentResolver) {
-        contentResolver.registerContentObserver(Settings.Secure.getUriFor(
-                Settings.Secure.ENABLED_PRINT_SERVICES), false, this);
-    }
+        public void register(ContentResolver contentResolver) {
+            contentResolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.ENABLED_PRINT_SERVICES), false, this);
+        }
 
-    public void unregister(ContentResolver contentResolver) {
-        contentResolver.unregisterContentObserver(this);
-    }
+        public void unregister(ContentResolver contentResolver) {
+            contentResolver.unregisterContentObserver(this);
+        }
 
-    @Override
-    public abstract void onChange(boolean selfChange, Uri uri);
-
+        @Override
+        public abstract void onChange(boolean selfChange, Uri uri);
     }
 
     private final class PrintersAdapter extends BaseAdapter
@@ -415,6 +462,7 @@
 
         public void disable() {
             getLoaderManager().destroyLoader(LOADER_ID_PRINTERS_LOADER);
+            mPrinters.clear();
         }
 
         public int getUnfilteredCount() {
@@ -487,24 +535,26 @@
         public View getView(int position, View convertView, ViewGroup parent) {
             if (convertView == null) {
                 convertView = getActivity().getLayoutInflater().inflate(
-                        R.layout.preference, parent, false);
+                        R.layout.printer_dropdown_item, parent, false);
             }
 
             PrinterInfo printer = (PrinterInfo) getItem(position);
             CharSequence title = printer.getName();
             CharSequence subtitle = null;
+            Drawable icon = null;
             try {
                 PackageInfo packageInfo = getPackageManager().getPackageInfo(
                         printer.getId().getServiceName().getPackageName(), 0);
                         subtitle = packageInfo.applicationInfo.loadLabel(getPackageManager());
+                        icon = packageInfo.applicationInfo.loadIcon(getPackageManager());
             } catch (NameNotFoundException nnfe) {
                 /* ignore */
             }
 
-            TextView titleView = (TextView) convertView.findViewById(android.R.id.title);
+            TextView titleView = (TextView) convertView.findViewById(R.id.title);
             titleView.setText(title);
 
-            TextView subtitleView = (TextView) convertView.findViewById(android.R.id.summary);
+            TextView subtitleView = (TextView) convertView.findViewById(R.id.subtitle);
             if (!TextUtils.isEmpty(subtitle)) {
                 subtitleView.setText(subtitle);
                 subtitleView.setVisibility(View.VISIBLE);
@@ -513,6 +563,14 @@
                 subtitleView.setVisibility(View.GONE);
             }
 
+            ImageView iconView = (ImageView) convertView.findViewById(R.id.icon);
+            if (icon != null) {
+                iconView.setImageDrawable(icon);
+                iconView.setVisibility(View.VISIBLE);
+            } else {
+                iconView.setVisibility(View.GONE);
+            }
+
             return convertView;
         }
 
@@ -560,7 +618,7 @@
 
         private static final String LOG_TAG = "PrintersLoader";
 
-        private static final boolean DEBUG = true && Build.IS_DEBUGGABLE;
+        private static final boolean DEBUG = false;
 
         private final Map<PrinterId, PrinterInfo> mPrinters =
                 new LinkedHashMap<PrinterId, PrinterInfo>();
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 49f0e65..84865c3 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -16,10 +16,14 @@
 
 package com.android.settings.print;
 
+import android.app.ActivityManager;
+import android.app.LoaderManager.LoaderCallbacks;
+import android.content.AsyncTaskLoader;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.Loader;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.database.ContentObserver;
@@ -28,14 +32,23 @@
 import android.os.Handler;
 import android.os.Message;
 import android.preference.Preference;
+import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
+import android.print.PrintJob;
+import android.print.PrintJobId;
+import android.print.PrintJobInfo;
+import android.print.PrintManager;
+import android.print.PrintManager.PrintJobStateChangeListener;
 import android.printservice.PrintServiceInfo;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Switch;
 import android.widget.TextView;
 
@@ -44,6 +57,8 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
+import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -53,17 +68,24 @@
 
     static final char ENABLED_PRINT_SERVICES_SEPARATOR = ':';
 
+    private static final int LOADER_ID_PRINT_JOBS_LOADER = 1;
+
+    private static final String PRINT_JOBS_CATEGORY = "print_jobs_category";
+    private static final String PRINT_SERVICES_CATEGORY = "print_services_category";
+
     // Extras passed to sub-fragments.
-    static final String EXTRA_PREFERENCE_KEY = "preference_key";
-    static final String EXTRA_CHECKED = "checked";
-    static final String EXTRA_TITLE = "title";
-    static final String EXTRA_ENABLE_WARNING_TITLE = "enable_warning_title";
-    static final String EXTRA_ENABLE_WARNING_MESSAGE = "enable_warning_message";
-    static final String EXTRA_SETTINGS_TITLE = "settings_title";
-    static final String EXTRA_SETTINGS_COMPONENT_NAME = "settings_component_name";
-    static final String EXTRA_ADD_PRINTERS_TITLE = "add_printers_title";
-    static final String EXTRA_ADD_PRINTERS_COMPONENT_NAME = "add_printers_component_name";
-    static final String EXTRA_SERVICE_COMPONENT_NAME = "service_component_name";
+    static final String EXTRA_PREFERENCE_KEY = "EXTRA_PREFERENCE_KEY";
+    static final String EXTRA_CHECKED = "EXTRA_CHECKED";
+    static final String EXTRA_TITLE = "EXTRA_TITLE";
+    static final String EXTRA_ENABLE_WARNING_TITLE = "EXTRA_ENABLE_WARNING_TITLE";
+    static final String EXTRA_ENABLE_WARNING_MESSAGE = "EXTRA_ENABLE_WARNING_MESSAGE";
+    static final String EXTRA_SETTINGS_TITLE = "EXTRA_SETTINGS_TITLE";
+    static final String EXTRA_SETTINGS_COMPONENT_NAME = "EXTRA_SETTINGS_COMPONENT_NAME";
+    static final String EXTRA_ADD_PRINTERS_TITLE = "EXTRA_ADD_PRINTERS_TITLE";
+    static final String EXTRA_ADD_PRINTERS_COMPONENT_NAME = "EXTRA_ADD_PRINTERS_COMPONENT_NAME";
+    static final String EXTRA_SERVICE_COMPONENT_NAME = "EXTRA_SERVICE_COMPONENT_NAME";
+
+    static final String EXTRA_PRINT_JOB_ID = "EXTRA_PRINT_JOB_ID";
 
     private static final String EXTRA_PRINT_SERVICE_COMPONENT_NAME =
             "EXTRA_PRINT_SERVICE_COMPONENT_NAME";
@@ -85,13 +107,27 @@
         }
     };
 
-    private Preference mNoServicesMessagePreference;
+    private PreferenceCategory mActivePrintJobsCategory;
+    private PreferenceCategory mPrintServicesCategory;
+
+    private PrintJobsController mPrintJobsController;
+
+    private String mPrintJobPreferenceToActivate;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.print_settings);
-        getActivity().getActionBar().setTitle(R.string.print_settings_title);
+
+        mActivePrintJobsCategory = (PreferenceCategory) findPreference(
+                PRINT_JOBS_CATEGORY);
+        mPrintServicesCategory= (PreferenceCategory) findPreference(
+                PRINT_SERVICES_CATEGORY);
+        getPreferenceScreen().removePreference(mActivePrintJobsCategory);
+
+        mPrintJobsController = new PrintJobsController();
+        getActivity().getLoaderManager().initLoader(LOADER_ID_PRINT_JOBS_LOADER,
+                null, mPrintJobsController);
     }
 
     @Override
@@ -100,8 +136,8 @@
         mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
         mSettingsContentObserver.register(getContentResolver());
         updateServicesPreferences();
-        startPrintServiceSettingsIfNeeded();
         setHasOptionsMenu(true);
+        startSubSettingsIfNeeded();
     }
 
     @Override
@@ -120,10 +156,26 @@
                 Uri.parse(getString(R.string.download_print_service_query))));
     }
 
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ViewGroup contentRoot = (ViewGroup) getListView().getParent();
+        View emptyView = getActivity().getLayoutInflater().inflate(
+                    R.layout.empty_print_state, contentRoot, false);
+        TextView textView = (TextView) emptyView.findViewById(R.id.message);
+        textView.setText(R.string.print_no_services_installed);
+        contentRoot.addView(emptyView);
+        getListView().setEmptyView(emptyView);
+    }
+
     private void updateServicesPreferences() {
-        // Since services category is auto generated we have to do a pass
-        // to generate it since services can come and go.
-        getPreferenceScreen().removeAll();
+        if (getPreferenceScreen().findPreference(PRINT_SERVICES_CATEGORY) == null) {
+            getPreferenceScreen().addPreference(mPrintServicesCategory);
+        } else {
+            // Since services category is auto generated we have to do a pass
+            // to generate it since services can come and go.
+            mPrintServicesCategory.removeAll();
+        }
 
         List<ComponentName> enabledServices = SettingsUtils
                 .readEnabledPrintServices(getActivity());
@@ -194,30 +246,15 @@
 
             extras.putString(EXTRA_SERVICE_COMPONENT_NAME, componentName.flattenToString());
 
-            getPreferenceScreen().addPreference(preference);
+            mPrintServicesCategory.addPreference(preference);
         }
 
-        if (getPreferenceScreen().getPreferenceCount() == 0) {
-            if (mNoServicesMessagePreference == null) {
-                mNoServicesMessagePreference = new Preference(getActivity()) {
-                    @Override
-                    protected void onBindView(View view) {
-                        super.onBindView(view);
-                        TextView summaryView = (TextView) view.findViewById(R.id.summary);
-                        String title = getString(R.string.print_no_services_installed);
-                        summaryView.setText(title);
-                    }
-                };
-                mNoServicesMessagePreference.setPersistent(false);
-                mNoServicesMessagePreference.setLayoutResource(
-                        R.layout.text_description_preference);
-                mNoServicesMessagePreference.setSelectable(false);
-            }
-            getPreferenceScreen().addPreference(mNoServicesMessagePreference);
+        if (mPrintServicesCategory.getPreferenceCount() == 0) {
+            getPreferenceScreen().removePreference(mPrintServicesCategory);
         }
     }
 
-    private void startPrintServiceSettingsIfNeeded() {
+    private void startSubSettingsIfNeeded() {
         if (getArguments() == null) {
             return;
         }
@@ -228,6 +265,19 @@
             if (prereference != null) {
                 prereference.performClick(getPreferenceScreen());
             }
+        } else {
+            String printJobId = getArguments().getString(EXTRA_PRINT_JOB_ID);
+            if (printJobId != null) {
+                getArguments().remove(EXTRA_PRINT_JOB_ID);
+                Preference preference = findPreference(printJobId);
+                if (preference != null) {
+                    preference.performClick(getPreferenceScreen());
+                } else {
+                    // The preference not being present may mean the the print job
+                    // loader has not completed so make a note and wait for the load.
+                    mPrintJobPreferenceToActivate = printJobId;
+                }
+            }
         }
     }
 
@@ -301,4 +351,207 @@
         @Override
         public abstract void onChange(boolean selfChange, Uri uri);
     }
+
+    private final class PrintJobsController implements LoaderCallbacks<List<PrintJobInfo>> {
+
+        @Override
+        public Loader<List<PrintJobInfo>> onCreateLoader(int id, Bundle args) {
+            if (id == LOADER_ID_PRINT_JOBS_LOADER) {
+                return new PrintJobsLoader(getActivity());
+            }
+            return null;
+        }
+
+        @Override
+        public void onLoadFinished(Loader<List<PrintJobInfo>> loader,
+                List<PrintJobInfo> printJobs) {
+            if (printJobs == null || printJobs.isEmpty()) {
+                getPreferenceScreen().removePreference(mActivePrintJobsCategory);
+            } else {
+                if (getPreferenceScreen().findPreference(PRINT_JOBS_CATEGORY) == null) {
+                    getPreferenceScreen().addPreference(mActivePrintJobsCategory);
+                }
+
+                mActivePrintJobsCategory.removeAll();
+
+                final int printJobCount = printJobs.size();
+                for (int i = 0; i < printJobCount; i++) {
+                    PrintJobInfo printJob = printJobs.get(i);
+
+                    PreferenceScreen preference = getPreferenceManager()
+                            .createPreferenceScreen(getActivity());
+
+                    preference.setPersistent(false);
+                    preference.setFragment(PrintJobSettingsFragment.class.getName());
+                    preference.setKey(printJob.getId().flattenToString());
+
+                    switch (printJob.getState()) {
+                        case PrintJobInfo.STATE_QUEUED:
+                        case PrintJobInfo.STATE_STARTED: {
+                            preference.setTitle(getString(
+                                    R.string.print_printing_state_title_template,
+                                    printJob.getLabel()));
+                        } break;
+
+                        case PrintJobInfo.STATE_FAILED: {
+                            preference.setTitle(getString(
+                                    R.string.print_failed_state_title_template,
+                                    printJob.getLabel()));
+                        } break;
+
+                        case PrintJobInfo.STATE_BLOCKED: {
+                            preference.setTitle(getString(
+                                    R.string.print_blocked_state_title_template,
+                                    printJob.getLabel()));
+                        } break;
+                    }
+
+                    preference.setSummary(getString(R.string.print_job_summary,
+                            printJob.getPrinterName(), DateUtils.formatSameDayTime(
+                                    printJob.getCreationTime(), printJob.getCreationTime(),
+                                    DateFormat.SHORT, DateFormat.SHORT)));
+
+                    switch (printJob.getState()) {
+                        case PrintJobInfo.STATE_QUEUED:
+                        case PrintJobInfo.STATE_STARTED: {
+                            preference.setIcon(com.android.internal.R.drawable.ic_print);
+                        } break;
+
+                        case PrintJobInfo.STATE_FAILED:
+                        case PrintJobInfo.STATE_BLOCKED: {
+                            preference.setIcon(com.android.internal.R.drawable.ic_print_error);
+                        } break;
+                    }
+
+                    Bundle extras = preference.getExtras();
+                    extras.putParcelable(EXTRA_PRINT_JOB_ID, printJob.getId());
+
+                    mActivePrintJobsCategory.addPreference(preference);
+                }
+
+                // If were waiting for creating a preference for a print
+                // job so we can start it - do that.
+                if (mPrintJobPreferenceToActivate != null) {
+                    Preference preference = findPreference(mPrintJobPreferenceToActivate);
+                    mPrintJobPreferenceToActivate = null;
+                    if (preference != null) {
+                        preference.performClick(getPreferenceScreen());
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void onLoaderReset(Loader<List<PrintJobInfo>> loader) {
+            getPreferenceScreen().removePreference(mActivePrintJobsCategory);
+        }
+    }
+
+    private static final class PrintJobsLoader extends AsyncTaskLoader<List<PrintJobInfo>> {
+
+        private static final String LOG_TAG = "PrintJobsLoader";
+
+        private static final boolean DEBUG = true;
+
+        private List <PrintJobInfo> mPrintJobs = new ArrayList<PrintJobInfo>();
+
+        private final PrintManager mPrintManager;
+
+        private PrintJobStateChangeListener mPrintJobStateChangeListener;
+
+        public PrintJobsLoader(Context context) {
+            super(context);
+            mPrintManager = ((PrintManager) context.getSystemService(
+                    Context.PRINT_SERVICE)).getGlobalPrintManagerForUser(
+                            ActivityManager.getCurrentUser());
+        }
+
+        @Override
+        public void deliverResult(List<PrintJobInfo> printJobs) {
+            if (isStarted()) {
+                super.deliverResult(printJobs);
+            }
+        }
+
+        @Override
+        protected void onStartLoading() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onStartLoading()");
+            }
+            // If we already have a result, deliver it immediately.
+            if (!mPrintJobs.isEmpty()) {
+                deliverResult(new ArrayList<PrintJobInfo>(mPrintJobs));
+            }
+            // Start watching for changes.
+            if (mPrintJobStateChangeListener == null) {
+                mPrintJobStateChangeListener = new PrintJobStateChangeListener() {
+                    @Override
+                    public void onPrintJobsStateChanged(PrintJobId printJobId) {
+                        onForceLoad();
+                    }
+                };
+                mPrintManager.addPrintJobStateChangeListener(
+                        mPrintJobStateChangeListener);
+            }
+            // If the data changed or we have no data - load it now.
+            if (mPrintJobs.isEmpty()) {
+                onForceLoad();
+            }
+        }
+
+        @Override
+        protected void onStopLoading() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onStopLoading()");
+            }
+            // Cancel the load in progress if possible.
+            onCancelLoad();
+        }
+
+        @Override
+        protected void onReset() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onReset()");
+            }
+            // Stop loading.
+            onStopLoading();
+            // Clear the cached result.
+            mPrintJobs.clear();
+            // Stop watching for changes.
+            if (mPrintJobStateChangeListener != null) {
+                mPrintManager.removePrintJobStateChangeListener(
+                        mPrintJobStateChangeListener);
+                mPrintJobStateChangeListener = null;
+            }
+        }
+
+        @Override
+        public List<PrintJobInfo> loadInBackground() {
+            List<PrintJobInfo> printJobInfos = null;
+            List<PrintJob> printJobs = mPrintManager.getPrintJobs();
+            final int printJobCount = printJobs.size();
+            for (int i = 0; i < printJobCount; i++) {
+                PrintJobInfo printJob = printJobs.get(i).getInfo();
+                if (shouldShowToUser(printJob)) {
+                    if (printJobInfos == null) {
+                        printJobInfos = new ArrayList<PrintJobInfo>();
+                    }
+                    printJobInfos.add(printJob);
+                }
+            }
+            return printJobInfos;
+        }
+
+        private static boolean shouldShowToUser(PrintJobInfo printJob) {
+            switch (printJob.getState()) {
+                case PrintJobInfo.STATE_QUEUED:
+                case PrintJobInfo.STATE_STARTED:
+                case PrintJobInfo.STATE_BLOCKED:
+                case PrintJobInfo.STATE_FAILED: {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
 }