Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
diff --git a/Android.mk b/Android.mk
index 349b79c..eeaad0c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,9 +22,10 @@
LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-v4 \
android-support-v13 \
- android-support-v7-recyclerview \
- android-support-v7-preference \
android-support-v7-appcompat \
+ android-support-v7-cardview \
+ android-support-v7-preference \
+ android-support-v7-recyclerview \
android-support-v14-preference
LOCAL_JAVA_LIBRARIES := \
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b9c0f9f..6e076a2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -81,6 +81,7 @@
<uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
<uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.DELETE_PACKAGES"/>
+ <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>
<application android:label="@string/settings_label"
android:icon="@drawable/ic_launcher_settings"
@@ -212,7 +213,8 @@
<activity android:name=".search2.SearchActivity"
android:label="@string/search_settings"
android:icon="@drawable/ic_search_history"
- android:parentActivityName="Settings">
+ android:parentActivityName="Settings"
+ android:theme="@style/Theme.Settings.NoActionBar">
</activity>
<!-- Top-level settings -->
diff --git a/res/layout/dashboard_header_spacer.xml b/res/layout/dashboard_header_spacer.xml
new file mode 100644
index 0000000..442ae48
--- /dev/null
+++ b/res/layout/dashboard_header_spacer.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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:padding="@dimen/search_bar_margin">
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/actionBarSize"/>
+</LinearLayout>
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index d858697..2ac3dc1 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -20,9 +20,9 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
- android:layout_marginBottom="16dp"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingTop="16dp"
+ android:paddingBottom="16dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<LinearLayout
@@ -56,6 +56,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="16dip"
+ android:minWidth="32dp"
android:text="@string/progress_scanning"/>
</LinearLayout>
diff --git a/res/layout/preference_widget_seekbar_settings.xml b/res/layout/preference_widget_seekbar_settings.xml
index 87fea99..c25c598 100644
--- a/res/layout/preference_widget_seekbar_settings.xml
+++ b/res/layout/preference_widget_seekbar_settings.xml
@@ -19,36 +19,36 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
+ android:layout_marginTop="6dp"
+ android:layout_marginBottom="6dp"
android:gravity="center_vertical"
+ android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:paddingBottom="6dp"
- android:paddingTop="6dp">
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="60dp"
- android:layout_marginEnd="8dp"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"
+ android:paddingStart="56dp"
+ android:paddingEnd="8dp"
android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal" />
+ android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="60dp"
- android:layout_marginEnd="8dp"
- android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
+ android:layout_below="@android:id/title"
+ android:maxLines="4"
+ android:paddingStart="56dp"
+ android:paddingEnd="8dp"
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
- android:textColor="?android:attr/textColorSecondary"
- android:maxLines="4" />
+ android:textColor="?android:attr/textColorSecondary" />
<com.android.settings.widget.DefaultIndicatorSeekBar
android:id="@*android:id/seekbar"
@@ -57,7 +57,7 @@
android:layout_height="48dp"
android:layout_alignParentEnd="true"
android:layout_below="@android:id/summary"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="44dp" />
+ android:paddingStart="56dp"
+ android:paddingEnd="8dp" />
</RelativeLayout>
diff --git a/res/layout/search_main.xml b/res/layout/search_main.xml
index ab728cd..6de344d 100644
--- a/res/layout/search_main.xml
+++ b/res/layout/search_main.xml
@@ -18,7 +18,6 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/main_content"
- android:layout_height="match_parent"
- android:layout_width="match_parent"
- android:background="@color/material_grey_300"/>
+ android:id="@+id/main_content"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"/>
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index 9445e0c..d097cfe 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -15,71 +15,80 @@
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/search_panel"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/search_panel_list_background">
- <LinearLayout android:id="@+id/layout_recent_searches"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:orientation="vertical"
- android:layout_alignParentTop="true">
+ <FrameLayout
+ android:id="@+id/layout_results"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_above="@id/feedback_popup"
+ android:orientation="vertical">
<!-- Padding is included in the background -->
- <android.support.v7.widget.RecyclerView android:id="@+id/list_recent_searches"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingStart="@dimen/dashboard_padding_start"
- android:paddingEnd="@dimen/dashboard_padding_end"
- android:paddingTop="@dimen/dashboard_padding_top"
- android:paddingBottom="@dimen/dashboard_padding_bottom"
- android:scrollbarStyle="outsideOverlay"
- android:headerDividersEnabled="false"
- android:elevation="@dimen/search_panel_elevation"/>
- </LinearLayout>
-
- <LinearLayout android:id="@+id/layout_results"
- android:layout_width="match_parent"
- android:layout_height="fill_parent"
- android:layout_above="@id/feedback_popup"
- android:orientation="vertical">
-
- <!-- Padding is included in the background -->
- <android.support.v7.widget.RecyclerView android:id="@+id/list_results"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="@dimen/dashboard_padding_start"
- android:paddingEnd="@dimen/dashboard_padding_end"
- android:paddingTop="@dimen/dashboard_padding_top"
- android:paddingBottom="@dimen/dashboard_padding_bottom"
- android:scrollbarStyle="outsideOverlay"
- android:scrollbars="vertical"/>
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/list_results"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="@dimen/dashboard_padding_start"
+ android:paddingEnd="@dimen/dashboard_padding_end"
+ android:paddingTop="@dimen/dashboard_padding_top"
+ android:paddingBottom="@dimen/dashboard_padding_bottom"
+ android:scrollbarStyle="outsideOverlay"
+ android:scrollbars="vertical"/>
<LinearLayout
android:id="@+id/no_results_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingTop="80dp"
+ android:paddingTop="96dp"
android:orientation="vertical"
android:visibility="gone">
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/actionBarSize"/>
+
<ImageView
- android:layout_height="160dp"
- android:layout_width="160dp"
- android:layout_gravity="center_horizontal"
- android:src="@drawable/empty_search_results"/>
+ android:layout_height="160dp"
+ android:layout_width="160dp"
+ android:layout_gravity="center_horizontal"
+ android:src="@drawable/empty_search_results"/>
<TextView
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:paddingTop="24dp"
- android:textSize="18sp"
- android:text="@string/search_settings_no_results"
- android:gravity="center"/>
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:paddingTop="24dp"
+ android:textSize="18sp"
+ android:text="@string/search_settings_no_results"
+ android:gravity="center"/>
+
</LinearLayout>
- </LinearLayout>
+
+ <android.support.v7.widget.CardView
+ android:id="@+id/search_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/search_bar_margin"
+ app:cardCornerRadius="2dp"
+ app:cardBackgroundColor="?android:attr/colorBackground"
+ app:cardElevation="2dp">
+
+ <SearchView
+ android:id="@+id/search_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:iconifiedByDefault="false"
+ android:imeOptions="actionSearch|flagNoExtractUi"
+ android:theme="?android:attr/actionBarTheme"/>
+
+ </android.support.v7.widget.CardView>
+
+ </FrameLayout>
<include layout="@layout/search_feedback"/>
+
</RelativeLayout>
diff --git a/res/layout/settings_main_dashboard.xml b/res/layout/settings_main_dashboard.xml
index c10193c..1a3b133 100644
--- a/res/layout/settings_main_dashboard.xml
+++ b/res/layout/settings_main_dashboard.xml
@@ -18,7 +18,31 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/main_content"
- android:layout_height="match_parent"
- android:layout_width="match_parent"
- />
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
+ <FrameLayout
+ android:id="@+id/main_content"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"/>
+ <android.support.v7.widget.CardView
+ android:id="@+id/search_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/search_bar_margin"
+ app:cardCornerRadius="2dp"
+ app:cardBackgroundColor="?android:attr/colorBackground"
+ app:cardElevation="2dp">
+ <Toolbar
+ android:id="@+id/search_action_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/search_bar_negative_margin"
+ android:background="?android:attr/selectableItemBackground"
+ android:navigationIcon="@drawable/ic_search_24dp"
+ android:title="@string/search_menu"
+ android:titleTextAppearance="?android:attr/subtitleTextAppearance"
+ android:titleTextColor="?android:attr/textColorHint"
+ android:theme="?android:attr/actionBarTheme"/>
+ </android.support.v7.widget.CardView>
+</FrameLayout>
diff --git a/res/layout/storage_summary_donut.xml b/res/layout/storage_summary_donut.xml
index 585fbf4..eb26077 100644
--- a/res/layout/storage_summary_donut.xml
+++ b/res/layout/storage_summary_donut.xml
@@ -17,7 +17,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?android:attr/selectableItemBackground"
+ android:background="?android:attr/colorSecondary"
android:gravity="center_vertical"
android:orientation="horizontal" >
diff --git a/res/layout/wifi_network_details_two_buttons_panel.xml b/res/layout/wifi_network_details_two_buttons_panel.xml
new file mode 100644
index 0000000..6abfac3
--- /dev/null
+++ b/res/layout/wifi_network_details_two_buttons_panel.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+
+<!--
+ Defines a panel with two buttons and a spacer in between.
+ The right button uses the Material.Button.Colored style.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="bottom"
+ android:paddingTop="4dip"
+ android:orientation="horizontal">
+ <Button
+ android:id="@+id/forget_button"
+ android:layout_width="120dip"
+ android:layout_weight="0.4"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"/>
+ <!-- Spacer -->
+ <View
+ android:id="@+id/buttons_spacer_left"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:visibility="invisible"
+ android:layout_weight="0.2" />
+ <Button
+ style="@android:style/Widget.Material.Button.Colored"
+ android:id="@+id/signin_button"
+ android:layout_width="120dip"
+ android:text="@string/cancel"
+ android:layout_weight="0.4"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"/>
+</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 705e49e..ee8850b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Gebruik <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> moet:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Instellings kan nie jou antwoord verifieer nie omdat \'n program \'n toestemmingversoek verberg."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Instellings kan nie op jou handeling reageer nie, omdat \'n ander program bo-oor hierdie opsies gewys word."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"As jy <xliff:g id="SERVICE">%1$s</xliff:g> aanskakel, sal jou toestel nie jou skermslot gebruik om data-enkripsie te verbeter nie."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Omdat jy \'n toeganklikheiddiens aangeskakel het, sal jou toestel nie jou skermslot gebruik om data-enkripsie te verbeter nie."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Jy moet jou patroon bevestig, want as <xliff:g id="SERVICE">%1$s</xliff:g> aangeskakel is, beïnvloed dit datakodering."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Skandering van mobiele netwerk"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> gelede"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Programgebruik sedert battery volgelaai is (<xliff:g id="TIME">^1</xliff:g> gelede)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Toestelgebruik sedert battery vol gelaai is (<xliff:g id="TIME">^1</xliff:g> gelede)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Hoe lank skerm aan was sedert battery volgelaai is"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Toestelgebruik sedert battery volgelaai is"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Batterygebruik sedert uitgeprop"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Oorberekende kragverbruik"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> lank gebruik"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Skermgebruik <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> gebruik deur <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> van algehele batterygebruik"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ontleding sedert battery laas volgelaai is"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Kennisgewings"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Gevorderd"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Werkkennisgewings"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Laat ikoonkentekens toe"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Flikkerende lig"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Op die sluitskerm"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Wys alle kennisgewinginhoud"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorieë is uitgevee</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategorie is uitgevee</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Kennisgewingkentekens"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Aan"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Af"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blokkeer almal"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Moet nooit hierdie kennisgewings wys nie"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Wys kennisgewings"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Moet nooit kennisgewings in die skadu of op randtoestelle wys nie"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Laat ikoonkenteken toe"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignoreer Moenie Steur Nie"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Laat hierdie kennisgewings steeds onderbreek wanneer Moenie Steur Nie na \'Net prioriteit\' gestel is"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Op die sluitskerm"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Batteryoptimalisering"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Opletberigte oor gebruik"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Wys alle programme"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Versteek ekstra programme"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Wys volle toestelgebruik"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Wys programgebruik"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Nie geoptimaliseer nie"</string>
<string name="high_power_on" msgid="6216293998227583810">"Nie geoptimeer nie"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimaliseer batterygebruik"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Speletjies"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Ander programme"</string>
<string name="storage_files" msgid="8581083146777364063">"Lêers"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tabletberging"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Foonberging"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Gebruik van <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"gebruik"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9ed45af..561ec4f 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ይጠቀሙ?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ይህን ማድረግ አለበት፦"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"አንድ መተግበሪያ የፍቃድ ጥያቄ እያገደ ስለሆነ ቅንብሮች ጥያቄዎን ማረጋገጥ አይችሉም።"</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"ሌላ መተግበሪያ በእነዚህ አማራጮች ላይ እያሳየ ስለሆነ ቅንብሮች ለእርስዎ እርምጃ ምላሽ መስጠት አይችልም።"</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>ን ካበሩት፣ መሳሪያዎ የውሂብ ምስጠራን ለማላቅ የማያ ገጽ መቆለፊያዎን አይጠቀምም።"</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"አንድ የተደራሽነት አገልግሎትን ስላበሩ፣ መሳሪያዎ የውሂብ ምስጠራን ለማላቅ የማያ ገጽ መቆለፊያዎን አይጠቀምም።"</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>ን ማብራት የውሂብ ምስጠራ ላይ ተጽዕኖ ስለሚያሳርፍ፣ የእርስዎን ስርዓተ-ጥለት ማረጋገጥ ያስፈልግዎታል።"</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"የተንቀሳቃሽ ስልክ አውታረ መረብ ቅኝት"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"ከ<xliff:g id="TIME">^1</xliff:g> በፊት"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"ከሙሉ ኃይል ጊዜ ጀምሮ ያለው የመተግበሪያ አጠቃቀም (ከ<xliff:g id="TIME">^1</xliff:g> በፊት)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"ከሙሉ ኃይል ጊዜ ጀምሮ ያለው የመሣሪያ አጠቃቀም (ከ<xliff:g id="TIME">^1</xliff:g> በፊት)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"ሙሉ ኃይል ከነበረበት ጊዜ ጀምሮ ማያ ገጹ በርቶ የቆየበት ጊዜ"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"ሙሉ ኃይል ከነበረበት ጊዜ ጀምሮ ያለው የመሣሪያ አጠቃቀም"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"ከተነቀለ ጀምሮ የባትሪ ጥቅም"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"ከመጠን በላይ የተቆጠረ የሃይል አጠቃቀም"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"ለ<xliff:g id="TIME">^1</xliff:g> ጥቅም ላይ ውሏል"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"የማያ ገጽ አጠቃቀም <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> ተጠቅሟል"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ከጠቅላላ ባትሪ"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"መጨረሻ ላይ ሙሉ ኃይል ከነበረበት ጊዜ ጀምሮ ያለው ትንታኔ"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"ማሳወቂያዎች"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"የላቀ"</string>
<string name="profile_section_header" msgid="2320848161066912001">"የስራ ማሳወቂያዎች"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"የአዶ ባጆችን ያሳዩ"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"ብርሃን አብለጭለጭ"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"በማያ ገጽ ቁልፉ ላይ"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ሁሉንም የማሳወቂያ ይዘቶችን አሳይ"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ምድቦች ተሰርዘዋል</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ምድቦች ተሰርዘዋል</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"የማሳወቂያ ባጆች"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"በርቷል"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"ጠፍቷል"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"ሁሉንም አግድ"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"እነዚህን ማሳወቂያዎች በጭራሽ አታሳይ"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"ማሳወቂያዎች አሳይ"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"በጥላ ወይም በጎን ያሉ ውጫዊ መሣሪያዎች ላይ ማሳወቂያዎችን በጭራሽ አታሳይ"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"የአዶ ባጅ ይፍቀዱ"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"«አትረብሽ»ን ሻር"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"«አትረብሽ» ወደ ቅድሚያ ብቻ በሚቀናበርበት ጊዜ እነዚህ ማሳወቂያዎች እንዲያቋርጡ ይፍቀዱ"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"በማያ ገጽ ቁልፉ ላይ"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"ባትሪን ማትባት"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"የአጠቃቀም ማንቂያዎች"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"ሁሉንም መተግበሪያዎች አሳይ"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"ተጨማሪ መተግበሪያዎችን ደብቅ"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"ሙሉ የመሣሪያ አጠቃቀም አሳይ"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"የመተግበሪያ አጠቃቀም አሳይ"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"አልተባም"</string>
<string name="high_power_on" msgid="6216293998227583810">"አልተባም"</string>
<string name="high_power_off" msgid="3393904131961263278">"የባትሪ አጠቃቀምን አትባ"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"ጨዋታዎች"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"ሌሎች መተግበሪያዎች"</string>
<string name="storage_files" msgid="8581083146777364063">"ፋይሎች"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"የጡባዊ ማከማቻ"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"የስልክ ማከማቻ"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"ከ<xliff:g id="TOTAL">%1$s</xliff:g> ጥቅም ላይ የዋለው"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"ጥቅም ላይ ውሏል"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 95321a0..32aa721 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1934,7 +1934,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"هل تريد استخدام <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"خدمة <xliff:g id="SERVICE">%1$s</xliff:g> تحتاج إلى:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"نظرًا لأن هناك تطبيقًا يحجب طلب الإذن، لا تستطيع الإعدادات التحقق من ردك."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"بسبب عرض تطبيق آخر في أعلى هذه الخيارات، لا يمكن أن تستجيب الإعدادات للإجراء الذي اتخذته."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"في حالة تمكين <xliff:g id="SERVICE">%1$s</xliff:g>، لن يستخدم جهازك ميزة قفل الشاشة لتحسين تشفير البيانات."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"لن يستخدم جهازك ميزة قفل الشاشة لتحسين تشفير البيانات، وذلك لأنك قد مكّنت إحدى خدمات إمكانية الوصول."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد النقش."</string>
@@ -1998,6 +1997,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"البحث عن شبكات الجوال"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"قبل <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"استخدام التطبيق منذ الشحن الكامل (قبل <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"استخدام الجهاز منذ الشحن الكامل (قبل <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"مقدار وقت تشغيل الشاشة منذ الشحن الكامل"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"استخدام الجهاز منذ الشحن الكامل"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"استخدام البطارية عند فصل الطاقة"</string>
@@ -2089,6 +2089,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"استخدام زائد عن الحد للطاقة"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> مللي أمبير في الساعة"</string>
<string name="battery_used_for" msgid="2690821851327075443">"تم استخدامه لمدة <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"استخدام الشاشة <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> مستخدمة بواسطة <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> من إجمالي شحن البطارية"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"تفاصيل الاستخدام منذ آخر شحن كامل"</string>
@@ -2885,7 +2886,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"الإشعارات"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"متقدمة"</string>
<string name="profile_section_header" msgid="2320848161066912001">"إشعارات العمل"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"السماح بشارات الرمز"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"وميض الضوء"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"على شاشة التأمين"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"عرض كل محتوى الإشعارات"</string>
@@ -2972,14 +2974,16 @@
<item quantity="other">تم حذف <xliff:g id="COUNT_1">%d</xliff:g> فئة</item>
<item quantity="one">تم حذف فئة واحدة (<xliff:g id="COUNT_0">%d</xliff:g>)</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"علامات الإشعارات"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"تشغيل"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"إيقاف"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"حظر الكل"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"عدم عرض هذه الإشعارات"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"عرض الإشعارات"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"عدم عرض الإشعارات في مركز الإشعارات أو على الأجهزة المرتبطة بحساب Google"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"السماح بشارة الرمز"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"إلغاء وضع \"عدم الإزعاج\""</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"السماح لهذه الإشعارات بمتابعة المقاطعة عند تعيين وضع \"عدم الإزعاج\" على \"ذات الأولوية فقط\""</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"على شاشة التأمين"</string>
@@ -3236,8 +3240,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"تحسين البطارية"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"تنبيهات الاستخدام"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"إظهار جميع التطبيقات"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"إخفاء التطبيقات الإضافية"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"عرض الاستخدام الكامل للجهاز"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"عرض استخدام التطبيق"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"بدون تحسين"</string>
<string name="high_power_on" msgid="6216293998227583810">"بدون تحسين"</string>
<string name="high_power_off" msgid="3393904131961263278">"يحسِّن من استخدام البطارية"</string>
@@ -3771,8 +3775,6 @@
<string name="storage_games" msgid="7703159201697117621">"الألعاب"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"تطبيقات أخرى"</string>
<string name="storage_files" msgid="8581083146777364063">"الملفات"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"سعة تخزين الجهاز اللوحي"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"سعة تخزين الهاتف"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"سعة تخزين مستخدمة من <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"مستخدمة"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 8b271af..14b5370 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> xidməti istifadə edilsin?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> etməlidir:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Çünki, tətbiq icazə sorğusunu anlaşılmaz edir. Ayarlar cavabınızı doğrulaya bilməz."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Digər tətbiqlər bu seçimlərin üstündə göstərildiyinə görə Ayarlar əməliyyata cavab verə bilmir."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> aktiv olarsa, cihazınız data şifrələnməsini genişləndirmək üçün ekran kilidini istifadə etməyəcək."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Girişimlik xidmətini aktiv etdiyiniz üçün cihazınız data şifrələnməsini genişləndirmək üçün ekran kilidini istifadə etməyəcək."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> xidmətinin aktiv edilməsi şifrələnməyə təsir etdiyi üçün modelinizi təsdiq etməlisiniz."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Mobil şəbəkənin skan edilməsi"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> əvvəl"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Tam doldurmadan sonrakı tətbiq istifadəsi (<xliff:g id="TIME">^1</xliff:g> əvvəl)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Tam doldurmadan sonra tətbiq istifadəsi (<xliff:g id="TIME">^1</xliff:g> əvvəl)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Dam doldurmadan sonra ekranın vaxtı miqdarı aktiv edilib"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Tam doldurmadan sonrakı cihaz istifadəsi"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Elektrik şəbəkəsindən çıxarılandan sonra batareya istifadəsi"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Artıq hesablanmış enerji istifadəsi"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> üçün istifadə olundu"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Ekran istifadəsi <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> batareya istifadə etdi"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> batareya istifadəsi"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Sonuncu tam doldurmadan sonrakı istifadə problemi"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Bildirişlər"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Qabaqcıl"</string>
<string name="profile_section_header" msgid="2320848161066912001">"İş bildirişləri"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"İkona nişanlarına icazə verin"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Parıltı işığı"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Ekran kilidində"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bütün bildiriş məzmunlarını göstər"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kateqoriya silindi</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kateqoriya silindi</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Bildiriş nişanı"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Aktiv"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Deaktiv"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Hamısını bloklayın"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Bu bildirişlər heç vaxt göstərilməsin"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Bildirişləri göstərin"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Bildirişləri heç vaxt ekranda və ya periferik cihazlarda göstərməyin."</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"İkona nişanına icazə verin"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Narahat etməyin\" seçimini əvəzləyin"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Narahat Etməyin seçimi Yalnız Prioritet üçün ayarlandıqda bildirişlərin mane olmasına imkan verin"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Ekran kilidində"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Batareya optimallaşdırılması"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"İstifadə siqnalları"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Bütün tətbiqləri göstərin"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Əlavə tətbiqləri gizlədin"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Tam cihaz istifadəsini göstərin"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Tətbiq istifadəsini göstərin"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Enerjiyə qənaət etmir"</string>
<string name="high_power_on" msgid="6216293998227583810">"Enerjiyə qənaət etmir"</string>
<string name="high_power_off" msgid="3393904131961263278">"Batareya istifadəsi optimallaşdırılır"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Oyunlar"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Digər tətbiqlər"</string>
<string name="storage_files" msgid="8581083146777364063">"Fayllar"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Planşet yaddaşı"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefon yaddaşı"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> istifadə olunub"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"işlənib"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index f6d7562..1d047df 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -1874,7 +1874,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Želite li da koristite <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> treba:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Pošto aplikacija skriva zahtev za dozvolu, Podešavanja ne mogu da verifikuju odgovor."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Podešavanja ne mogu da odgovore na radnju jer se neka druga aplikacija prikazuje preko ovih opcija."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ako uključite <xliff:g id="SERVICE">%1$s</xliff:g>, uređaj neće koristiti zaključavanje ekrana da bi poboljšao šifrovanje podataka."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Pošto ste uključili uslugu pristupačnosti, uređaj neće koristiti zaključavanje ekrana da bi poboljšao šifrovanje podataka."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Pošto uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifrovanje podataka, treba da potvrdite šablon."</string>
@@ -1935,6 +1934,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilnih mreža"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"pre <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Korišćenje aplikacije od potpunog punjenja (pre <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Korišćenje uređaja od potpunog punjenja (pre <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Količina vremena tokom kojeg je ekran bio uključen od potpunog punjenja"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Korišćenje uređaja od potpunog punjenja"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Korišćenje baterije nakon isključivanja"</string>
@@ -2026,6 +2026,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekomerno izračunata potrošnja energije"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Koristi se <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Korišćenje ekrana: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> koristi <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupnog kapaciteta baterije"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pregled od poslednjeg potpunog punjenja"</string>
@@ -2804,7 +2805,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Obaveštenja"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Napredna"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Obaveštenja za Work"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Dozvoli značke na ikonama"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Uključi treperenje lampice"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaključanom ekranu"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikaži sav sadržaj obaveštenja"</string>
@@ -2882,14 +2884,16 @@
<item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorije su izbrisane</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorija je izbrisano</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Značke obaveštenja"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Uključeno"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Isključeno"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Nikada ne prikazuj ova obaveštenja"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Prikazuj obaveštenja"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Obaveštenja se nikada ne prikazuju na traci ili periferijskim uređajima"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Dozvoli značku na ikoni"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Zameni režim Ne uznemiravaj"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Omogućava da ova obaveštenja nastave da se prikazuju kada je režim Ne uznemiravaj podešen na opciju Samo prioritetni prekidi"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom ekranu"</string>
@@ -3128,8 +3132,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimizacija baterije"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Obaveštenja o korišćenju"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Prikaži sve aplikacije"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij dodatne aplikacije"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Prikaži kompletno korišćenje uređaja"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Prikaži korišćenje aplikacije"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
<string name="high_power_on" msgid="6216293998227583810">"Bez optimizacije"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimizacija korišćenja baterije"</string>
@@ -3618,8 +3622,6 @@
<string name="storage_games" msgid="7703159201697117621">"Igre"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
<string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Memorija tableta"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Memorija telefona"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Iskorišćeno od ukupno <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"u upot."</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 692f78d..0b9f0ec 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1895,7 +1895,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Выкарыстоўваць службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> патрабуе:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Паверх запыту дазволу адлюстроўваецца дадатак, таму ваш адказ не можа быць правераны ў Наладах."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Іншая праграма адлюстроўваецца паверх гэтых опцый, таму налады не адказваюць на ваша дзеянне."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Калі вы ўключыце <xliff:g id="SERVICE">%1$s</xliff:g>, прылада не будзе выкарыстоўваць блакіроўку экрана для паляпшэння шыфравання даных."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Вы ўключылі службу доступу, таму ваша прылада не будзе выкарыстоўваць блакіроўку экрана для паляпшэння шыфравання даных."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Уключэнне <xliff:g id="SERVICE">%1$s</xliff:g> уплывае на шыфраванне даных, таму вы павінны пацвердзіць свой графічны ключ."</string>
@@ -1957,6 +1956,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Сканіраванне мабільнай сеткі"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> таму"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Спажыванне праграмамі з моманту поўнай зарадкі (<xliff:g id="TIME">^1</xliff:g> таму)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Спажыванне прыладай з моманту поўнай зарадкі (<xliff:g id="TIME">^1</xliff:g> таму)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Колькасць часу, калі экран быў уключаны, з моманту поўнай зарадкі"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Выкарыстанне прылады з моманту поўнай зарадкі"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Выкарыстанне акумулятару з моманту адключэння"</string>
@@ -2048,6 +2048,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Няўлічанае спажыванне энергіі"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАг"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Выкарыстана на працягу <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Выкарыстанне экрана: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> выкарыстана праграмай <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ад усяго зараду"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Разбіўка з моманту апошняй поўнай зарадкі"</string>
@@ -2832,7 +2833,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Апавяшчэнні"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Пашыраныя"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Апавяшчэнні працоўнага профілю"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Дазволіць паказваць паметкі на значку"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Мігценне святла"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"На экране блакіроўкі"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Паказваць усё змесціва ў апавяшчэннях"</string>
@@ -2913,14 +2915,16 @@
<item quantity="many">Выдалены <xliff:g id="COUNT_1">%d</xliff:g> катэгорый</item>
<item quantity="other">Выдалены <xliff:g id="COUNT_1">%d</xliff:g> катэгорыі</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Мадыфікатары значка ў якасці апавяшч-няў"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Уключаны"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Адключаны"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Блакіраваць усё"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Ніколі не паказваць гэтыя апавяшчэнні"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Паказваць апавяшчэнні"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Ніколі не паказваць апавяшчэнні на \"шторцы\" або на перыферыйных прыладах"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Дазволіць паказваць паметкі на значку"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ігнараваць рэжым «Не турбаваць»"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Паказваць гэтыя апавяшчэнні, калі ў рэжыме «Не турбаваць» выбрана «Толькі прыярытэтныя»"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На экране блакіроўкі"</string>
@@ -3166,8 +3170,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Аптымізацыя акумулятара"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Абвесткі аб выкарыстанні"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Паказваць усе праграмы"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Не паказваць дадатк. праграмы"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Паказаць поўнае выкарыстанне прылады"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Паказаць спажыванне праграмамі"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Не аптымізаваныя"</string>
<string name="high_power_on" msgid="6216293998227583810">"Не аптымізавана"</string>
<string name="high_power_off" msgid="3393904131961263278">"Аптымізацыя выкарыстання акумулятара"</string>
@@ -3671,8 +3675,6 @@
<string name="storage_games" msgid="7703159201697117621">"Гульні"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Іншыя праграмы"</string>
<string name="storage_files" msgid="8581083146777364063">"Файлы"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Сховішча планшэта"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Сховішча тэлефона"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Выкарыстана з <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"занята"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3708013..3ce80a1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Да се използва ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> изисква:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"От Настройки не може да се получи потвърждение за отговора ви, защото заявката за разрешение се прикрива от приложение."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Тъй като друго приложение се показва върху тези опции, Настройки не може да отговори на действието ви."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ако включите <xliff:g id="SERVICE">%1$s</xliff:g>, устройството ви няма да използва заключването на екрана ви за подобряване на шифроването на данни."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Тъй като сте включили услуга за достъпност, устройството ви няма да използва заключването на екрана ви за подобряване на шифроването на данни."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Тъй като включването на <xliff:g id="SERVICE">%1$s</xliff:g> засяга шифроването на данни, трябва да потвърдите фигурата си."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Сканиране за мобилни мрежи"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Преди <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Използване от приложенията след пълно зареждане (преди <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Използване на устройството след пълно зареждане (преди <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Колко време е бил включен екранът след последното пълно зареждане"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Използване на устройството след пълно зареждане"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Употреба на батерията след изключването"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Отчетено в повече захранване"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАч"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Използвано за <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Използване на екрана: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"Използван капацитет от <xliff:g id="APP">%2$s</xliff:g>: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> от общия капацитет на батерията"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Разбивка след последното пълно зареждане"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Известия"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Разширени"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Служебни известия"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Разрешав. на значки за иконата"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Премигваща светлина"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Върху заключения екран"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Цялото съдържание от известията"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> категории са изтрити</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> категория е изтрита</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Значки за известия"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Включено"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Изключено"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Блокиране на всички"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Без показване на тези известия"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Показване на известията"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Без показване на известия в падащия панел или на периферни устройства"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Разрешаване на значка за иконата"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Отмяна на „Не безпокойте“"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Разрешаване на тези известия да продължат да ви прекъсват, когато за режим „Не безпокойте“ е зададено „Само с приоритет“."</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Върху заключения екран"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Оптимизиране на батерията"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Сигнали за употребата"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Показване на всички приложения"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Допълн. приложения: Скриване"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Цялостно използване на у-вото: Показване"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Употреба на прилож.: Показване"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Без оптимизиране"</string>
<string name="high_power_on" msgid="6216293998227583810">"Без оптимизиране"</string>
<string name="high_power_off" msgid="3393904131961263278">"Разходът на батерията се оптимизира"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Игри"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Други приложения"</string>
<string name="storage_files" msgid="8581083146777364063">"Файлове"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Хранилище на таблета"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Хранилище на телефона"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"използвани от <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"ползв."</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index d36f152..6311d3f 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ব্যবহার করবেন?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> কে এটি করতে হবে:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"একটি অ্যাপ্লিকেশান কোনো অনুমোদনের অনুরোধকে অস্পষ্ট করছে, তাই সেটিংস আপনার প্রতিক্রিয়া যাচাই করতে পারেনি৷"</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"অন্য একটি অ্যাপ এই বিকল্পগুলির উপরে ডিসপ্লে হচ্ছে বলে সেটিংস আপনার দেওয়া ইনপুট বুঝতে পারছে না।"</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"আপনি যদি <xliff:g id="SERVICE">%1$s</xliff:g> চালু করেন, তাহলে ডেটা এনক্রিপশান উন্নত করতে আপনার ডিভাইস আপনার স্ক্রীন লক ব্যবহার করবে না৷"</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"যেহেতু আপনি অ্যাক্সেসযোগ্যতা পরিষেবা চালু করেছেন, তাই ডেটা এনক্রিপশান উন্নত করতে আপনার ডিভাইস আপনার স্ক্রীন লক ব্যবহার করবে না৷"</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"কারণ <xliff:g id="SERVICE">%1$s</xliff:g> চালু করলে সেটি ডেটা এনক্রিপশন প্রভাবিত করে, আপনাকে আপনার প্যাটার্ন নিশ্চিত করতে হবে।"</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"মোবাইল নেটওয়ার্ক স্ক্যান করা"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> আগে"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"সম্পূর্ণ চার্জ হওয়া থেকে অ্যাপের ব্যবহার (<xliff:g id="TIME">^1</xliff:g> আগে)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"সম্পূর্ণ চার্জ হওয়া থেকে ডিভাইসের ব্যবহার (<xliff:g id="TIME">^1</xliff:g> আগে)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"সম্পূর্ণ চার্জ হওয়ার সময় থেকে স্ক্রিন কত সময় চালু রয়েছে"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"সম্পূর্ণ চার্জ করার সময় থেকে ডিভাইসের ব্যবহার"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"আনপ্লাগ করার পর থেকে ব্যাটারি ব্যবহার"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"নির্ধারিত শক্তির থেকে বেশী শক্তির ব্যবহার"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> এর জন্য ব্যবহার করা হয়েছে"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"স্ক্রিনের ব্যবহার <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> এর দ্বারা <xliff:g id="PERCENT">%1$s</xliff:g> ব্যবহার করা হয়েছে"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"সামগ্রিক ব্যাটারির <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"শেষবার সম্পূর্ণ চার্জ দেওয়ার পর থেকে ব্যাটারির ব্যবহার"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"বিজ্ঞপ্তি"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"উন্নত"</string>
<string name="profile_section_header" msgid="2320848161066912001">"কর্মস্থলের বিজ্ঞপ্তিগুলি"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"আইকন ব্যাজের অনুমতি দিন"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"মিটমিট করা আলো"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"লক স্ক্রীনে"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"সমস্ত বিজ্ঞপ্তির সামগ্রীগুলি দেখান"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>টি বিভাগ মোছা হয়েছে</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>টি বিভাগ মোছা হয়েছে</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"বিজ্ঞপ্তি ব্যাজ"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"চালু আছে"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"বন্ধ আছে"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"সমস্ত অবরুদ্ধ করুন"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"এই বিজ্ঞপ্তিগুলি কখনোই দেখানো হবে না"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"বিজ্ঞপ্তিগুলি দেখান"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"ছায়া বা পেরিফেরাল ডিভাইসে কখনও বিজ্ঞপ্তিগুলি দেখায় না"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"আইকন ব্যাজের অনুমতি দিন"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'বিরক্ত করবেন না\' ওভাররাইড করুন"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"যখন শুধুমাত্র অগ্রাধিকার সাপেক্ষে \'বিরক্ত করবেন না\' সেট করা থাকবে তখন বাধাদানের ক্ষেত্রে এই বিজ্ঞপ্তিগুলিকে চালু থাকতে দিন"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"লক স্ক্রীনে"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"ব্যাটারি অপ্টিমাইজেশান"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"ব্যবহারের সতর্কতা"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"সব অ্যাপ দেখুন"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"অতিরিক্ত অ্যাপগুলি লুকান"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"সম্পূর্ণ ডিভাইসের ব্যবহার দেখান"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"অ্যাপের ব্যবহার দেখান"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"অপ্টিমাইজ করা নেই"</string>
<string name="high_power_on" msgid="6216293998227583810">"অপ্টিমাইজ করা নেই"</string>
<string name="high_power_off" msgid="3393904131961263278">"ব্যাটারির ব্যবহার অপ্টিমাইজ করা হচ্ছে"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"গেম্স"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"অন্যান্য অ্যাপ্লিকেশান"</string>
<string name="storage_files" msgid="8581083146777364063">"ফাইল"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ট্যাবলেটের সঞ্চয়স্থান"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ফোনের সঞ্চয়স্থান"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> এর মধ্যে ব্যবহার হয়েছে"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"ব্যবহৃত"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index e48441f..73e94ac 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -171,7 +171,7 @@
<string name="proxy_clear_text" msgid="5555400754952012657">"Obriši"</string>
<string name="proxy_port_label" msgid="5655276502233453400">"Priključak za proksi"</string>
<string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Zaobilazni proksi za"</string>
- <string name="proxy_defaultView_text" msgid="6387985519141433291">"Obnovi zadane vrijednosti"</string>
+ <string name="proxy_defaultView_text" msgid="6387985519141433291">"Vrati na zadano"</string>
<string name="proxy_action_text" msgid="2957063145357903951">"Gotovo"</string>
<string name="proxy_hostname_label" msgid="8490171412999373362">"Proksi hostname"</string>
<string name="proxy_error" msgid="8926675299638611451">"Pažnja"</string>
@@ -436,8 +436,8 @@
<string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Šifriranje je prekinuto te se ne može završiti. Zbog toga podaci sa vašeg tableta više nisu dostupni. \n\n Da biste nastavili koristiti tablet, treba da izvršite vraćanje tableta na fabričke postavke. Nakon što izvršite postavke tableta nakon vraćanja na fabričke postavke, moći ćete vratiti sve podatke za koje postoji sigurnosna kopija na Google računu."</string>
<string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Šifriranje je prekinuto te se ne može završiti. Zbog toga podaci sa vašeg telefona više nisu dostupni. \n\nDa biste nastavili koristiti telefon, treba da izvršite vraćanje telefona na fabričke postavke. Nakon što izvršite postavke telefona nakon vraćanja na fabričke postavke, moći ćete vratiti sve podatke za koje postoji sigurnosna kopija na Google računu."</string>
<string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Dešifriranje nije uspjelo"</string>
- <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti tablet, morate izvršiti ponovno postavljanje na fabričke postavke. Prilikom podešavanja tableta nakon ponovnog postavljanja, imat ćete priliku da obnovite podatke čija rezervna kopija je spremljena u vaš Google račun."</string>
- <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti telefon, morate izvršiti ponovno postavljanje na fabričke postavke. Prilikom podešavanja telefona nakon ponovnog postavljanja, imat ćete priliku da obnovite podatke čija rezervna kopija je spremljena u vaš Google račun."</string>
+ <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti tablet, morate izvršiti vraćanje na fabričke postavke. Prilikom podešavanja tableta nakon ponovnog postavljanja, imat ćete priliku da vratite podatke čija sigurnosna kopija je spremljena u vaš Google račun."</string>
+ <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti telefon, morate izvršiti vraćanje na fabričke postavke. Prilikom podešavanja telefona nakon ponovnog postavljanja, imat ćete priliku da vratite podatke čija sigurnosna kopija je spremljena u vaš Google račun."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Promijeni način unosa"</string>
<string name="suggested_lock_settings_title" msgid="8971630898700461034">"Postavite zaključavanje ekrana"</string>
<string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Zaštitite svoj uređaj"</string>
@@ -1312,7 +1312,7 @@
<string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ovo će izbrisati sve podatke iz "<b>"interne memorije"</b>" vašeg telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"sistemske i aplikacijske podatke i postavke"</li>\n<li>"preuzete aplikacije"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni u sljedeće račune:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Drugi korisnici su prisutni na ovom uređaju.\n"</string>
- <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Fotografije"</li>\n<li>"Ostali korisnički podaci"</li></string>
+ <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"muziku"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
<string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
<string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"SD kartica"</b>" treba biti izbrisana."</string>
<string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Izbriši USB pohranu"</string>
@@ -1879,7 +1879,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Koristiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"Usluga <xliff:g id="SERVICE">%1$s</xliff:g> treba da:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Aplikacija nije dala dozvolu za zahtjev pa postavke ne mogu potvrditi vaš odgovor."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Postavke ne reagiraju na vašu radnju jer druga aplikacija prekriva ove opcije."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ukoliko uključite uslugu <xliff:g id="SERVICE">%1$s</xliff:g>, uređaj neće koristiti zaključavanje ekrana za poboljšanje šifriranja podataka."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Pošto ste uključili uslugu pristupačnosti, vaš uređaj neće koristiti zaključavanje ekrana za poboljšanje šifriranja podataka."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifriranje podataka, stoga je potrebno da potvrdite svoj obrazac."</string>
@@ -1940,6 +1939,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilne mreže"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Prije <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Korištenje aplikacije od potpune punjenosti (prije <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Korištenje uređaja od potpune napunjenosti (prije <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Vrijeme koliko je ekran uključen od potpune napunjenosti"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Korištenje uređaja od potpune napunjenosti"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Potrošnja baterije od isključivanja s napajanja"</string>
@@ -2032,6 +2032,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Prekoračenje potrošnje energije"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Korišteno <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Korištenje ekrana <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"Aplikacija <xliff:g id="APP">%2$s</xliff:g> koristi <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupne baterije"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pregled od posljednje potpune napunjenosti"</string>
@@ -2173,7 +2174,7 @@
<string name="emergency_tone_title" msgid="1055954530111587114">"Ton za hitne situacije"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Postavi ponašanje prilikom upućivanja poziva za hitne situacije"</string>
<string name="privacy_settings_title" msgid="2978878794187459190">"Sigurnosno kopiranje"</string>
- <string name="backup_section_title" msgid="7952232291452882740">"Rezervna kopija i obnavljanje"</string>
+ <string name="backup_section_title" msgid="7952232291452882740">"Sigurnosna kopija i vraćanje"</string>
<string name="personal_data_section_title" msgid="7815209034443782061">"Lični podaci"</string>
<string name="backup_data_title" msgid="1239105919852668016">"Izrada sigurnosnih kopija podataka"</string>
<string name="backup_data_summary" msgid="708773323451655666">"Pravite sigurnosne kopije podataka aplikacija, lozinki za Wi-Fi te drugih postavki na Google serverima"</string>
@@ -2696,7 +2697,7 @@
<string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Povezani uređaji"</string>
<string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, emitiranje, NFC"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obavještenja"</string>
- <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Dopuštenja, zadane aplikacije"</string>
+ <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Odobrenja, zadane aplikacije"</string>
<string name="account_dashboard_title" msgid="4936890821712178853">"Korisnici i računi"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Zadane aplikacije"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Jezici, vrijeme, sigurnosna kopija, ažuriranja"</string>
@@ -2817,7 +2818,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Obavještenja"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Napredno"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Obavještenja za posao"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Dozvoli značke ikona"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Trepćuće svjetlo"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaključanom ekranu"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikazuj sav sadržaj obavještenja"</string>
@@ -2895,14 +2897,16 @@
<item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorije su izbrisane</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorija je izbrisano</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Značke obavještenja"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Uključeno"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Isključeno"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Nikada ne prikazuj ova obavještenja"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Prikaži obavještenja"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Nikad ne prikazuj obavještenja u nijansi ili na perifernim uređajima"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Dozvoli značku ikone"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Premosti podešenja usluge Ne ometaj"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Dozvolite da se ova obavještenja i dalje čuju kada je opcija Ne ometaj podešena na Samo prioritetna obavještenja"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom ekranu"</string>
@@ -3061,9 +3065,9 @@
<string name="notification_summary_level" msgid="2726571692704140826">"Nivo %d"</string>
<string name="notification_summary_channel" msgid="5831124672372023524">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
<plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
- <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljena dozvola</item>
- <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljene dozvole</item>
- <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljenih dozvola</item>
+ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljeno odobrenje</item>
+ <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljena odobrenja</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljenih odobrenja</item>
</plurals>
<plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
<item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g> odobrenja je dato</item>
@@ -3071,12 +3075,12 @@
<item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g> odobrenja je dato</item>
</plurals>
<plurals name="runtime_permissions_additional_count" formatted="false" msgid="931276038884210752">
- <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dodatna dozvola</item>
- <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dodatne dozvole</item>
- <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dodatnih dozvola</item>
+ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dodatno odobrenje</item>
+ <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dodatna odobrenje</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dodatnih odobrenja</item>
</plurals>
- <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nema dodijeljenih dozvola"</string>
- <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nema zatraženih dozvola"</string>
+ <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nema dodijeljenih odobrenja"</string>
+ <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nema zatraženih odobrenja"</string>
<string name="filter_all_apps" msgid="1988403195820688644">"Sve aplikacije"</string>
<string name="filter_enabled_apps" msgid="5395727306799456250">"Instalirane aplikacije"</string>
<string name="filter_instant_apps" msgid="574277769963965565">"Instant-aplikacije"</string>
@@ -3142,8 +3146,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimizacija baterije"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Obavještenja o upotrebi"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Prikaži sve aplikacije"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij dodatne aplikacije"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Prikaži kompletno korištenje uređaja"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Prikaži korištenje aplikacije"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
<string name="high_power_on" msgid="6216293998227583810">"Nije optimiziran"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimizacija potrošnje baterije"</string>
@@ -3235,15 +3239,15 @@
<string name="keywords_vr_listener" msgid="7441221822576384680">"vr slušalac virtuelne realnosti stereo pomoćna usluga"</string>
<string name="keywords_system_alert_window" msgid="5049498015597864850">"sistem upozorenje prozor dijaloški okvir prikazivanje preko drugih aplikacija"</string>
<string name="overlay_settings" msgid="6930854109449524280">"Prikaz preko drugih aplikacija"</string>
- <string name="system_alert_window_summary" msgid="602892301318324492">"Aplikacije s dozvolom za prikaz preko drugih aplikacija: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
- <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije s dozvolom"</string>
+ <string name="system_alert_window_summary" msgid="602892301318324492">"Aplikacije s odobrenjem za prikaz preko drugih aplikacija: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
+ <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije s odobrenjem"</string>
<string name="system_alert_window_on" msgid="2939489395109048888">"Da"</string>
<string name="system_alert_window_off" msgid="6189115687233061992">"Ne"</string>
<string name="install_other_apps" msgid="6986686991775883017">"Instaliranje nepoznatih aplikacija"</string>
<string name="keywords_install_other_apps" msgid="761078076051006558">"instaliranje aplikacije nepoznati izvori"</string>
<string name="write_settings" msgid="4797457275727195681">"Izmjena postavki sistema"</string>
<string name="keywords_write_settings" msgid="6415597272561105138">"pisati izmijeniti sistemske postavke"</string>
- <string name="write_settings_summary" msgid="4302268998611412696">"Aplikacije sa dozvolom za mijenjanje postavki sistema: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
+ <string name="write_settings_summary" msgid="4302268998611412696">"Aplikacije sa odobrenjem za mijenjanje postavki sistema: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
<string name="filter_install_sources_apps" msgid="3102976274848199118">"Mogu instalirati druge aplikacije"</string>
<string name="filter_write_settings_apps" msgid="2914615026197322551">"Mogu mijenjati postavke sistema"</string>
<string name="write_settings_title" msgid="4232152481902542284">"Mogu mijenjati postavke sistema"</string>
@@ -3574,8 +3578,8 @@
<item quantity="other">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
</plurals>
<string name="enterprise_privacy_location_access" msgid="4158197200885270634">"Odobrenja za lokacije"</string>
- <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"Dopuštenja za mikrofon"</string>
- <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"Dopuštenja za kameru"</string>
+ <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"Odobrenja za mikrofon"</string>
+ <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"Odobrenja za kameru"</string>
<string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"Zadane aplikacije"</string>
<plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
@@ -3632,8 +3636,6 @@
<string name="storage_games" msgid="7703159201697117621">"Igre"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
<string name="storage_files" msgid="8581083146777364063">"Fajlovi"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Pohrana na tabletu"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Pohrana na telefonu"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Iskorišteno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"iskor."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 84db437..4ce526d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -792,7 +792,7 @@
<string name="no_internet_access_text" msgid="7133561752896706392">"Aquesta xarxa no té accés a Internet. Vols mantenir-hi la connexió?"</string>
<string name="no_internet_access_remember" msgid="4697314331614625075">"No ho tornis a preguntar en aquesta xarxa"</string>
<string name="lost_internet_access_title" msgid="6228530645663584505">"La Wi‑Fi no està connectada a Internet"</string>
- <string name="lost_internet_access_text" msgid="9029649339816197345">"Pots canviar a la xarxa de telefonia mòbil sempre que la connexió Wi‑Fi no sigui prou bona. És possible que s\'apliquin càrrecs per ús de dades."</string>
+ <string name="lost_internet_access_text" msgid="9029649339816197345">"Pots canviar a la xarxa de telefonia mòbil sempre que la connexió Wi‑Fi no sigui prou bona. És possible que s\'hi apliquin càrrecs per ús de dades."</string>
<string name="lost_internet_access_switch" msgid="2262459569601190039">"Canvia a la xarxa de telefonia mòbil"</string>
<string name="lost_internet_access_cancel" msgid="338273139419871110">"Mantén la connexió a la Wi‑Fi"</string>
<string name="lost_internet_access_persist" msgid="7634876061262676255">"No ho mostris mai més"</string>
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Vols fer servir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necessita:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Com que hi ha una aplicació que oculta una sol·licitud de permís, no es pot verificar la teva resposta des de la configuració."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"L\'aplicació Configuració no pot realitzar l\'acció perquè hi ha una altra aplicació que s\'està mostrant a sobre d\'aquestes opcions."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si actives <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositiu no farà servir el bloqueig de pantalla per millorar l\'encriptació de dades."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Com que has activat un servei d\'accessibilitat, el teu dispositiu no farà servir el bloqueig de pantalla per millorar l\'encriptació de dades."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Cal que confirmis el patró perquè l\'activació del servei <xliff:g id="SERVICE">%1$s</xliff:g> afecta l\'encriptació de les dades."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Cerca de xarxes de telefonia mòbil"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Fa <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Ús d\'aplicacions des de l\'última càrrega completa (fa <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Ús del dispositiu des de l\'última càrrega completa (fa <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Temps que la pantalla ha estat activa des de l\'última càrrega completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Ús del dispositiu des de l\'última càrrega completa"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Ús de la bateria des que s\'ha desconnectat"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Consum d\'energia comptabilitzat més d\'una vegada"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"En ús durant <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Ús de la pantalla: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilitzat per <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> d\'ús de la bateria"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglossament des de l\'última càrrega completa"</string>
@@ -2219,7 +2220,7 @@
<string name="sync_failed" msgid="1696499856374109647">"La sincronització ha fallat"</string>
<string name="sync_active" msgid="8476943765960863040">"Sincronització activa"</string>
<string name="account_sync_settings_title" msgid="5131314922423053588">"Sincronització"</string>
- <string name="sync_is_failing" msgid="1591561768344128377">"La sincronització té problemes. Es tornarà a activar aviat."</string>
+ <string name="sync_is_failing" msgid="1591561768344128377">"La sincronització té problemes. Tornarà a funcionar aviat."</string>
<string name="add_account_label" msgid="7811707265834013767">"Afegeix un compte"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"El perfil professional encara no està disponible."</string>
<string name="work_mode_label" msgid="5794470908668593961">"Mode de feina"</string>
@@ -2655,7 +2656,7 @@
<string name="network_dashboard_title" msgid="4771589228992391573">"Xarxa i Internet"</string>
<string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mòbil, ús de dades i punt d\'accés Wi-Fi"</string>
<string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositius connectats"</string>
- <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+ <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, emissió, NFC"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicacions i notificacions"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, aplicacions predeterminades"</string>
<string name="account_dashboard_title" msgid="4936890821712178853">"Usuaris i comptes"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificacions"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avançada"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificacions de la feina"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Permet les insígnies d\'icona"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Llum intermitent"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"A la pantalla de bloqueig"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tot el contingut de les notificacions"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories suprimides</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria suprimida</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Insígnies de notificació"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Activat"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Desactivades"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Bloqueja-ho tot"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"No mostris mai aquestes notificacions"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Mostra notificacions"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"No mostris mai notificacions a l\'àrea de notificacions ni en dispositius perifèrics"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Permet el símbol de la icona"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Fes prioritària"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permet que aquestes notificacions continuïn interrompent quan el mode No molestis estigui configurat com a Només amb prioritat"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"A la pantalla de bloqueig"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimització de la bateria"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'ús"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Mostra totes les aplicacions"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Amaga aplicacions addicionals"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Mostra l\'ús complet del dispositiu"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Mostra l\'ús de l\'aplicació"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Sense optimitzar"</string>
<string name="high_power_on" msgid="6216293998227583810">"No optimitzen la bateria"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimitza l\'ús de la bateria"</string>
@@ -3484,7 +3488,7 @@
<string name="web_action_enable_title" msgid="4051513950976670853">"Aplicacions instantànies"</string>
<string name="web_action_enable_summary" msgid="3108127559723396382">"Obre enllaços en aplicacions, encara que no estiguin instal·lades"</string>
<string name="web_action_section_title" msgid="7364647086538399136">"Aplicacions instantànies"</string>
- <string name="instant_apps_account" msgid="1433620209791992528">"Compte d\'aplicacions instantànies"</string>
+ <string name="instant_apps_account" msgid="1433620209791992528">"Compte per a les aplicacions instantànies"</string>
<string name="domain_url_section_title" msgid="7046835219056428883">"Aplicacions instal·lades"</string>
<string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ara mateix, el gestor d\'emmagatzematge gestiona el teu emmagatzematge"</string>
<string name="account_for_section_header" msgid="5356566418548737121">"Comptes de l\'usuari <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Jocs"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Altres aplicacions"</string>
<string name="storage_files" msgid="8581083146777364063">"Fitxers"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Emmagatzematge tauleta"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Emmagatzematge del telèfon"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Utilitzat de: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"utilitzat"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f5f1d41..ab02210 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1894,7 +1894,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Zapnout <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> potřebuje:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Žádost o oprávnění je blokována jinou aplikací. Nastavení proto vaši odpověď nemůže ověřit."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Nastavení na vaši akci nemůže zareagovat, protože se přes tyto možnosti zobrazuje jiná aplikace."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Pokud zapnete službu <xliff:g id="SERVICE">%1$s</xliff:g>, zařízení nebude používat zámek obrazovky k vylepšení šifrování dat."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Vzhledem k tomu, že jste zapnuli službu přístupnosti, nebude zařízení používat zámek obrazovky k vylepšení šifrování dat."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Protože zapnutí služby <xliff:g id="SERVICE">%1$s</xliff:g> má vliv na šifrování dat, je třeba, abyste potvrdili své gesto."</string>
@@ -1956,6 +1955,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Vyhledávání mobilních sítí"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Před <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Využití aplikací od úplného nabití (před <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Využití zařízení od posledního úplného nabití (před <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Doba, po kterou byla od úplného nabití zapnutá obrazovka"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Využití zařízení od úplného nabití"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Využití baterie od odpojení"</string>
@@ -2047,6 +2047,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadhodnocení spotřeby energie"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Využíváno <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Využití obrazovky: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> bylo použito aplikací <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> z celkové kapacity baterie"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Přehled od posledního úplného nabití"</string>
@@ -2831,7 +2832,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Oznámení"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Rozšířená nastavení"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Pracovní oznámení"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Povolit odznaky na ikonách"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Blikání kontrolky"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na obrazovce uzamčení"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobrazit veškerý obsah oznámení"</string>
@@ -2912,14 +2914,16 @@
<item quantity="other">Bylo smazáno <xliff:g id="COUNT_1">%d</xliff:g> kategorií</item>
<item quantity="one">Byla smazána <xliff:g id="COUNT_0">%d</xliff:g> kategorie</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Odznaky oznámení"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Zapnuto"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Vypnuto"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blokovat vše"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Tato oznámení nikdy nezobrazovat"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Zobrazovat oznámení"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Nezobrazovat oznámení na panelu ani v periferních zařízeních"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Povolit odznak na ikoně"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Přepsat nastavení Nerušit"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Umožnit těmto oznámením vyrušit mě, pokud je v nastavení Nerušit vybrána možnost Pouze prioritní"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na obrazovce uzamčení"</string>
@@ -3164,8 +3168,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimalizace výdrže bat."</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Upozornění na využití"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Zobrazit všechny aplikace"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Skrýt aplikace navíc"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Zobrazit úplné využití zařízení"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Zobrazit využití aplikace"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimalizováno"</string>
<string name="high_power_on" msgid="6216293998227583810">"Neoptimalizováno"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimalizace využívání baterie"</string>
@@ -3669,8 +3673,6 @@
<string name="storage_games" msgid="7703159201697117621">"Hry"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Další aplikace"</string>
<string name="storage_files" msgid="8581083146777364063">"Soubory"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Úložiště tabletu"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Úložiště telefonu"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Využito z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"využito"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5cab08b..b5ff8e1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1617,7 +1617,7 @@
<string name="app_ops_never_used" msgid="9114608022906887802">"(Aldrig brugt)"</string>
<string name="no_default_apps" msgid="2915315663141025400">"Ingen standardapps."</string>
<string name="storageuse_settings_title" msgid="5657014373502630403">"Lagerforbrug"</string>
- <string name="storageuse_settings_summary" msgid="3748286507165697834">"Vis lagerplads, der bruges af apps"</string>
+ <string name="storageuse_settings_summary" msgid="3748286507165697834">"Vis lagerplads, der anvendes af apps"</string>
<string name="service_restarting" msgid="2242747937372354306">"Genstarter"</string>
<string name="cached" msgid="1059590879740175019">"Cachelagret baggrundsproces"</string>
<string name="no_running_services" msgid="2059536495597645347">"Intet kører."</string>
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Vil du bruge <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> har brug for at:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Indstillinger kan ikke bekræfte dit svar, fordi en app tilslører tilladelsesanmodningen."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Da en anden app vises oven på disse valgmuligheder, kan Indstillinger ikke reagere på din handling."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Hvis du aktiverer <xliff:g id="SERVICE">%1$s</xliff:g>, vil enheden ikke benytte skærmlåsen til at forbedre datakrypteringen."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Fordi du har aktiveret en tilgængelighedstjeneste, vil enheden ikke benytte skærmlåsen for at forbedre datakrypteringen."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Fordi det påvirker datakryptering at slå <xliff:g id="SERVICE">%1$s</xliff:g> til, skal du bekræfte dit mønster."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Scanning af mobilnetværk"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"For <xliff:g id="TIME">^1</xliff:g> siden"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Appforbrug siden fuld opladning (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Brug af enheden siden fuld opladning (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Hvor lang tid skærmen har været tændt siden fuld opladning"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Brug af enheden siden fuld opladning"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Batteriforbrug siden afbrydelse"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Overvurderet strømforbrug"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Har været aktiv i <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Skærmtid <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> anvendt af <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> af det samlede batteriforbrug"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Siden sidste fulde opladning"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Underretninger"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avanceret"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Arbejdsunderretninger"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Tillad ikonbadges"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Blinkende lys"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"På låseskærmen"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Vis alt indhold i underretninger"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategori blev slettet</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorier blev slettet</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Underretningsbadges"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Til"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Fra"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Bloker alle"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Vis aldrig disse underretninger"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Vis underretninger"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Vis aldrig underretninger i underretningspanelet eller på eksterne enheder"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Tillad ikonbadge"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Tilsidesæt Forstyr ikke"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lad disse underretninger fortsætte med at afbryde, når Forstyr ikke er slået til med angivelsen Kun prioritet"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"På låseskærmen"</string>
@@ -3000,7 +3004,7 @@
<string name="storage_type_external" msgid="7738894330670001898">"Ekstern lagerplads"</string>
<string name="app_data_usage" msgid="7942375313697452803">"Appens dataforbrug"</string>
<string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> brugt siden <xliff:g id="DATE">%2$s</xliff:g>"</string>
- <string name="storage_used" msgid="7128074132917008743">"Brugt lagerplads"</string>
+ <string name="storage_used" msgid="7128074132917008743">"Anvendt lagerplads"</string>
<string name="change" msgid="6657848623929839991">"Skift"</string>
<string name="change_storage" msgid="600475265207060436">"Skift lager"</string>
<string name="notifications_label" msgid="8543457911148619898">"Appunderretninger"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Batterioptimering"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Underretninger om forbrug"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Vis alle apps"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Skjul ekstra apps"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Vis brug af enheden siden fuld opladning"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Vis appforbrug"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Ikke-optimeret"</string>
<string name="high_power_on" msgid="6216293998227583810">"Ikke-optimeret"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimeret batteriforbrug"</string>
@@ -3236,7 +3240,7 @@
<string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> apps er installeret"</string>
<string name="apps_summary_example" msgid="2118896966712746139">"Der er installeret 24 apps"</string>
<string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> er brugt – <xliff:g id="FREE_SPACE">%2$s</xliff:g> ledig plads"</string>
- <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Intern lagerplads: <xliff:g id="PERCENTAGE">%1$s</xliff:g> er brugt – <xliff:g id="FREE_SPACE">%2$s</xliff:g> ledig plads"</string>
+ <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Intern lagerplads: <xliff:g id="PERCENTAGE">%1$s</xliff:g> er anvendt – <xliff:g id="FREE_SPACE">%2$s</xliff:g> ledig plads"</string>
<string name="display_summary" msgid="6737806235882127328">"Gå i dvale efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> uden aktivitet"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Baggrund, dvale, skriftstørrelse"</string>
<string name="display_summary_example" msgid="9102633726811090523">"Gå i dvale efter 10 minutters inaktivitet"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Spil"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Andre apps"</string>
<string name="storage_files" msgid="8581083146777364063">"Filer"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Din tablets lagerplads"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Lagerplads på telefonen"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Anvendt lagerplads ud af <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"brugt"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a80211b..f6bab5d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1342,7 +1342,7 @@
<string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Kein Tethering"</string>
<string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Tethering nur für maximal <xliff:g id="MAXCONNECTION">%1$d</xliff:g> Geräte möglich"</string>
<string name="bluetooth_untether_blank" msgid="2871192409329334813">"Tethering für <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird deaktiviert."</string>
- <string name="tethering_footer_info" msgid="7287131664937054043">"Über \"Hotspot und Tethering\" kannst du für andere Geräten über das Mobilfunknetz eine Internetverbindung freigeben."</string>
+ <string name="tethering_footer_info" msgid="7287131664937054043">"Über \"Hotspot und Tethering\" kannst du für andere Geräte über das Mobilfunknetz eine Internetverbindung freigeben."</string>
<string name="tethering_help_button_text" msgid="656117495547173630">"Hilfe"</string>
<string name="network_settings_title" msgid="2876509814832830757">"Mobilfunknetz"</string>
<string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilfunktarif"</string>
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> verwenden?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> muss:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Deine Eingabe wird von \"Einstellungen\" nicht erkannt, weil eine App die Berechtigungsanfrage verdeckt."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Deine Aktion kann von \"Einstellungen\" nicht bearbeitet werden, weil eine andere App über diesen Optionen angezeigt wird."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Wenn du <xliff:g id="SERVICE">%1$s</xliff:g> aktivierst, verwendet dein Gerät nicht die Displaysperre, um die Datenverschlüsselung zu verbessern."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Da du eine Bedienungshilfe aktiviert hast, verwendet dein Gerät nicht die Displaysperre, um die Datenverschlüsselung zu verbessern."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Da die Aktivierung von <xliff:g id="SERVICE">%1$s</xliff:g> Auswirkungen auf die Datenverschlüsselung hat, musst du dein Muster bestätigen."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Mobilfunknetzsuche"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"vor <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"App-Verbrauch seit letzter vollständiger Aufladung (vor <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Gerätenutzung seit vollständiger Aufladung (vor <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Aktivierungsdauer des Displays seit letzter vollständiger Aufladung"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Gerätenutzung seit letzter vollständiger Aufladung"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Akkuverbrauch seit dem Ausstecken"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Zu hoch berechneter Stromverbrauch"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Seit <xliff:g id="TIME">^1</xliff:g> verwendet"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Displaynutzung: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> durch <xliff:g id="APP">%2$s</xliff:g> verbraucht"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> des gesamten Akkuverbrauchs"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Verbrauchsdetails seit letzter vollständiger Ladung"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Benachrichtigungen"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Erweitert"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Geschäftliche Benachrichtigungen"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Logosymbole zulassen"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Blinklicht"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Auf dem Sperrbildschirm"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Gesamten Benachrichtigungsinhalt anzeigen"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> Kategorien gelöscht</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> Kategorie gelöscht</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Benachrichtigungskennzeichen"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Aktiviert"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Deaktiviert"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Alle blockieren"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Diese Benachrichtigungen niemals anzeigen"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Benachrichtigungen anzeigen"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Benachrichtigungen niemals in der Leiste oder auf Peripheriegeräten anzeigen"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Logosymbol erlauben"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Nicht stören\" deaktivieren"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Diese Benachrichtigungen dürfen auch dann empfangen werden, wenn für den Modus \"Nicht stören\" die Option \"Nur wichtige Unterbrechungen\" ausgewählt ist."</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Auf dem Sperrbildschirm"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Akku-Optimierung"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Akkuwarnung"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Alle Apps anzeigen"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Weitere Apps ausblenden"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Vollständige Gerätenutzung zeigen"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"App-Nutzung zeigen"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Nicht optimiert"</string>
<string name="high_power_on" msgid="6216293998227583810">"Nicht optimiert"</string>
<string name="high_power_off" msgid="3393904131961263278">"Akkuverbrauch optimiert"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Spiele"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Weitere Apps"</string>
<string name="storage_files" msgid="8581083146777364063">"Dateien"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tablet-Speicher"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefonspeicher"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"von <xliff:g id="TOTAL">%1$s</xliff:g> verwendet"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"belegt"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8203b6e..5ffe66d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Χρήση υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"Η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g> απαιτεί τα εξής:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Επειδή μια εφαρμογή αποκρύπτει ένα αίτημα άδειας, δεν είναι δυνατή η επαλήθευση της απάντησής σας από τις Ρυθμίσεις."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Η ενότητα Ρυθμίσεις δεν μπορεί να αποκριθεί στην ενέργειά σας καθώς εμφανίζεται μία άλλη εφαρμογή πάνω από αυτές τις επιλογές."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Εάν ενεργοποιήσετε την υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g>, η συσκευή σας δεν θα χρησιμοποιεί το κλείδωμα οθόνης για τη βελτίωση της κρυπτογράφησης δεδομένων."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Επειδή έχετε ενεργοποιήσει την υπηρεσία προσβασιμότητας, η συσκευή σας δεν θα χρησιμοποιεί το κλείδωμα οθόνης για τη βελτίωση της κρυπτογράφησης δεδομένων."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Επειδή η ενεργοποίηση της υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g> επηρεάζει την κρυπτογράφηση δεδομένων, χρειάζεται να επιβεβαιώσετε το μοτίβο σας."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Σάρωση δικτύου κινητής τηλεφωνίας"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Πριν από <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Χρήση εφ/γών από πλ. φόρτ. (πριν <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Χρήση της συσκευής από την πλήρη φόρτιση (πριν από <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Χρόνος ενεργοποίησης της οθόνης από την πλήρη φόρτιση"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Χρήση της συσκευής από την πλήρη φόρτιση"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Χρήση μπαταρίας από τη στιγμή της αποσύνδεσης από την τροφοδοσία"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Υπερεκτίμηση χρήσης ισχύος"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Χρησιμοποιείται για <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Χρήση οθόνης: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> χρησιμοποιείται από: <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> της συνολικής μπαταρίας"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ανάλυση από την τελευταία πλήρη φόρτιση"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Ειδοποιήσεις"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Σύνθετες ρυθμίσεις"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Ειδοποιήσεις εργασίας"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Αποδοχή σημάτων εικονιδίων"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Φως που αναβοσβήνει"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Στο κλείδωμα οθόνης"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Εμφάνιση όλου του περιεχ. ειδοπ."</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> κατηγορίες διαγράφηκαν</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> κατηγορία διαγράφηκε</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Σήματα ειδοποιήσεων"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Ενεργές"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Ανενεργές"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Αποκλεισμός όλων"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Να μην εμφανίζονται ποτέ αυτές οι ειδοποιήσεις"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Εμφάνιση ειδοποιήσεων"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Να μην εμφανίζονται ποτέ ειδοποιήσεις στο πλαίσιο σκίασης ειδοποιήσεων ή σε περιφερειακές συσκευές"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Να επιτρέπεται το σήμα εικονιδίου"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Παράκαμψη λειτουργίας \"Μην ενοχλείτε\""</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Να επιτραπεί σε αυτές τις ειδοποιήσεις να εξακολουθήσουν να διακόπτουν τη λειτουργία \"Μην ενοχλείτε\" όταν έχει οριστεί σε Μόνο προτεραιότητας"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Στο κλείδωμα οθόνης"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Βελτ/ποίηση μπαταρίας"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Ειδοποιήσεις χρήσης"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Εμφάνιση όλων των εφαρμογών"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Απόκρυψη επιπλέον εφαρμογών"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Εμφάνιση πλήρους χρήσης συσκευής"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Εμφάνιση χρήσης εφαρμογής"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Χωρίς βελτιστοποίηση"</string>
<string name="high_power_on" msgid="6216293998227583810">"Χωρίς βελτιστοποίηση"</string>
<string name="high_power_off" msgid="3393904131961263278">"Βελτιστοποίηση χρήσης μπαταρίας"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Παιχνίδια"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Άλλες εφαρμογές"</string>
<string name="storage_files" msgid="8581083146777364063">"Αρχεία"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Αποθηκ. χώρος tablet"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Αποθηκ. χώρος τηλεφώνου"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Σε χρήση από τα <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"σε χρήση"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 6edc218..4ee6ff5 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Because another app is displaying on top of these options, Settings can’t respond to your action."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Because you\'ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your pattern."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Device usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Screen usage <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Allow icon badges"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Blink light"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"On the lock screen"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> category deleted</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Notification badges"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"On"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Off"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Never show these notifications"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Show notifications"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Never show notifications in the shade or on peripheral devices"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Allow icon badge"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
@@ -3003,7 +3007,7 @@
<string name="storage_used" msgid="7128074132917008743">"Storage used"</string>
<string name="change" msgid="6657848623929839991">"Change"</string>
<string name="change_storage" msgid="600475265207060436">"Change storage"</string>
- <string name="notifications_label" msgid="8543457911148619898">"App notifications."</string>
+ <string name="notifications_label" msgid="8543457911148619898">"App notifications"</string>
<string name="notifications_enabled" msgid="6983396130566021385">"On"</string>
<string name="notifications_disabled" msgid="334416731283131597">"Everything turned off"</string>
<string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> categories turned off"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Battery optimisation"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Show all apps"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Hide extra apps"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Not optimised"</string>
<string name="high_power_on" msgid="6216293998227583810">"Not optimised"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimising battery use"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Games"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Other apps"</string>
<string name="storage_files" msgid="8581083146777364063">"Files"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tablet storage"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Phone storage"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"used"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6edc218..4ee6ff5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Because another app is displaying on top of these options, Settings can’t respond to your action."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Because you\'ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your pattern."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Device usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Screen usage <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Allow icon badges"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Blink light"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"On the lock screen"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> category deleted</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Notification badges"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"On"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Off"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Never show these notifications"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Show notifications"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Never show notifications in the shade or on peripheral devices"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Allow icon badge"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
@@ -3003,7 +3007,7 @@
<string name="storage_used" msgid="7128074132917008743">"Storage used"</string>
<string name="change" msgid="6657848623929839991">"Change"</string>
<string name="change_storage" msgid="600475265207060436">"Change storage"</string>
- <string name="notifications_label" msgid="8543457911148619898">"App notifications."</string>
+ <string name="notifications_label" msgid="8543457911148619898">"App notifications"</string>
<string name="notifications_enabled" msgid="6983396130566021385">"On"</string>
<string name="notifications_disabled" msgid="334416731283131597">"Everything turned off"</string>
<string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> categories turned off"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Battery optimisation"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Show all apps"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Hide extra apps"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Not optimised"</string>
<string name="high_power_on" msgid="6216293998227583810">"Not optimised"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimising battery use"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Games"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Other apps"</string>
<string name="storage_files" msgid="8581083146777364063">"Files"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tablet storage"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Phone storage"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"used"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 6edc218..4ee6ff5 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> needs to:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Because another app is displaying on top of these options, Settings can’t respond to your action."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"If you turn on <xliff:g id="SERVICE">%1$s</xliff:g>, your device won’t use your screen lock to enhance data encryption."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Because you\'ve turned on an accessibility service, your device won’t use your screen lock to enhance data encryption."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Because turning on <xliff:g id="SERVICE">%1$s</xliff:g> affects data encryption, you need to confirm your pattern."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Device usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Screen usage <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Allow icon badges"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Blink light"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"On the lock screen"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> category deleted</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Notification badges"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"On"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Off"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Block all"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Never show these notifications"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Show notifications"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Never show notifications in the shade or on peripheral devices"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Allow icon badge"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
@@ -3003,7 +3007,7 @@
<string name="storage_used" msgid="7128074132917008743">"Storage used"</string>
<string name="change" msgid="6657848623929839991">"Change"</string>
<string name="change_storage" msgid="600475265207060436">"Change storage"</string>
- <string name="notifications_label" msgid="8543457911148619898">"App notifications."</string>
+ <string name="notifications_label" msgid="8543457911148619898">"App notifications"</string>
<string name="notifications_enabled" msgid="6983396130566021385">"On"</string>
<string name="notifications_disabled" msgid="334416731283131597">"Everything turned off"</string>
<string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_0">%1$d</xliff:g> of <xliff:g id="COUNT_1">%2$d</xliff:g> categories turned off"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Battery optimisation"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Show all apps"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Hide extra apps"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Not optimised"</string>
<string name="high_power_on" msgid="6216293998227583810">"Not optimised"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimising battery use"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Games"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Other apps"</string>
<string name="storage_files" msgid="8581083146777364063">"Files"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tablet storage"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Phone storage"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"used"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 437343d..9f8a191 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"¿Quieres usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Debido a que una aplicación está bloqueando una solicitud de permiso, la Configuración no puede verificar tu respuesta."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"La app de Configuración no puede procesar tu acción porque otra app se muestra sobre estas opciones."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si activas <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Dado que activaste un servicio de accesibilidad, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Dado que la encriptación de datos se ve afectada al activar <xliff:g id="SERVICE">%1$s</xliff:g>, debes confirmar el patrón."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Escaneo de redes móviles"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"hace <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde la última carga (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso del dispositivo desde carga completa (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tiempo que estuvo encendida la pantalla desde la última carga completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Uso del dispositivo desde la última carga completa"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se desconectó"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculada"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Se usó durante <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Uso de la pantalla: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> usado por <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de la batería total"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglose desde la última carga completa"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificaciones"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avanzada"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificaciones de trabajo"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Permitir insignias de íconos"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Luz intermitente"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"En la pantalla bloqueada"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todas las notificaciones"</string>
@@ -2850,14 +2852,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorías borradas</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoría borrada</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Insignias de notificaciones"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Activada"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Inhabilitado"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todos"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"No mostrar estas notificaciones"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificaciones"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"No mostrar notificaciones en el panel ni en dispositivos periféricos"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Permitir insignia de ícono"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anular No molestar"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificaciones sigan interrumpiendo cuando No molestar esté configurado como Solo prioridad"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"En la pantalla bloqueada"</string>
@@ -3090,8 +3094,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimización de la batería"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todas las apps"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar apps adicionales"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso completo del dispositivo"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Sin optimizar"</string>
<string name="high_power_on" msgid="6216293998227583810">"Sin optimizar"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimizando el uso de la batería"</string>
@@ -3565,8 +3569,6 @@
<string name="storage_games" msgid="7703159201697117621">"Juegos"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Otras apps"</string>
<string name="storage_files" msgid="8581083146777364063">"Archivos"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Almacenamiento en tablet"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Almacenamiento del teléfono"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"En uso de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"usado"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e156d2f..a3f0fbe 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necesita:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Una aplicación está bloqueando una solicitud de permiso, por lo que Ajustes no puede verificar tu respuesta."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"La aplicación Ajustes no puede responder a tu acción porque otra aplicación tapa estas opciones."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si activas <xliff:g id="SERVICE">%1$s</xliff:g>, el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Has activado un servicio de accesibilidad, por lo que el dispositivo no utilizará el bloqueo de pantalla para mejorar el cifrado de datos."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Activar <xliff:g id="SERVICE">%1$s</xliff:g> afecta al cifrado de datos, por lo que debes confirmar tu patrón."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Búsqueda de redes móviles"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"hace <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde la carga completa (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso del dispositivo desde la carga completa (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tiempo que la pantalla ha estado encendida desde la carga completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Uso del dispositivo desde la carga completa"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se cargó"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculado"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"En uso durante <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Uso de la pantalla: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> usado por <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> del total de batería"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglose desde la última carga completa"</string>
@@ -2303,7 +2304,7 @@
<string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Sincr. autom. datos trabajo"</string>
<string name="data_usage_change_cycle" msgid="7776556448920114866">"Cambiar ciclo…"</string>
<string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Día del mes para restablecer ciclo de uso de datos:"</string>
- <string name="data_usage_empty" msgid="8621855507876539282">"Ninguna aplicación ha usado datos en este período."</string>
+ <string name="data_usage_empty" msgid="8621855507876539282">"Ninguna aplicación ha usado datos en este periodo."</string>
<string name="data_usage_label_foreground" msgid="4938034231928628164">"Primer plano"</string>
<string name="data_usage_label_background" msgid="3225844085975764519">"Segundo plano"</string>
<string name="data_usage_app_restricted" msgid="3568465218866589705">"con restricción"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificaciones"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Opciones avanzadas"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificaciones de trabajo"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Permitir insignias de iconos"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Luz parpadeante"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"En la pantalla de bloqueo"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo el contenido de las notificaciones"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorías eliminadas</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoría eliminada</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Insignias de notificaciones"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Activadas"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Desactivadas"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"No mostrar nunca estas notificaciones"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificaciones"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"No mostrar nunca notificaciones en el panel de notificaciones ni en dispositivos periféricos"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Permitir insignia de icono"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Priorizar"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"No bloquear notificaciones cuando la opción No molestar esté establecida en Solo prioritarias"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"En la pantalla de bloqueo"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimización de batería"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todas las aplicaciones"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar aplicaciones extra"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso completo del dispositivo"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de la aplicación"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Sin optimizar"</string>
<string name="high_power_on" msgid="6216293998227583810">"No optimizada"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimizando el uso de la batería"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Juegos"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Otras aplicaciones"</string>
<string name="storage_files" msgid="8581083146777364063">"Archivos"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Almacenamiento del tablet"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Almacenamiento del teléfono"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Usado de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"usado"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 9ac8b37..b1b40e4 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Kas soovite kasutada teenust <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> teeb järgmist:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Seaded ei saa teie vastust kinnitada, sest rakendus varjab loataotlust."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Menüü Seaded ei saa teie toimingule reageerida, kuna muu rakendus on kuvatud nende valikute peal."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Kui lülitate sisse teenuse <xliff:g id="SERVICE">%1$s</xliff:g>, ei kasuta seade andmete krüpteerimise täiustamiseks ekraanilukku."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Kuna lülitasite sisse juurdepääsetavuse teenuse, siis ei kasuta teie seade andmete krüpteerimise täiustamiseks ekraanilukku."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Kuna teenuse <xliff:g id="SERVICE">%1$s</xliff:g> sisselülitamine mõjutab andmete krüpteerimist, peate kinnitama oma mustri."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Mobiilivõrgustiku skannimine"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> tagasi"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Rakenduste kasutus alates täislaadimisest (<xliff:g id="TIME">^1</xliff:g> tagasi)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Seadme kasutus alates täislaadimisest (<xliff:g id="TIME">^1</xliff:g> tagasi)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Ekraani töötamise aeg alates viimasest täislaadimisest"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Seadme kasutus alates viimasest täislaadimisest"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Akukasutus alates lahutamisest"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Liigselt arvestatud energiatarbimine"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Kasutatud <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Ekraanikasutus: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> kasutab <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kogu akumahust"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Üksikasjalik teave alates viimasest täislaadimisest"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Märguanded"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Täpsemad"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Töö märguanded"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Ikoonimärgi lubamine"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Vilkuv tuli"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Lukustuskuval"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Kuva kogu märguande sisu"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategooriat on kustutatud</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategooria on kustutatud</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Märguannete märgid"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Sees"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Väljas"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blokeeri kõik"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Ära kunagi näita neid märguandeid"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Kuva märguanded"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Ära kuva märguandeid kunagi märguandealal ega välisseadmetes"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Ikoonimärgi lubamine"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Funktsiooni Mitte segada alistamine"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lubage nendel märguannetel teid jätkuvalt katkestada, kui funktsioon Mitte segada on määratud valikule Ainult prioriteetsed"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Lukustuskuval"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Aku optimeerimine"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Teated kasutuse kohta"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Kõigi rakenduste kuvamine"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Lisarakenduste peitmine"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Kuva seadme kogu kasutusteave"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Kuva rakenduse kasutusteave"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Pole optimeeritud"</string>
<string name="high_power_on" msgid="6216293998227583810">"Pole optimeeritud"</string>
<string name="high_power_off" msgid="3393904131961263278">"Akukasutuse optimeerimine"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Mängud"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Muud rakendused"</string>
<string name="storage_files" msgid="8581083146777364063">"Failid"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tahvelarvuti salvestusruum"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefoni salvestusruum"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Kasutatud <xliff:g id="TOTAL">%1$s</xliff:g>-st"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"kasut."</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index fb96a37..5739964 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> erabili nahi duzu?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuak hauek egin behar ditu:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Aplikazio bat baimen-eskaera oztopatzen ari denez, ezarpenek ezin dute egiaztatu erantzuna."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Aukera hauen gainean beste aplikazio bat ageri denez, \"Ezarpenak\" atalak ezin du egin eskatu diozuna."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> aktibatzen baduzu, gailuak ez du pantailaren blokeoa erabiliko datuen enkriptatzea hobetzeko."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Erabilerraztasun-zerbitzua aktibatu duzunez, gailuak ez du pantailaren blokeoa erabiliko datuen enkriptatzea hobetzeko."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzua aktibatzeak datu-enkriptatzeari eragiten dionez, eredua berretsi behar duzu."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Sare mugikorra bilatzen"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Duela <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Aplikazioen erabilera gailua guztiz kargatu zenetik (duela <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Gailuaren erabilera gailua guztiz kargatu zenetik (duela <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Gailua guztiz kargatu zenetik pantaila piztuta egon den denbora"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Gailuaren erabilera hura guztiz kargatu zenetik"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Bateriaren erabilera entxufea atera ondoren"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Uste baino energia gutxiago erabili da."</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Erabilera-denbora: <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Pantailaren erabilera: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> erabili du <xliff:g id="APP">%2$s</xliff:g> aplikazioak"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"Bateria osoaren <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Guztiz kargatu zenetik emandako erabileraren datuak"</string>
@@ -2074,7 +2075,7 @@
<string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Cachean gordeta"</string>
<string name="voice_input_output_settings" msgid="1336135218350444783">"Ahots-sarrera eta -irteera"</string>
<string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ahots-sarreraren eta -irteeraren ezarpenak"</string>
- <string name="voice_search_settings_title" msgid="2775469246913196536">"Ahots bidezko bilaketa"</string>
+ <string name="voice_search_settings_title" msgid="2775469246913196536">"Ahozko bilaketa"</string>
<string name="keyboard_settings_title" msgid="5080115226780201234">"Android teklatua"</string>
<string name="voice_input_settings" msgid="1099937800539324567">"Ahots bidezko idazketaren ezarpenak"</string>
<string name="voice_input_settings_title" msgid="2676028028084981891">"Ahots bidezko idazketa"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Jakinarazpenak"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Ezarpen aurreratuak"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Laneko jakinarazpenak"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Baimendu ikonoen bereizgarriak"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Argi keinukaria"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Pantaila blokeatuan"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Erakutsi jakinarazpenen eduki guztia"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategoria ezabatu dira</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategoria ezabatu da</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Jakinarazpenen bereizgarriak"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Aktibatuta"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Desaktibatuta"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blokeatu guztiak"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Ez erakutsi jakinarazpen hauek inoiz"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Erakutsi jakinarazpenak"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Ez erakutsi inoiz jakinarazpenak edo ilundutako eremuetan edo gailu osagarrietan"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Baimendu ikonoaren bereizgarria erabiltzea"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Ez molestatu\" moduaren salbuespenak"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Baimendu jakinarazpenek jarduera etenaraztea \"Ez molestatu\" aukera Lehentasunezkoak soilik gisa ezarrita dagoenean"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pantaila blokeatuan"</string>
@@ -3070,7 +3074,7 @@
<string name="choose_voice_input_title" msgid="975471367067718019">"Aukeratu ahots-idazketa aplik."</string>
<string name="default_browser_title" msgid="8101772675085814670">"Arakatzailearen aplikazioa"</string>
<string name="default_browser_title_none" msgid="2124785489953628553">"Ez dago arakatzailerik lehenetsita"</string>
- <string name="default_phone_title" msgid="282005908059637350">"Telefonoaren aplikazioa"</string>
+ <string name="default_phone_title" msgid="282005908059637350">"Telefonoa aplikazioa"</string>
<string name="default_app" msgid="6864503001385843060">"(lehenetsia)"</string>
<string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
<string name="system_default_app" msgid="3091113402349739037">"(Sistemaren lehenespena)"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Bateria-optimizazioa"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Erabilera-abisuak"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Erakutsi aplikazio guztiak"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Ezkutatu aplikazio gehigarriak"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Erakutsi gailuaren erabilera guztia"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Erakutsi aplikazioaren erabilera"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Optimizaziorik gabe"</string>
<string name="high_power_on" msgid="6216293998227583810">"Optimizaziorik gabe"</string>
<string name="high_power_off" msgid="3393904131961263278">"Bateria-optimizazioa aplikatzen da"</string>
@@ -3105,7 +3109,7 @@
<string name="battery_power_management" msgid="5571519699679107523">"Bateriaren kudeaketa"</string>
<string name="no_battery_summary" msgid="3528036835462846814">"Ez du bateriarik erabili bateria guztiz kargatu zenetik"</string>
<string name="app_notification_preferences" msgid="1599319335092722613">"Aplikazioaren ezarpenak"</string>
- <string name="system_ui_settings" msgid="579824306467081123">"Erakutsi sistemako UI konfiguratzailea"</string>
+ <string name="system_ui_settings" msgid="579824306467081123">"Erakutsi sistemako erabiltzaile-interfazearen konfiguratzailea"</string>
<string name="additional_permissions" msgid="6463784193877056080">"Baimen gehigarriak"</string>
<string name="additional_permissions_more" msgid="3538612272673191451">"Beste <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"Akatsen txostena partekatu nahi duzu?"</string>
@@ -3263,20 +3267,20 @@
<string name="condition_turn_on" msgid="9089876276117874591">"Aktibatu"</string>
<string name="condition_expand_show" msgid="608202020023489939">"Erakutsi"</string>
<string name="condition_expand_hide" msgid="948507739223760667">"Ezkutatu"</string>
- <string name="condition_hotspot_title" msgid="7778958849468560027">"Hotspot is on"</string>
+ <string name="condition_hotspot_title" msgid="7778958849468560027">"Sare publikoa aktibatuta"</string>
<string name="condition_hotspot_summary" msgid="3433182779269409683">"Wi-Fi sare publiko eramangarria (<xliff:g id="ID_1">%1$s</xliff:g>) aktibo dago, is active, Wi-Fi for this device is turned off."</string>
- <string name="condition_airplane_title" msgid="287356299107070503">"Hegaldi modua aktibatuta dago"</string>
+ <string name="condition_airplane_title" msgid="287356299107070503">"Hegaldi modua aktibatuta"</string>
<string name="condition_airplane_summary" msgid="5561586417832393666">"Desaktibatuta daude Wi-Fi, Bluetooth eta telefonia mugikorreko sareak. Ezin izango duzu egin telefono-deirik, ezta Internetera konektatu ere."</string>
- <string name="condition_zen_title" msgid="2679168532600816392">"Do not disturb is on (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
+ <string name="condition_zen_title" msgid="2679168532600816392">"\"Ez molestatu\" modua aktibatuta (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
<string name="condition_battery_title" msgid="3272131008388575349">"Bateria-aurrezlea aktibatuta"</string>
<string name="condition_battery_summary" msgid="4418839236027977450">"Funtzionamendua mantsotu egin da. Kokapen-zerbitzuak eta atzeko planoko datuak desaktibatu egin dira."</string>
<string name="condition_cellular_title" msgid="1327317003797575735">"Datu-konexioa desaktibatuta"</string>
<string name="condition_cellular_summary" msgid="1818046558419658463">"Wi-Fi bidez soilik erabil daiteke Internet"</string>
- <string name="condition_bg_data_title" msgid="2483860304802846542">"Aktibatuta dago datu-aurrezlea"</string>
+ <string name="condition_bg_data_title" msgid="2483860304802846542">"Datu-aurrezlea aktibatuta"</string>
<string name="condition_bg_data_summary" msgid="656957852895282228">"Atzeko planoko datuak Wi-Fi bidez soilik erabil daitezke. Horrek eragina izango du aplikazio eta zerbitzu batzuetan, Wi-Fi konexiorik ez dagoenean."</string>
- <string name="condition_work_title" msgid="7293722361184366648">"Desaktibatuta dago laneko profila"</string>
+ <string name="condition_work_title" msgid="7293722361184366648">"Laneko profila desaktibatuta"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Desaktibatuta daude aplikazioak, atzeko planoko sinkronizazioa eta laneko profilarekin erlazionatutako bestelako eginbideak."</string>
- <string name="condition_night_display_title" msgid="5599814941976856183">"Gaueko argia piztuta dago"</string>
+ <string name="condition_night_display_title" msgid="5599814941976856183">"Gaueko argia aktibatuta"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"Pantaila tindu horikaraz jantzi dugu. Errazago hartuko zaitu loak horrela."</string>
<string name="suggestions_title" msgid="7280792342273268377">"Iradokizunak"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Jokoak"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Beste aplikazio batzuk"</string>
<string name="storage_files" msgid="8581083146777364063">"Fitxategiak"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tabletaren memoria"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefonoaren memoria"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Memoria osotik (<xliff:g id="TOTAL">%1$s</xliff:g>) erabilitakoa"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"erabilita"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a4be204..e87a53c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"استفاده از <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> باید:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"چون برنامهای در حال ایجاد تداخل در درخواست مجوز است، «تنظیمات» نمیتواند پاسخ شما را تأیید کند."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"چون در این لحظه برنامه دیگری روی این گزینهها نشان داده میشود، «تنظیمات» نمیتواند به اقدام شما پاسخ دهد."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"اگر <xliff:g id="SERVICE">%1$s</xliff:g> را روشن کنید، دستگاه شما از قفل صفحه شما جهت بهبود رمزگذاری اطلاعات استفاده نخواهد کرد."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"از آنجا که یک سرویس دسترسپذیری را روشن کردهاید، دستگاه شما از قفل صفحه شما جهت بهبود رمزگذاری اطلاعات استفاده نخواهد کرد."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"از آنجایی که روشن کردن <xliff:g id="SERVICE">%1$s</xliff:g> بر رمزگذاری اطلاعات تأثیر میگذارد، باید الگویتان را تأیید کنید."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"اسکن شبکه تلفن همراه"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> قبل"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"مصرف برنامه از زمان شارژ کامل (<xliff:g id="TIME">^1</xliff:g> قبل)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"مصرف دستگاه از زمان شارژ کامل (<xliff:g id="TIME">^1</xliff:g> قبل)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"مدتزمان مصرف صفحهنمایش از زمان شارژ کامل"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"مصرف دستگاه از زمان شارژ کامل"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"استفاده از باتری از زمان جدا شدن"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"نیروی مصرفی بیش از حد محاسبه شده"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> میلیآمپرساعت"</string>
<string name="battery_used_for" msgid="2690821851327075443">"مدت زمان استفاده <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"مصرف صفحهنمایش <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> از شارژ باتری را مصرف کرده است"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> از کل شارژ باتری"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"تفکیک مصرف شارژ از زمان آخرین شارژ کامل"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"اعلانها"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"پیشرفته"</string>
<string name="profile_section_header" msgid="2320848161066912001">"اعلانهای کار"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"اجازه دادن به نشانهای نماد"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"نور چشمکزن"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"روی قفل صفحه"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"نمایش همه محتوای اعلان"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> دسته حذف شد</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> دسته حذف شد</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"نشانهای اعلان"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"روشن"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"خاموش"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"مسدود کردن همه"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"هرگز این اعلانها نشان داده نشوند"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"نمایش اعلانها"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"هرگز اعلانها در کشوی اعلانات یا در دستگاههای جانبی نشان داده نشوند"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"نشان نماد مجاز است"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"لغو «مزاحم نشوید»"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"به این اعلانها اجازه داده شود در شرایطی که «مزاحم نشوید» روی «فقط اولویتدار» تنظیم شده است، همچنان وقفه ایجاد کنند"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"در قفل صفحه"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"بهینهسازی مصرف باتری"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"هشدارهای استفاده"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"نمایش همه برنامهها"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"پنهان کردن برنامههای اضافی"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"نمایش اطلاعات کامل درباره مصرف دستگاه"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"نمایش مصرف برنامه"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"بهینهنشده"</string>
<string name="high_power_on" msgid="6216293998227583810">"بهینه نشده"</string>
<string name="high_power_off" msgid="3393904131961263278">"بهینهسازی مصرف باتری"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"بازیها"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"سایر برنامهها"</string>
<string name="storage_files" msgid="8581083146777364063">"فایلها"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"حافظه رایانه لوحی"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"حافظه تلفن"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"مصرفشده از <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"پر"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index a8bcdab..e599689 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Otetaanko <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> saa luvan:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Sovellus peittää lupapyynnön, joten Asetukset ei voi vahvistaa valintaasi."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Toinen sovellus peittää nämä asetukset, joten Asetukset ei voi reagoida toimintoosi."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jos <xliff:g id="SERVICE">%1$s</xliff:g> otetaan käyttöön, laitteesi ei käytä näytön lukitusta tiedon salauksen parantamiseen."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Laite ei käytä näytön lukitusta tiedon salauksen parantamiseen, koska otit käytettävyyspalvelun käyttöön."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Koska palvelun <xliff:g id="SERVICE">%1$s</xliff:g> ottaminen käyttöön vaikuttaa tietojen salaukseen, sinun pitää vahvistaa kuvio."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Mobiiliverkkojen haku"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> sitten"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Sovellusten virrankulutus edellisen täyden latauksen jälkeen (<xliff:g id="TIME">^1</xliff:g> sitten)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Sovellusten virrankulutus edellisen täyden latauksen jälkeen (<xliff:g id="TIME">^1</xliff:g> sitten)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Näytön käyttöaika edellisen täyden latauksen jälkeen"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Laitteen käyttö edellisen täyden latauksen jälkeen"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Akun käyttö laturin irrottamisen jälkeen"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Yliarvioitu virrankulutus"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Käyttöaika: <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Näytön käyttö <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> on käyttänyt <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kaikesta virrankulutuksesta"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Erittely edellisen täyden latauksen jälkeen"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Ilmoitukset"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Lisäasetukset"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Työilmoitukset"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Salli merkkikuvakkeet"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Vilkuta valoa"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Lukitusnäytöllä"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Näytä ilmoitusten koko sisältö."</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> luokkaa poistettu</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> luokka poistettu</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Ilmoitusmerkit"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Käytössä"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Pois käytöstä"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Estä kaikki"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Älä koskaan näytä näitä ilmoituksia"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Näytä ilmoitukset"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Älä näytä ilmoituksia ilmoitusalueella tai lisälaitteissa"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Salli merkkikuvake"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ohita Älä häiritse -asetus"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Salli ilmoituksien näyttö, vaikka Älä häiritse -asetus on Vain tärkeät."</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Lukitusnäytöllä"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Akun käytön optimointi"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Käyttöilmoitukset"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Näytä kaikki sovellukset"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Piilota ylimääräiset"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Näytä kaikki laitteen käyttö"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Näytä sovelluksen käyttö"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Ei optimointia"</string>
<string name="high_power_on" msgid="6216293998227583810">"Ei optimointia"</string>
<string name="high_power_off" msgid="3393904131961263278">"Akun käyttöä optimoidaan."</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Pelit"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Muut sovellukset"</string>
<string name="storage_files" msgid="8581083146777364063">"Tiedostot"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tabletin tallennustila"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Puhelimen tallennustila"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Tallennustilasta (<xliff:g id="TOTAL">%1$s</xliff:g>) käytössä"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"käyt."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 0db5bd6..61a2a2d 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> doit pouvoir :"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Une application obscurcit une demande d\'autorisation, alors Paramètres ne peut pas vérifier votre réponse."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"L\'application Paramètres ne peut pas répondre à votre action, car une autre application se superpose à ces options."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si vous activez <xliff:g id="SERVICE">%1$s</xliff:g>, votre appareil n\'utilisera pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Vous avez activé un service d\'accessibilité. Votre appareil n\'utilisera donc pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Étant donné que l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> touche le chiffrement de données, vous devez confirmer votre schéma."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux cellulaires"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Il y a <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Utilisation des applis depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilisation des applications depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Durée que l\'écran a été actif depuis la dernière charge complète"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Utilisation de l\'appareil depuis la charge complète"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilisation surestimée de la pile"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Temps d\'utilisation : <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Utilisation de l\'écran : <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilisé(s) par <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de l\'utilisation totale de la pile"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Répartition depuis la dernière charge complète"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Paramètres avancés"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notifications professionnelles"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Autoriser les insignes d\'icône"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Faire clignoter le voyant"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"À l\'écran de verrouillage"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher tout le contenu des notifications"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie supprimée</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories supprimées</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Badges de notification"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Activées"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Désactivées"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Ne jamais afficher ces notifications"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Afficher les notifications"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Ne jamais afficher les notifications dans l\'ombre ou sur des appareils périphériques"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Autoriser l\'insigne de l\'icône"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorer le mode « Ne pas déranger »"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Activer les notifications de cette application même lorsque l\'option « Ne pas déranger » est définie sur « Prioritaires uniquement »"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"À l\'écran de verrouillage"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimisation de la pile"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'utilisation"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Afficher toutes les applis"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Masquer applis supplémentaires"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Afficher l\'utilisation totale de l\'appareil"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Afficher utilisation des applis"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Non optimisée"</string>
<string name="high_power_on" msgid="6216293998227583810">"Non optimisée"</string>
<string name="high_power_off" msgid="3393904131961263278">"L\'utilisation de la pile est optimisée"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Jeux"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Autres applications"</string>
<string name="storage_files" msgid="8581083146777364063">"Fichiers"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Stockage sur la tablette"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Stockage du téléphone"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"utilisé(s) sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"utilisé"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2eada5e..cce11c9 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> doit pouvoir :"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Une application masque la demande d\'autorisation. Impossible de valider votre réponse via l\'application Paramètres."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"L\'application Paramètres ne peut pas répondre à votre action, car une autre application se superpose à ces options."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Si vous activez <xliff:g id="SERVICE">%1$s</xliff:g>, votre appareil n\'utilisera pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Vous avez activé un service d\'accessibilité. Votre appareil n\'utilisera donc pas le verrouillage de l\'écran pour améliorer le chiffrement des données."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Vous devez confirmer le schéma, car l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> influe sur le chiffrement des données."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux mobiles"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Il y a <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Utilisation des applications depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilisation de l\'appareil depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Durée d\'activation de l\'écran depuis la charge complète"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Utilisation de l\'appareil depuis la charge complète"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Consommation surestimée"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Temps d\'utilisation : <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Utilisation de l\'écran : <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilisé(s) par <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de la batterie"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Répartition depuis la dernière charge complète"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Paramètres avancés"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notifications profil pro"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Autoriser les badges d\'icône"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Clignotement"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Sur l\'écran de verrouillage"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher tout le contenu des notifications"</string>
@@ -2826,12 +2828,12 @@
<string name="display_vr_pref_title" msgid="8104485269504335481">"Lorsque l\'appareil est en mode Réalité virtuelle"</string>
<string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Réduire le flou (recommandé)"</string>
<string name="display_vr_pref_off" msgid="2190091757123260989">"Réduire le scintillement"</string>
- <string name="picture_in_picture_title" msgid="5824849294270017113">"Mode PIP"</string>
- <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Aucune application installée n\'est compatible avec le mode PIP"</string>
+ <string name="picture_in_picture_title" msgid="5824849294270017113">"Picture-in-picture"</string>
+ <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Aucune application installée n\'est compatible avec le mode Picture-in-picture"</string>
<string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip picture in picture"</string>
- <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Mode PIP"</string>
- <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Autoriser le mode PIP"</string>
- <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Autorisez cette application à créer une fenêtre PIP lorsqu\'elle est ouverte ou après l\'avoir quittée (par exemple, pour continuer de regarder une vidéo). Cette fenêtre se superpose aux autres applications en cours d\'utilisation."</string>
+ <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Picture-in-picture"</string>
+ <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Autoriser le mode Picture-in-picture"</string>
+ <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Autorisez cette application à créer une fenêtre Picture-in-picture lorsqu\'elle est ouverte ou après l\'avoir quittée (par exemple, pour continuer de regarder une vidéo). Cette fenêtre se superpose aux autres applications en cours d\'utilisation."</string>
<string name="picture_in_picture_on" msgid="6103704909710176555">"Oui"</string>
<string name="picture_in_picture_off" msgid="5654388666434625247">"Non"</string>
<string name="manage_zen_access_title" msgid="2611116122628520522">"Accès \"Ne pas déranger\""</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie supprimée</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories supprimées</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Badges de notification"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Activées"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Désactivées"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Tout bloquer"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Ne jamais afficher ces notifications"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Afficher les notifications"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Ne jamais afficher les notifications dans le volet ou sur les périphériques"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Autoriser le badge de l\'icône"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorer l\'option \"Ne pas déranger\""</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Autoriser les interruptions par ces notifications lorsque l\'option \"Ne pas déranger\" est définie sur \"Prioritaires uniquement\""</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Sur l\'écran de verrouillage"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimisation de la batterie"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'utilisation"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Afficher toutes les applications"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Masquer applis supplémentaires"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Afficher l\'utilisation de l\'appareil chargé"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Afficher utilisation appli"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Non optimisées"</string>
<string name="high_power_on" msgid="6216293998227583810">"Non optimisée"</string>
<string name="high_power_off" msgid="3393904131961263278">"Utilisation de la batterie optimisée"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Jeux"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Autres applications"</string>
<string name="storage_files" msgid="8581083146777364063">"Fichiers"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Stockage sur la tablette"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Stockage du téléphone"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Utilisés sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"utilisés"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index f693ad8..b7a2391 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Posto que unha aplicación se superpón sobre una solicitude de permiso, a configuración non pode verificar a túa resposta."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Móstrase outra aplicación enriba destas opcións. Por este motivo, non se aplican os cambios que fagas en Configuración."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se activas <xliff:g id="SERVICE">%1$s</xliff:g>, o dispositivo non utilizará o teu bloqueo da pantalla para mellorar o cifrado de datos."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Como activaches un servizo de accesibilidade, o dispositivo non utilizará o teu bloqueo da pantalla para mellorar o cifrado de datos."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"É necesario que confirmes o teu padrón xa que a activación de <xliff:g id="SERVICE">%1$s</xliff:g> afecta ao cifrado de datos."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Busca da rede de telefonía móbil"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Hai <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde a carga completa (hai <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso do dispositivo desde a carga completa (hai <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tempo durante o que a pantalla estivo activada desde a carga completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Uso da batería desde que se desconectou"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Reconto excesivo do uso de enerxía"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Tempo de utilización: <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Uso da pantalla: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizado por <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da batería total"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Análise detallada desde a última carga completa"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificacións"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Configuración avanzada"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificacións do traballo"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Permitir insignias de iconas"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Luz intermitente"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na pantalla de bloqueo"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o contido das notificacións"</string>
@@ -2826,12 +2828,12 @@
<string name="display_vr_pref_title" msgid="8104485269504335481">"Cando o dispositivo está no modo de RV"</string>
<string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reducir desenfoque (recomendado)"</string>
<string name="display_vr_pref_off" msgid="2190091757123260989">"Reducir escintilación"</string>
- <string name="picture_in_picture_title" msgid="5824849294270017113">"Imaxe superposta"</string>
+ <string name="picture_in_picture_title" msgid="5824849294270017113">"Pantalla superposta"</string>
<string name="picture_in_picture_empty_text" msgid="685224245260197779">"Ningunha das aplicacións instaladas é compatible coas imaxes superpostas"</string>
<string name="picture_in_picture_keywords" msgid="8361318686701764690">"superposta imaxe"</string>
- <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Imaxe superposta"</string>
- <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir imaxe superposta"</string>
- <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que esta aplicación cree unha ventá de imaxe superposta mentres que a aplicación está aberta ou despois de saír dela (por exemplo, para continuar visualizando un vídeo). Esta ventá móstrase sobre outras aplicacións que estás utilizando."</string>
+ <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pantalla superposta"</string>
+ <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir pantalla superposta"</string>
+ <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que esta aplicación cree unha ventá de pantalla superposta mentres que a aplicación está aberta ou despois de saír dela (por exemplo, para continuar visualizando un vídeo). Esta ventá móstrase sobre outras aplicacións que estás utilizando."</string>
<string name="picture_in_picture_on" msgid="6103704909710176555">"Si"</string>
<string name="picture_in_picture_off" msgid="5654388666434625247">"Non"</string>
<string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso en modo Non molestar"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorías eliminadas</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoría eliminada</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Insignias de notificación"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Activado"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Desactivado"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear todo"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Non mostrar nunca estas notificacións"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificacións"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Non mostra nunca as notificacións no menú despregable da parte superior da pantalla nin en dispositivos periféricos"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Permitir insignia de icona"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anular opción Non molestar"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificacións sigan interrompendo cando a opción Non molestar estea configurada como Só prioridade"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na pantalla de bloqueo"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimización da batería"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todas as aplicacións"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar aplicacións adicionais"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso completo do dispositivo"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso da aplicación"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Sen optimizar"</string>
<string name="high_power_on" msgid="6216293998227583810">"Sen optimizar"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimizando o uso da batería"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Xogos"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Outras aplicacións"</string>
<string name="storage_files" msgid="8581083146777364063">"Ficheiros"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Almacenamento da tableta"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Almacenamento do teléfono"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"En uso de: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"en uso"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 5ad7b78..a6775c8 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> નો ઉપયોગ કરીએ?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ને આની જરૂર છે:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"એક ઍપ્લિકેશન પરવાનગી વિનંતીને અસ્પષ્ટ કરતી હોવાને કારણે, સેટિંગ્સ તમારા પ્રતિસાદને ચકાસી શકતી નથી."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"બીજી ઍપ્લિકેશન આ વિકલ્પોની ઉપર પ્રદર્શિત થતી હોવાને કારણે, સેટિંગ્સ તમારી ક્રિયાનો પ્રતિભાવ આપી શકતી નથી."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"જો તમે <xliff:g id="SERVICE">%1$s</xliff:g> ચાલુ કરો છો, તો તમારું ઉપકરણ ડેટા એન્ક્રિપ્શનને વિસ્તૃત કરવા માટે તમારા સ્ક્રીન લૉકનો ઉપયોગ કરશે નહીં."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"તમે અૅક્સેસિબિલિટી સેવા ચાલુ કરી હોવાને કારણે, તમારું ઉપકરણ ડેટા એન્ક્રિપ્શનને વિસ્તૃત કરવા માટે તમારા સ્ક્રીન લૉકનો ઉપયોગ કરશે નહીં."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> ને ચાલુ કરવું ડેટા ઇન્ક્રિપ્શન પર અસર કરતું હોવાને કારણે, તમારે તમારી પેટર્નની પુષ્ટિ કરવાની જરૂર છે."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"મોબાઇલ નેટવર્ક સ્કૅન કરવામાં"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> પહેલાં"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"સંપૂર્ણ ચાર્જ પછી ઍપ્લિકેશન વપરાશ (<xliff:g id="TIME">^1</xliff:g> પહેલાં)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"સંપૂર્ણ ચાર્જ કર્યા પછી ઉપકરણનો વપરાશ (<xliff:g id="TIME">^1</xliff:g> પહેલાં)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"સંપૂર્ણ ચાર્જ પછી સ્ક્રીન ચાલુ રહેવાનો સમયગાળો"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"સંપૂર્ણ ચાર્જ પછી ઉપકરણ વપરાશ"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"અનપ્લગ થયું ત્યારથી બૅટરી ઉપયોગ"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"વધુ-ગણાયેલ પાવર ઉપયોગ"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> સુધી ઉપયોગ કરાયો"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"સ્ક્રીન વપરાશ <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> દ્વારા <xliff:g id="PERCENT">%1$s</xliff:g> વપરાયું"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"કુલ બૅટરીનું <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"છેલ્લા સંપૂર્ણ ચાર્જ પછીનું વિશ્લેષણ"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"સૂચનાઓ"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"વિગતવાર"</string>
<string name="profile_section_header" msgid="2320848161066912001">"કાર્યની સૂચનાઓ"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"આઇકનના બૅજને મંજૂરી આપો"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"લાઇટ ઝબકવી"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"લૉક સ્ક્રીન પર"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"તમામ સૂચના સામગ્રી બતાવો"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> કૅટેગરી કાઢી નાખી</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> કૅટેગરી કાઢી નાખી</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"સૂચના બૅજ"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"ચાલુ"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"બંધ"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"તમામને અવરોધિત કરો"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"આ સૂચનાઓ ક્યારેય બતાવશો નહીં"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"સૂચનાઓ બતાવો"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"સૂચનાઓ ક્યારેય શૅડમાં અથવા પેરિફેરલ ઉપકરણો પર બતાવશો નહીં"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"આઇકન બૅજની મંજૂરી આપો"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ખલેલ પાડશો નહીં ને ઓવરરાઇડ કરો"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"જયારે ખલેલ પાડશો નહીં ને માત્ર પ્રાધાન્યતા પર સેટ કરેલું હોય ત્યારે આ સૂચનાઓને દખલગીરી કરવા દો"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"લૉક સ્ક્રીન પર"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"બૅટરી ઓપ્ટિમાઇઝેશન"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"વપરાશ સંબંધી ચેતવણીઓ"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"બધી ઍપ્લિકેશનો બતાવો"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"વધારાની ઍપ્લિકેશનો છુપાવો"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"ઉપકરણનો સંપૂર્ણ વપરાશ બતાવો"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"ઍપ્લિકેશનનો વપરાશ બતાવો"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"ઓપ્ટિમાઇઝ કરેલ નથી"</string>
<string name="high_power_on" msgid="6216293998227583810">"ઓપ્ટિમાઇઝ કરેલ નથી"</string>
<string name="high_power_off" msgid="3393904131961263278">"બૅટરી વપરાશને ઓપ્ટિમાઇઝ કરી રહ્યું છે"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"રમતો"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"અન્ય ઍપ્લિકેશનો"</string>
<string name="storage_files" msgid="8581083146777364063">"ફાઇલો"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ટૅબ્લેટ સ્ટોરેજ"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ફોન સ્ટૉરેજ"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g>માંથી ઉપયોગમાં લેવાયો"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"વપરાયો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index de0bd29..8292e5a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -353,9 +353,9 @@
<string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
<string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"फ़िंगरप्रिंट से अनलॉक"</string>
<string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"फ़िंगरप्रिंट का उपयोग करें"</string>
- <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"अपना फ़ोन अनलॉक करने, खरीदारियां अधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर स्पर्श करें. इस बारे में सावधानी रखें कि आप किसके फ़िंगरप्रिंट जोड रहे हैं. यहां तक एक जोड़ा गया प्रिंट भी इनमें से कोई भी कार्य कर सकता है.\n\nनोट: आपका फ़िंगरप्रिंट किसी सशक्त पैटर्न या पिन से कम सुरक्षित हो सकता है."</string>
- <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"खरीदारियां अधिकृत करने या ऐप्लिकेशन मेंं प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर को स्पर्श करें. इस बारे में सावधानी रखें कि आप किसके फ़िंगरप्रिंट जोड़ रहे हैं. जोड़े गए एक प्रिंट से भी इनमें से कोई भी कार्य किया जा सकता है.\n\nनोट: आप इस डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग नहीं कर सकते हैं. अधिक जानकारी के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें."</string>
- <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"अपना फ़ोन अनलॉक करने, खरीदारियां अधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर स्पर्श करें. इस बारे में सावधानी रखें कि आप किसके फ़िंगरप्रिंट जोड़ रहे हैं. आपके द्वारा जोड़ा गया एक प्रिंट भी इनमें से कोई भी कार्य कर सकता है.\n\nनोट: आपका फ़िंगरप्रिंट किसी सशक्त पैटर्न या पिन से कम सुरक्षित हो सकता है."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"अपने फ़ोन को अनलॉक करने, खरीदारियों को प्राधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर को छूएं. इसमें सावधानी रखें कि आप किस व्यक्ति के फ़िंगरप्रिंट जोड़ रहे हैं. यहां तक कि जोड़े गए एक भी प्रिंट से भी इनमें से कोई चीज़ हो सकती है.\n\nध्यान दें: हो सकता है कि आपका फ़िंगरप्रिंट किसी मज़बूत पैटर्न या पिन से कम सुरक्षित हो."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"खरीदारियों को प्राधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर को छूएं. इसमें सावधानी रखें कि आप किस व्यक्ति के फ़िंगरप्रिंट जोड़ रहे हैं. यहां तक कि जोड़े गए एक भी प्रिंट से भी इनमें से कोई चीज़ हो सकती है.\n\nनोट: आप इस डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग नहीं कर सकते हैं. अधिक जानकारी के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"अपने फ़ोन को अनलॉक करने, खरीदारियों को प्राधिकृत करने या ऐप्लिकेशन में प्रवेश करने के लिए बस फ़िंगरप्रिंट सेंसर को छूएं. इसमें सावधानी रखें कि आप किस व्यक्ति के फ़िंगरप्रिंट जोड़ रहे हैं. यहां तक कि जोड़े गए एक भी प्रिंट से भी इनमें से कोई चीज़ हो सकती है.\n\nध्यान दें: हो सकता है कि आपका फ़िंगरप्रिंट किसी मज़बूत पैटर्न या पिन से कम सुरक्षित हो."</string>
<string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"अभी नहीं"</string>
<string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"जारी रखें"</string>
<string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"अभी नहीं"</string>
@@ -368,26 +368,26 @@
<string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"डिवाइस सुरक्षा सुविधाओं को सक्रिय नहीं किया जाएगा. यदि यह फ़ोन खो जाता है या चोरी चला जाता है, तो आप इसे दूसरे लोगों द्वारा उपयोग किए जाने से नहीं रोक सकेंगे."</string>
<string name="skip_anyway_button_label" msgid="2323522873558834513">"फिर भी आगे बढ़ें"</string>
<string name="go_back_button_label" msgid="4745265266186209467">"वापस जाएं"</string>
- <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"संवेदक ढूंढें"</string>
- <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"अपने फ़ोन के पीछे फ़िंगरप्रिंट संवेदक का पता लगाएं."</string>
- <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"डिवाइस और फ़िंगरप्रिंट संवेदक स्थान वाला चित्रण"</string>
+ <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"सेंसर ढूंढें"</string>
+ <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"अपने फ़ोन के पीछे फ़िंगरप्रिंट सेंसर का पता लगाएं."</string>
+ <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"डिवाइस और उस पर फ़िंगरप्रिंट सेंसर की जगह बताने वाला चित्रण"</string>
<string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"नाम"</string>
<string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"ठीक"</string>
<string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"हटाएं"</string>
<string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"आइए शुरू करें"</string>
- <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"अपनी अंगुली संवेदक पर रखें और कंपन का अनुभव होने पर उठा लें"</string>
+ <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"अपनी उंगली सेंसर पर रखें और कंपन का अनुभव होने पर उठा लें"</string>
<string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"जारी रखें"</string>
<string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"अपने फ़िंगरप्रिंट के सभी भिन्न भागों को जोड़ने के लिए अपनी अंगुली को धीरे से हिलाएं"</string>
<string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"अंगुली की छाप जोड़ा है!"</string>
<string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"जब भी आपको यह आइकन दिखाई दे, आप पहचान के लिए या खरीदारी को अधिकृत करने के लिए अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं."</string>
- <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"अपने डिवाइस को सक्रिय और अनलॉक करने के लिए बस फ़िंगरप्रिंट सेंसर स्पर्श करें."</string>
+ <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"अपने डिवाइस को सक्रिय और अनलॉक करने के लिए बस फ़िंगरप्रिंट सेंसर को छूएं."</string>
<string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"यह आइकन दिखाई देने पर, आप खरीदारियां प्राधिकृत कर सकते हैं या ऐप्लिकेशन में प्रवेश भी कर सकते हैं."</string>
<string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फ़िंगरप्रिंट सेटअप छोड़ें?"</string>
<string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"आपने अपने फ़ोन को अनलॉक करने के एक तरीके के रूप में अपने फ़िंगरप्रिंट का उपयोग करने का चयन किया है. यदि आप इसे अभी छोड़ते हैं, तो आपको इसे बाद में सेट करना होगा. सेटअप में लगभग एक मिनट लगता है."</string>
<string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्क्रीन लॉक सेट करें"</string>
<string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"हो गया"</string>
- <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ओह, वह संवेदक नहीं है"</string>
- <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"डिवाइस पर फ़िंगरप्रिंट संवेदक का उपयोग करें."</string>
+ <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"ओह, वह सेंसर नहीं है"</string>
+ <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"डिवाइस पर फ़िंगरप्रिंट सेंसर का उपयोग करें."</string>
<string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"नामांकन पूर्ण नहीं हुआ था"</string>
<string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"फ़िंगरप्रिंट नामांकन समय की सीमा पार हो गई है. फिर से प्रयास करें."</string>
<string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"फ़िंगरप्रिंट नामांकन ने काम नहीं किया. फिर से प्रयास करें या किसी दूसरी अंगुली का उपयोग करें."</string>
@@ -395,7 +395,7 @@
<string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"आगे"</string>
<string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"अपना फ़ोन अनलॉक करने के साथ ही, खरीदी और ऐप ऐक्सेस को अधिकृत करने के लिए आप अपनी फ़िंगरप्रिंट का भी उपयोग कर सकते हैं. "<annotation id="url">"और जानें"</annotation></string>
<string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" स्क्रीन लॉक विकल्प अक्षम है. अधिक जानने के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें. "<annotation id="admin_details">"अधिक विवरण"</annotation>\n\n"आप खरीदारी और ऐप्लिकेशन एक्सेस अधिकृत करने के लिए अभी भी अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं. "<annotation id="url">"अधिक जानें"</annotation></string>
- <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"अंगुली उठाएं, फिर सेंसर को पुनः स्पर्श करें"</string>
+ <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"उंगली उठाएं और सेंसर को फिर छूएं"</string>
<string name="fingerprint_add_max" msgid="1020927549936895822">"आप <xliff:g id="COUNT">%d</xliff:g> फ़िंगरप्रिंट तक जोड़ सकते हैं"</string>
<string name="fingerprint_intro_error_max" msgid="6864066984678078441">"आप अधिकतम संख्या में फ़िंगरप्रिंट जोड़ चुके हैं"</string>
<string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"और अधिक फ़िंगरप्रिंट नहीं जोड़े जा सकते"</string>
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> का उपयोग करें?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए यह आवश्यक है:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"चूंकि एक ऐप अनुमति के अनुरोध को अस्पष्ट बना रहा है, इसलिए सेटिंग आपके प्रतिसाद को सत्यापित नहीं कर पा रही हैं."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"चूंकि दूसरा ऐप्लिकेशन इन विकल्पों के ऊपर दिखाई दे रहा है, इसलिए सेटिंग आपकी कार्रवाई का जवाब नहीं दे सकती हैं."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"यदि आप <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करते हैं, तो आपका डिवाइस डेटा एन्क्रिप्शन को एन्हांस करने के लिए आपके स्क्रीन लॉक का उपयोग नहीं करेगा."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"क्योंकि आपने सरल उपयोग सेवा चालू की हुई है इसलिए आपका डिवाइस डेटा एन्क्रिप्शन को एन्हांस करने के लिए आपके स्क्रीन लॉक का उपयोग नहीं करेगा."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"क्योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्क्रिप्शन प्रभावित होता है, इसलिए आपको अपने पैटर्न की पुष्टि करनी होगी."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कैनिंग"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> पहले"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"पूरी तरह से चार्ज होने के बाद से अब तक का ऐप्लिकेशन उपयोग (<xliff:g id="TIME">^1</xliff:g> पहले)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"डिवाइस के पूरी तरह चार्ज होने (<xliff:g id="TIME">^1</xliff:g> पहले) के बाद से अब तक का उपयोग"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"पिछली बार पूरी तरह चार्ज होने के बाद से अब तक स्क्रीन के चालू रहने का समय"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"पिछली बार पूरी चार्ज होने के बाद से अब तक का डिवाइस उपयोग"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग होने के बाद से बैटरी का उपयोग"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"पावर का अत्यधिक उपयोग"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> के लिए उपयोग किया गया"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"स्क्रीन उपयोग <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ने <xliff:g id="PERCENT">%1$s</xliff:g> उपयोग किया है"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"पूरी बैटरी का <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"पूरी तरह चार्ज होने के बाद से अब तक का विश्लेषण"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"नोटिफ़िकेशन"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"उन्नत"</string>
<string name="profile_section_header" msgid="2320848161066912001">"कार्य नोटिफ़िकेशन"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"आइकन बैज की अनुमति दें"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"ब्लिंक लाइट"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"लॉक स्क्रीन पर"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सभी नोटिफ़िकेशन सामग्री दिखाएं"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> श्रेणियां हटाई गईं</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> श्रेणियां हटाई गईं</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"नोटिफ़िकेशन बैज"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"चालू"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"बंद"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"सभी रोक दें"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"ये नोटिफिकेशन कभी ना दिखाएं"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"नोटिफ़िकेशन दिखाएं"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"नोटिफ़िकेशन कभी भी शेड में या पेरिफ़ेरल डिवाइस पर ना दिखाएं"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"आइकन बैज की अनुमति दें"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"परेशान ना करें को ओवरराइड करें"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"जब परेशान ना करें को केवल प्राथमिकता पर सेट किया गया हो, तब इन नोटिफिकेशन को बाधित करते रहने दें"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"लॉक स्क्रीन पर"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"बैटरी ऑप्टिमाइज़ेशन"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"उपयोग संबंधी सूचनाएं"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"सभी ऐप दिखाएं"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"अतिरिक्त ऐप छिपाएं"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"डिवाइस का पूरा उपयोग दिखाएं"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"ऐप्लिकेशन का उपयोग दिखाएं"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"ऑप्टिमाइज़ नहीं किया गया"</string>
<string name="high_power_on" msgid="6216293998227583810">"ऑप्टिमाइज़ नहीं किया गया"</string>
<string name="high_power_off" msgid="3393904131961263278">"बैटरी उपयोग ऑप्टिमाइज़ किया जा रहा है"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"गेम"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"अन्य ऐप्लिकेशन"</string>
<string name="storage_files" msgid="8581083146777364063">"फ़ाइलें"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"टैबलेट में जगह"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"फ़ोन की जगह"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> में से उपयोग किया गया"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"उपयोग की गई"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 919505c..0e245d4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1874,7 +1874,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Želite li upotrijebiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> treba sljedeće:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Budući da aplikacija prekriva zahtjev za dopuštenje, Postavke ne mogu potvrditi vaš odgovor."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Neka druga aplikacija prikazuje se iznad tih opcija, pa Postavke ne mogu reagirati na vašu radnju."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ako uključite <xliff:g id="SERVICE">%1$s</xliff:g>, vaš uređaj neće upotrebljavati PIN ili zaporku za zaključavanje zaslona za bolje šifriranje podataka."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Budući da ste uključili uslugu pristupačnosti, vaš uređaj neće upotrebljavati PIN ili zaporku za zaključavanje zaslona za bolje šifriranje podataka."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Budući da uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utječe na enkripciju podataka, morate potvrditi uzorak."</string>
@@ -1935,6 +1934,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Pretraživanje mobilnih mreža"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"prije <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Upotreba aplikacija od pune baterije (prije <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Upotreba uređaja od potpunog punjenja (prije <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Količina vremena dok je zaslon bio uključen od posljednjeg punjenja"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Upotreba uređaja od potpunog punjenja"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Upotreba baterije nakon isključivanja"</string>
@@ -2026,6 +2026,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Previše obračunata potrošnja energije"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Upotrebljava se <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Upotreba zaslona <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> upotrebljava <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupne potrošnje baterije"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Razrada od posljednjeg potpunog punjenja"</string>
@@ -2804,7 +2805,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Obavijesti"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Napredno"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Obavijesti s radnog profila"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Dopusti značke ikona"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Trepereće svjetlo"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaključanom zaslonu"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikaži sav sadržaj obavijesti"</string>
@@ -2882,14 +2884,16 @@
<item quantity="few">Izbrisane su <xliff:g id="COUNT_1">%d</xliff:g> kategorije</item>
<item quantity="other">Izbrisano je <xliff:g id="COUNT_1">%d</xliff:g> kategorija</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Značke za obavijesti"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Uključene"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Isključene"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Nikad ne prikazuj te obavijesti"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Prikaži obavijesti"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Nikad ne prikazuj obavijesti na zaslonu obavijesti ili na perifernim uređajima"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Dopusti značku ikone"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Nadjačaj Ne ometaj"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Neka te obavijesti nastave prekidati kada je način Ne ometaj postavljen na Samo prioritetno"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom zaslonu"</string>
@@ -3128,8 +3132,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimizacija baterije"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Upozorenja o upotrebi"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Pokaži sve aplikacije"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij dodatne aplikacije"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Prikaži potpunu upotrebu uređaja"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Prikaži upotrebu aplikacije"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Nije optimizirano"</string>
<string name="high_power_on" msgid="6216293998227583810">"Nije optimizirano"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimiziranje upotrebe baterije"</string>
@@ -3618,8 +3622,6 @@
<string name="storage_games" msgid="7703159201697117621">"Igre"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Ostale aplikacije"</string>
<string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Pohrana tableta"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Pohrana na telefonu"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Upotrijebljeno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"upot."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index ad7290b..27ed2be 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Használja a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"A(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatásnak a következőkre van szüksége:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Mivel az egyik alkalmazás zavar egy engedélykérelmet, a Beállítások funkció nem tudja ellenőrizni az Ön válaszát."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Mivel egy másik alkalmazás jelenik meg a beállítások felett, a Beállítások alkalmazás nem tud válaszolni a műveletre."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ha engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást, az eszköz nem fogja használni a képernyőzárat az adattitkosítás növelése érdekében."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Mivel engedélyezett egy kisegítő szolgáltatást, az eszköz nem fogja használni a képernyőzárat az adattitkosítás növelése érdekében."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Mivel a(z) <xliff:g id="SERVICE">%1$s</xliff:g> bekapcsolása hatással van az adatok titkosítására, meg kell erősítenie mintáját."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Mobilhálózat keresése"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Ennyi ideje: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Használat teljes töltés óta (ennyi ideje: <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Eszközhasználat a teljes töltés óta (ennyi ideje: <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Képernyőidő teljes töltés óta"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Eszközhasználat teljes feltöltés óta"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Akkumulátorhasználat a legutolsó töltés óta"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Túlbecsült energiafogyasztás"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Használat ideje: <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Képernyőhasználat: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"A(z) <xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g>-ot használt"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"Az akkumulátor teljes töltöttségi szintjének <xliff:g id="PERCENT">%1$s</xliff:g>-a"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Statisztikák az utolsó teljes feltöltés óta"</string>
@@ -2779,7 +2780,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Értesítések"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Speciális"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Munkahelyi profil értesítései"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Ikonjelvények engedélyezése"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Villogó fény"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"A lezárási képernyőn"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Az összes értesítés jelenjen meg"</string>
@@ -2854,14 +2856,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategória törölve</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategória törölve</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Értesítésjelvények"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Bekapcsolva"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Kikapcsolva"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Az összes letiltása"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Soha ne jelenjenek meg ezek az értesítések"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Értesítések megjelenítése"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Soha ne jelenjen meg értesítés az értesítési felületen és a perifériás eszközökön"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Ikonjelvény engedélyezése"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"A Ne zavarjanak mód felülbírálása"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"A Ne zavarjanak mód „Csak prioritásos” beállítása esetén ezek az értesítések továbbra is zavarhatnak"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"A lezárási képernyőn"</string>
@@ -3094,8 +3098,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Akkumulátoroptimalizálás"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Használati értesítések"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Összes alkalmazás mutatása"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"További alkalmazások elrejtése"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Teljes eszközhasználat megjelenítése"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Alkalmazáshasználat mutatása"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Nincs optimalizálva"</string>
<string name="high_power_on" msgid="6216293998227583810">"Nincs optimalizálva"</string>
<string name="high_power_off" msgid="3393904131961263278">"Akkumulátorhasználat optimalizálása"</string>
@@ -3569,8 +3573,6 @@
<string name="storage_games" msgid="7703159201697117621">"Játékok"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Egyéb alkalmazások"</string>
<string name="storage_files" msgid="8581083146777364063">"Fájlok"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Táblagép tárhelye"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefontárhely"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"A(z) <xliff:g id="TOTAL">%1$s</xliff:g> tárhelyből felhasznált mennyiség"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"foglalt"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 01fbecd..002766b 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -926,7 +926,7 @@
<string name="volume_media_mute" msgid="3399059928695998166">"Համրեցնել երաժշտությունը & այլ մեդիան"</string>
<string name="volume_notification_mute" msgid="7955193480006444159">"Խլացնել ծանուցումները"</string>
<string name="volume_alarm_mute" msgid="4452239420351035936">"Համրեցնել ահազանգերը"</string>
- <string name="dock_settings" msgid="1820107306693002541">"Միակցել"</string>
+ <string name="dock_settings" msgid="1820107306693002541">"Կայան"</string>
<string name="dock_settings_title" msgid="9161438664257429372">"Հարակցման կարգավորումներ"</string>
<string name="dock_audio_settings_title" msgid="3324750259959570305">"Աուդիո"</string>
<string name="dock_audio_summary_desk" msgid="6487784412371139335">"Կցված աշխատասեղանի համակցման կարգավորումներ"</string>
@@ -1020,7 +1020,7 @@
<string name="automatic_brightness" msgid="5014143533884135461">"Ավտոմատ պայծառություն"</string>
<string name="lift_to_wake_title" msgid="4555378006856277635">"Բարձրացնել՝ միանալու համար"</string>
<string name="doze_title" msgid="2259176504273878294">"Քնելու ռեժիմի արգելք"</string>
- <string name="doze_summary" msgid="3846219936142814032">"Ակտիվացնում է էկրանը ծանուցումներ ստանալու դեպքում"</string>
+ <string name="doze_summary" msgid="3846219936142814032">"Ակտիվացնել էկրանը ծանուցումներ ստանալու դեպքում"</string>
<string name="title_font_size" msgid="4405544325522105222">"Տառաչափ"</string>
<string name="short_summary_font_size" msgid="6819778801232989076">"Տառաչափի մեծացում կամ փոքրացում"</string>
<string name="sim_lock_settings" msgid="3392331196873564292">"SIM քարտի կողպման կարգավորումներ"</string>
@@ -1312,17 +1312,17 @@
<string name="master_clear_progress_text" msgid="6559096229480527510">"Խնդրում ենք սպասել..."</string>
<string name="call_settings_title" msgid="5188713413939232801">"Զանգի կարգավորումները"</string>
<string name="call_settings_summary" msgid="7291195704801002886">"Կարգավորեք ձայնային փոստը, զանգի վերահասցեավորումը, զանգի սպասումը, զանգողի ID-ն"</string>
- <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB միացում"</string>
+ <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB մոդեմ"</string>
<string name="tether_settings_title_wifi" msgid="3277144155960302049">"Դյուրակիր թեժ կետ"</string>
- <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-ը կապվում է"</string>
- <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Միացում"</string>
+ <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth մոդեմ"</string>
+ <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Մոդեմի ռեժիմ"</string>
<string name="tether_settings_title_all" msgid="3058586928118801157">"Թեժ կետ և մոդեմի ռեժիմ"</string>
- <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Թեժ կետը և մոդեմի ռեժիմը միացված են"</string>
+ <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Թեժ կետ, մոդեմի ռեժիմ"</string>
<string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Թեժ կետը միացված է"</string>
- <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Միացում"</string>
+ <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Մոդեմի ռեժիմ"</string>
<string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Երբ թրաֆիկի տնտեսումն ակտիվ է, հնարավոր չէ կապել կամ օգտագործել շարժական հասանելիության կետերը"</string>
<string name="usb_title" msgid="7483344855356312510">"USB"</string>
- <string name="usb_tethering_button_text" msgid="585829947108007917">"USB միացում"</string>
+ <string name="usb_tethering_button_text" msgid="585829947108007917">"USB մոդեմ"</string>
<string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB սարքը միացված է, ստուգեք կապը"</string>
<string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Միացված է"</string>
<string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Հնարավոր չէ միանալ, երբ USB կրիչը օգտագործման մեջ է"</string>
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Օգտագործե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>-ին անհրաժեշտ է`"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Քանի որ ներածումն արգելափակված է ինչ-որ հավելվածի կողմից, Կարգավորումները չեն կարող հաստատել ձեր պատասխանը:"</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Քանի որ այս ընտրանքների վրա ցուցադրվում է մեկ այլ հավելված, Կարգավորումները չեն կարող արձագանքել ձեր գործողությանը:"</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Եթե միացնեք <xliff:g id="SERVICE">%1$s</xliff:g>-ը, ձեր սարքը չի օգտագործի էկրանի կողպումը՝ տվյալների կոդավորումը լավացնելու համար:"</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Քանի որ միացրել եք մատչելիության ծառայությունը, ձեր սարքը չի օգտագործի էկրանի կողպումը՝ տվյալների կոդավորումը լավացնելու համար:"</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Քանի որ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայության միացումն ազդում է տվյալների կոդավորմանը, դուք պետք է հաստատեք ձեր ապակողպման նախշը:"</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Բջջային ցանցի որոնում"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> առաջ"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Հավելվածների օգտագործումը լրիվ լիցքավորումից հետո (<xliff:g id="TIME">^1</xliff:g> առաջ)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Սարքի օգտագործումը լրիվ լիցքավորումից հետո (<xliff:g id="TIME">^1</xliff:g> առաջ)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Ժամանակը, որի ընթացքում էկրանը միացած է եղել լրիվ լիցքավորումից հետո"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Սարքի օգտագործումը վերջին լրիվ լիցքավորումից հետո"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Մարտկոցի օգտագործման չափը անջատումից հետո"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Մարտկոցի գերօգտագործում"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Օգտագործվել է <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"էկրանի օգտագործում՝ <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> օգտագործվել է <xliff:g id="APP">%2$s</xliff:g> հավելվածի կողմից"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"Մարտկոցի ընդհանուր լիցքի <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Օգտագործումը վերջին լիցքավորումից հետո"</string>
@@ -2741,7 +2742,7 @@
<string name="dock_audio_media_title" msgid="1346838179626123900">"Նվագարկել միակցիչի բարձրախոսով"</string>
<string name="dock_audio_media_disabled" msgid="3430953622491538080">"Բոլոր աուդիոֆայլերը"</string>
<string name="dock_audio_media_enabled" msgid="667849382924908673">"Միայն մեդիակրիչի աուդիոֆայլերը"</string>
- <string name="emergency_tone_silent" msgid="1067515631635824291">"Լուռ"</string>
+ <string name="emergency_tone_silent" msgid="1067515631635824291">"Անձայն"</string>
<string name="emergency_tone_alert" msgid="8941852695428130667">"Զգուշացում"</string>
<string name="emergency_tone_vibrate" msgid="8281126443204950847">"Թրթռալ"</string>
<string name="boot_sounds_title" msgid="567029107382343709">"Միացման ձայներ"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Ծանուցումներ"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Լրացուցիչ"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Աշխատանքային ծանուցումներ"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Թույլատրել պատկերակների նշանակները"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Թարթող լույս"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Կողպէկրանին"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ցուցադրել ամբողջ ծանուցումը"</string>
@@ -2826,10 +2828,10 @@
<string name="display_vr_pref_title" msgid="8104485269504335481">"Երբ սարքը գտնվում է VR ռեժիմում"</string>
<string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Նվազեցնել շաղումը (խորհուրդ է տրվում)"</string>
<string name="display_vr_pref_off" msgid="2190091757123260989">"Նվազեցնել թարթումը"</string>
- <string name="picture_in_picture_title" msgid="5824849294270017113">"Նկարը նկարի մեջ"</string>
+ <string name="picture_in_picture_title" msgid="5824849294270017113">"Նկար նկարի մեջ"</string>
<string name="picture_in_picture_empty_text" msgid="685224245260197779">"Տեղադրված հավելվածներից ոչ մեկը չի աջակցում Նկար նկարի մեջ"</string>
<string name="picture_in_picture_keywords" msgid="8361318686701764690">"նկարը նկարի մեջ, նկար, ննմ"</string>
- <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Նկարը նկարի մեջ"</string>
+ <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Նկար նկարի մեջ"</string>
<string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Թույլատրել «նկարը նկարի մեջ» ռեժիմը"</string>
<string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Թույլ տալ այս հավելվածին ստեղծել «նկարը նկարի մեջ» պատուհան՝ երբ հավելվածը բաց է կամ այն լքելուց հետո (օրինակ՝ տեսանյութի դիտումը շարունակելու համար): Այս պատուհանը ցուցադրվում է ձեր կողմից օգտագործվող այլ հավելվածների վերևում:"</string>
<string name="picture_in_picture_on" msgid="6103704909710176555">"Այո"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
<item quantity="other">Ջնջվել է <xliff:g id="COUNT_1">%d</xliff:g> կատեգորիա</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Ծանուցման նշանակներ"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Միացված է"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Անջատված է"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Արգելափակել բոլորը"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Երբեք չցուցադրել այս ծանուցումները"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Ցուցադրել ծանուցումները"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Երբեք չցուցադրել ծանուցումները ստվերում կամ արտաքին սարքերի վրա"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Թույլատրել պատկերակի նշանակը"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Վրագրել «Չանհանգստացնել» պարամետրը"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Թույլ տալ այս ծանուցումների կողմից ընդհատումները, երբ «Չանհանգստացնել» պարամետրի համար նշանակված է «Միայն կարևորները» արժեքը"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Կողպէկրանին"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Մարտկոցի օպտիմալացում"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Օգտագործման զգուշացումներ"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Ցուցադրել բոլոր հավելվածները"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Թաքցնել լրացուցիչ հավելվածները"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Ցույց տալ ամբողջ սարքի օգտագործումը"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Ցույց տալ հավելվածների օգտագործումը"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Չեն տնտեսում լիցքը"</string>
<string name="high_power_on" msgid="6216293998227583810">"Չօպտիմալացված"</string>
<string name="high_power_off" msgid="3393904131961263278">"Մարտկոցի սպառման օպտիմալացում"</string>
@@ -3468,9 +3472,9 @@
<string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Ծանուցումներն արագ տեսնելու համար վերցրեք պլանշետը:"</string>
<string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Ծանուցումներն արագ տեսնելու համար վերցրեք սարքը:"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Ծանուցումները դիտելու համար օգտագործել մատնահետքերի սկաները"</string>
- <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ծանուցումները տեսնելու համար՝ մատը սահեցրեք ներքև հեռախոսի հետնամասում գտնվող մատնահետքերի սկաների վրա"</string>
- <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Ծանուցումները տեսնելու համար պլանշետի հետնամասում գտնվող մատնահետքերի սկաների վրա մատը ներքև սահեցրեք:"</string>
- <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Ծանուցումները տեսնելու համար սարքի հետնամասում գտնվող մատնահետքերի սկաների վրա մատը ներքև սահեցրեք:"</string>
+ <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ծանուցումները տեսնելու համար՝ մատը սահեցրեք ներքև հեռախոսի հետևի մասում գտնվող մատնահետքերի սկաների վրա"</string>
+ <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Ծանուցումները տեսնելու համար պլանշետի հետևի մասում գտնվող մատնահետքերի սկաների վրա մատը ներքև սահեցրեք:"</string>
+ <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Ծանուցումները տեսնելու համար սարքի հետևի մասում գտնվող մատնահետքերի սկաների վրա մատը ներքև սահեցրեք:"</string>
<string name="assist_gesture_title" msgid="7746563137898655539">"Օժանդակ ժեստ"</string>
<string name="assist_gesture_summary" msgid="7575773425455374300"></string>
<string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Զգայունություն"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Խաղեր"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Այլ հավելվածներ"</string>
<string name="storage_files" msgid="8581083146777364063">"Ֆայլեր"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Պլանշետի հիշողությունը"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Հեռախոսի հիշողություն"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Օգտագործված է <xliff:g id="TOTAL">%1$s</xliff:g>-ից"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"զբաղված է"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 67b4b2b..05aebe4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -922,9 +922,9 @@
<string name="volume_ring_description" msgid="5936851631698298989">"Nada dering & notifikasi"</string>
<string name="volume_notification_description" msgid="5810902320215328321">"Notifikasi"</string>
<string name="volume_alarm_description" msgid="8322615148532654841">"Alarm"</string>
- <string name="volume_ring_mute" msgid="3018992671608737202">"Bisukan nada dering & notifikasi"</string>
+ <string name="volume_ring_mute" msgid="3018992671608737202">"Matikan nada dering & notifikasi"</string>
<string name="volume_media_mute" msgid="3399059928695998166">"Bisukan musik & media lain"</string>
- <string name="volume_notification_mute" msgid="7955193480006444159">"Bisukan notifikasi"</string>
+ <string name="volume_notification_mute" msgid="7955193480006444159">"Matikan notifikasi"</string>
<string name="volume_alarm_mute" msgid="4452239420351035936">"Bisukan alarm"</string>
<string name="dock_settings" msgid="1820107306693002541">"Dok"</string>
<string name="dock_settings_title" msgid="9161438664257429372">"Setelan dok"</string>
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> perlu:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Karena sebuah aplikasi menghalangi permintaan izin, Setelan tidak dapat memverifikasi tanggapan Anda."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Karena aplikasi lain muncul di atas opsi ini, Setelan tidak dapat merespons tindakan Anda."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jika Anda mengaktifkan <xliff:g id="SERVICE">%1$s</xliff:g>, perangkat tidak akan menggunakan kunci layar untuk meningkatkan enkripsi data."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Karena Anda telah mengaktifkan layanan aksesibilitas, perangkat tidak akan menggunakan kunci layar untuk meningkatkan enkripsi data."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Karena mengaktifkan <xliff:g id="SERVICE">%1$s</xliff:g> memengaruhi enkripsi data, Anda perlu mengonfirmasi pola."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Pemindaian jaringan seluler"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> yang lalu"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Penggunaan aplikasi sejak pengisian baterai terakhir hingga penuh (<xliff:g id="TIME">^1</xliff:g> yang lalu)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Penggunaan perangkat sejak baterai diisi penuh (<xliff:g id="TIME">^1</xliff:g> lalu)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Jumlah waktu layar diaktifkan sejak pengisian daya terakhir hingga penuh"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Penggunaan perangkat sejak pengisian baterai penuh terakhir"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Penggunaan baterai sejak dicabut"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan daya yang dihitung berlebih"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Digunakan selama <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Penggunaan layar <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> digunakan oleh <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> dari seluruh penggunaan baterai"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Penggunaan sejak pengisian baterai terakhir hingga penuh"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifikasi"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Lanjutan"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notifikasi kerja"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Izinkan badge ikon"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Cahaya kedip"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Di layar kunci"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Menampilkan semua konten notifikasi"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategori dihapus</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori dihapus</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Badge notifikasi"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Aktif"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Nonaktif"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blokir semua"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Jangan pernah tampilkan notifikasi ini"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Tampilkan notifikasi"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Jangan pernah tampilkan notifikasi di bayangan atau di perangkat periferal"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Izinkan badge ikon"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ganti mode Jangan Ganggu"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Izinkan notifikasi ini terus mengganggu jika mode Jangan Ganggu disetel ke Hanya Prioritas"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Di layar kunci"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Pengoptimalan baterai"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Pemberitahuan penggunaan"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Tampilkan semua aplikasi"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Sembunyikan aplikasi ekstra"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Tampilkan penggunaan perangkat penuh"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Tampilkan penggunaan aplikasi"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Tidak dioptimalkan"</string>
<string name="high_power_on" msgid="6216293998227583810">"Tidak dioptimalkan"</string>
<string name="high_power_off" msgid="3393904131961263278">"Mengoptimalkan penggunaan baterai"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Game"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Aplikasi lainnya"</string>
<string name="storage_files" msgid="8581083146777364063">"File"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Penyimpanan tablet"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Penyimpanan ponsel"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Terpakai dari <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"dipakai"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 5aa4823..73cd12f 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Nota <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> þarf að:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Stillingar geta ekki staðfest svarið þitt vegna þess að forrit er að fela heimildarbeiðni."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Stillingar geta ekki brugðist við aðgerðinni því að annað forrit er birt yfir þessum valkostum."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ef þú kveikir á <xliff:g id="SERVICE">%1$s</xliff:g> mun tækið ekki nota skjálásinn til að efla dulkóðun gagna."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Þar sem þú hefur kveikt á aðgengisþjónustu mun tækið ekki nota skjálásinn til að efla dulkóðun gagna."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Ef <xliff:g id="SERVICE">%1$s</xliff:g> er gert virkt hefur það áhrif á dulkóðun gagna og því þarftu að staðfesta mynstrið þitt."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Leit að farsímaneti"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"fyrir <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Notkun forrita frá fullri hleðslu (fyrir <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Notkun tækis frá fullri hleðslu (fyrir <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Liðinn tími frá síðustu fullu hleðslu"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Tækjanotkun frá síðustu fullu hleðslu"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Rafhlöðunotkun frá síðustu hleðslu"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Oftalin orkunotkun"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Notað fyrir <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Skjánotkun <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> notuð af <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> af heildarrafhlöðuorku"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Greining frá síðustu fullu hleðslu"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Tilkynningar"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Ítarlegt"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Vinnutilkynningar"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Leyfa merkingu á skjöldum"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Blikkandi ljós"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Á lásskjá"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Sýna allt innihald tilkynninga"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> flokki eytt</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> flokkum eytt</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Tilkynningaskildir"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Kveikt"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Slökkt"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Útiloka allt"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Aldrei sýna þessar tilkynningar"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Sýna tilkynningar"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Aldrei sýna tilkynningar í skugga eða á jaðartækjum"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Leyfa merkingu á tákni"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Hnekkja „Ónáðið ekki“"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Láta þessar tilkynningar halda áfram að trufla þegar „Ónáðið ekki“ er stillt á „Aðeins forgangur“"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Á lásskjá"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Rafhlöðusparnaður"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Notkunartilkynningar"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Sýna öll forrit"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Fela aukaforrit"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Sýna alla notkun tækis"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Sýna forritanotkun"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Enginn sparnaður"</string>
<string name="high_power_on" msgid="6216293998227583810">"Enginn sparnaður"</string>
<string name="high_power_off" msgid="3393904131961263278">"Sparar rafhlöðunotkun"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Leikir"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Önnur forrit"</string>
<string name="storage_files" msgid="8581083146777364063">"Skrár"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Geymsla spjaldtölvu"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Geymslurými símans"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Notað af <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"notuð"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1774bb0..3ac27fc 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Utilizzare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> deve:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Un\'app sta oscurando una richiesta di autorizzazione, pertanto Impostazioni non può verificare la tua risposta."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Impostazioni non può rispondere alla tua azione perché c\'è un\'altra app visualizzata sopra queste opzioni."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se attivi <xliff:g id="SERVICE">%1$s</xliff:g>, il dispositivo non utilizzerà il blocco schermo per migliorare la crittografia dei dati."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Il dispositivo non utilizzerà il blocco schermo per migliorare la crittografia dei dati perché hai attivato un servizio di accessibilità."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"L\'attivazione di <xliff:g id="SERVICE">%1$s</xliff:g> incide sulla crittografia dei dati, pertanto devi confermare la sequenza."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Scansione rete mobile"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> fa"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Utilizzo dell\'app dall\'ultima ricarica (<xliff:g id="TIME">^1</xliff:g> fa)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilizzo del dispositivo dall\'ultima ricarica completa (<xliff:g id="TIME">^1</xliff:g> fa)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tempo per cui la schermata è rimasta attiva dalla ricarica completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Utilizzo del dispositivo dall\'ultima ricarica completa"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Utilizzo batteria dallo scollegamento"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo batteria sovrastimato"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Usato per <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Uso dello schermo: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizzato da <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> dell\'utilizzo totale della batteria"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Analisi dettagliata dall\'ultima ricarica completa"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notifiche"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avanzate"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notifiche di lavoro"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Consenti badge icona"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Luce lampeggiante"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Sulla schermata di blocco"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tutti i contenuti delle notifiche"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorie eliminate</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria eliminata</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Badge di notifica"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"On"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Non attive"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blocca tutto"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Non mostrare mai queste notifiche"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Mostra notifiche"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Non mostrare mai notifiche nella relativa area o su dispositivi periferici"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Attiva badge icona"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignora Non disturbare"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Consenti notifiche quando l\'opzione Non disturbare è impostata su Solo con priorità"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Sulla schermata di blocco"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Ottimizzazione batteria"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Avvisi sul livello di carica"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Mostra tutte le app"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Nascondi app extra"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Mostra utilizzo completo del dispositivo"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Mostra utilizzo delle app"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Senza ottimizzazione"</string>
<string name="high_power_on" msgid="6216293998227583810">"Senza ottimizzazione"</string>
<string name="high_power_off" msgid="3393904131961263278">"Uso della batteria ottimizzato"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Giochi"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Altre app"</string>
<string name="storage_files" msgid="8581083146777364063">"File"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Memoria del tablet"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Memoria telefono"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Spazio utilizzato di <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"usato"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f3f9f99..f452830 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -374,20 +374,20 @@
<string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"תכונות הגנת המכשיר לא יופעלו. במקרה של אובדן או גנבה, לא תהיה לך אפשרות למנוע מאחרים להשתמש בטלפון."</string>
<string name="skip_anyway_button_label" msgid="2323522873558834513">"ברצוני לדלג בכל זאת"</string>
<string name="go_back_button_label" msgid="4745265266186209467">"חזרה"</string>
- <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"אתר את החיישן"</string>
+ <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"איתור החיישן"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"אתר את חיישן טביעת האצבע בגב הטלפון."</string>
<string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"איור המציג את המיקום של חיישן טביעת האצבע במכשיר"</string>
<string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"שם"</string>
<string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"אישור"</string>
<string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"מחיקה"</string>
- <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"אפשר להתחיל"</string>
+ <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"קדימה, נתחיל"</string>
<string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"הנח את האצבע על החיישן והרם אותה לאחר שתרגיש רטט"</string>
<string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"המשך"</string>
<string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"הזז מעט את האצבע כדי להוסיף את כל החלקים של טביעת האצבע"</string>
<string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"טביעת האצבע נוספה!"</string>
<string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"כשתראה את הסמל הזה, תוכל להשתמש בטביעת האצבע שלך לצורך זיהוי או אישור רכישה."</string>
<string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"גע בחיישן טביעת האצבע כדי להוציא את המכשיר ממצב שינה ולבטל את הנעילה שלו."</string>
- <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"כשהסמל הזה מוצג לך, פירוש הדבר הוא שאתה יכול גם לאשר רכישות או להיכנס לאפליקציות."</string>
+ <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"כשהסמל הזה מופיע, פירוש הדבר הוא שאפשר גם לאשר רכישות או להיכנס לאפליקציות."</string>
<string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"האם לדלג על הגדרת טביעת אצבע?"</string>
<string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"בחרת להשתמש בטביעת האצבע שלך כאחת מהדרכים שבהן תוכל לבטל את הנעילה בטלפון. אם תדלג על שלב זה עכשיו, תצטרך לבצע את ההגדרה בהמשך. ההגדרה לוקחת רק דקה או שתיים."</string>
<string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"הגדר נעילת מסך"</string>
@@ -647,7 +647,7 @@
<string name="bluetooth_menu_advanced" msgid="8572178316357220524">"אפשרויות מתקדמות"</string>
<string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth מתקדם"</string>
<string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"כש-Bluetooth פועל, יש קשר למכשירי Bluetooth אחרים."</string>
- <string name="ble_scan_notify_text" msgid="1295915006005700650">"כדי לשפר את דיוק המיקום, אפליקציות ושירותים של המערכת יכולים עדיין לזהות התקני Bluetooth. תוכל לשנות זאת ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+ <string name="ble_scan_notify_text" msgid="1295915006005700650">"כדי לשפר את דיוק המיקום, אפליקציות ושירותים של המערכת יכולים עדיין לזהות התקני Bluetooth. ניתן לשנות זאת ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"התחבר אל…"</string>
<string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק מהאודיו של המדיה."</string>
<string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ינותק מהאודיו של הדיבורית."</string>
@@ -719,7 +719,7 @@
<string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"התחבר לרשתות פתוחות"</string>
<string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"חיבור אוטומטית לרשתות ציבוריות באיכות גבוהה"</string>
<string name="wifi_install_credentials" msgid="3551143317298272860">"התקנת אישורים"</string>
- <string name="wifi_scan_notify_text" msgid="5593805423071186757">"כדי לשפר את דיוק המיקום, אפליקציות ושירותים של המערכת יכולים עדיין לזהות רשתות Wi‑Fi. תוכל לשנות זאת ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+ <string name="wifi_scan_notify_text" msgid="5593805423071186757">"כדי לשפר את דיוק המיקום, אפליקציות ושירותים של המערכת יכולים עדיין לזהות רשתות Wi‑Fi. ניתן לשנות זאת ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"כדי לשפר את דיוק המיקום, הפעל את אפשרות הסריקה אחר רשתות Wi-Fi ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"אל תציג שוב"</string>
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"ה-Wi-Fi ימשיך לפעול בזמן שינה"</string>
@@ -749,7 +749,7 @@
<string name="wifi_menu_forget" msgid="8736964302477327114">"שכח רשת"</string>
<string name="wifi_menu_modify" msgid="2068554918652440105">"שנה רשת"</string>
<string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"כתוב בתג NFC"</string>
- <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"כדי לראות רשתות זמינות, הפעל את ה-Wi-Fi."</string>
+ <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"כדי לראות רשתות זמינות יש להפעיל Wi-Fi."</string>
<string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"מחפש רשתות Wi-Fi…"</string>
<string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"אין לך הרשאה לשנות את רשת ה-Wi-Fi."</string>
<string name="wifi_more" msgid="3195296805089107950">"עוד"</string>
@@ -1517,7 +1517,7 @@
<string name="applications_settings_summary" msgid="6683465446264515367">"ניהול אפליקציות, הגדרת קיצורי דרך להפעלה מהירה"</string>
<string name="applications_settings_header" msgid="1014813055054356646">"הגדרות אפליקציה"</string>
<string name="install_applications" msgid="4872012136210802181">"מקורות לא ידועים"</string>
- <string name="install_applications_title" msgid="4987712352256508946">"התר את כל המקורות לאפליקציות"</string>
+ <string name="install_applications_title" msgid="4987712352256508946">"אפליקציות ממקורות שונים"</string>
<string name="install_all_warning" product="tablet" msgid="8310489909586138165">"הטאבלט והנתונים האישיים שלך פגיעים יותר להתקפות של אפליקציות לא מוכרות. על ידי התקנת אפליקציות ממקור זה, אתה מסכים לכך שאתה האחראי לכל נזק לטאבלט או לכל אובדן של נתונים שעשויים להיגרם כתוצאה מהשימוש באפליקציות אלה."</string>
<string name="install_all_warning" product="default" msgid="1952257127370115988">"הטלפון והנתונים האישיים שלך פגיעים יותר להתקפות של אפליקציות לא מוכרות. על ידי התקנת אפליקציות ממקור זה, אתה מסכים לכך שאתה האחראי לכל נזק לטלפון או לכל אובדן של נתונים שעשויים להיגרם כתוצאה מהשימוש באפליקציות אלה."</string>
<string name="advanced_settings" msgid="1777249286757067969">"הגדרות מתקדמות"</string>
@@ -1894,7 +1894,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"האם להשתמש ב-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> צריך אפשרות לבצע:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"יש אפליקציה שמסתירה את בקשת ההרשאה, ולכן להגדרות אין אפשרות לאמת את התשובה."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"אפליקציית ההגדרות לא יכולה להגיב לפעולה שלך כי אפליקציה אחרת מופיעה מעל האפשרויות האלה."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"אם תפעיל את <xliff:g id="SERVICE">%1$s</xliff:g>, המכשיר לא ישתמש בנעילת המסך כדי להגביר את הצפנת הנתונים."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"מפני שהפעלת שירות נגישות, המכשיר לא ישתמש בנעילת המסך כדי להגביר את הצפנת הנתונים."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"הפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, לכן עליך לאשר את קו ביטול הנעילה שלך."</string>
@@ -1956,6 +1955,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"סריקה של רשתות סלולריות"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"לפני <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"שימוש באפליקציה מאז הטעינה המלאה (לפני <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"השימוש במכשיר מאז הטעינה המלאה האחרונה (לפני <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"משך הזמן שבו המסך פעל מאז הטעינה המלאה"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"שימוש במכשיר מאז הטעינה המלאה"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"צריכת סוללה מאז הניתוק"</string>
@@ -2047,6 +2047,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"חישוב יתר של שימוש בחשמל"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> מיליאמפר לשעה"</string>
<string name="battery_used_for" msgid="2690821851327075443">"משך השימוש: <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"שימוש במסך במשך <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> בשימוש על ידי <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> מצריכת הסוללה הכוללת"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"פירוט מאז הטעינה המלאה האחרונה"</string>
@@ -2833,7 +2834,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"הודעות"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"אפשרויות מתקדמות"</string>
<string name="profile_section_header" msgid="2320848161066912001">"הודעות עבודה"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"הצגת תגים על גבי הסמלים"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"אור מהבהב"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"במסך הנעילה"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"תוכן ההודעות יופיע במלואו"</string>
@@ -2914,14 +2916,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> קטגוריות נמחקו</item>
<item quantity="one">קטגוריה <xliff:g id="COUNT_0">%d</xliff:g> נמחקה</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"תגי הודעות"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"מופעל"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"כבוי"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"חסום הכל"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"לעולם אל תציג את ההודעות האלה"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"הצג הודעות"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"אף פעם אל תציג הודעות בהצללה או במכשירים היקפיים"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"הצגת תג על הסמל"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ביטול / שינוי של \'נא לא להפריע\'"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"אפשר להודעות אלה להמשיך ולהפריע כאשר \'נא לא להפריע\' מוגדר כ\'עדיפות בלבד\'"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"במסך הנעילה"</string>
@@ -3166,8 +3170,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"אופטימיזציה של סוללה"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"התראות על ניצול סוללה"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"הצג את כל האפליקציות"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"הסתר את האפליקציות הנוספות"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"הצג נתונים מלאים על השימוש במכשיר"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"הצג את נתוני השימוש באפליקציה"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"לא בוצעה אופטימיזציה"</string>
<string name="high_power_on" msgid="6216293998227583810">"לא בוצעה אופטימיזציה"</string>
<string name="high_power_off" msgid="3393904131961263278">"מבצעת אופטימיזציה לשימוש בסוללה"</string>
@@ -3274,7 +3278,7 @@
<string name="write_settings_title" msgid="4232152481902542284">"יכולות לשנות את הגדרות המערכת"</string>
<string name="write_system_settings" msgid="3482913590601096763">"שינוי הגדרות המערכת"</string>
<string name="write_settings_preference" msgid="3407383041273067448">"הרשאת אפליקציה לשנות את הגדרות המערכת"</string>
- <string name="permit_write_settings" msgid="6393779336656870080">"התר שינוי של הגדרות המערכת"</string>
+ <string name="permit_write_settings" msgid="6393779336656870080">"אפשר לשנות את הגדרות המערכת"</string>
<string name="write_settings_description" msgid="6868293938839954623">"ההרשאה הזו מתירה לאפליקציה לשנות את הגדרות המערכת."</string>
<string name="write_settings_on" msgid="8230580416068832239">"כן"</string>
<string name="write_settings_off" msgid="5156104383386336233">"לא"</string>
@@ -3579,8 +3583,8 @@
<string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"האחסון שלך מנוהל כעת על ידי מנהל האחסון"</string>
<string name="account_for_section_header" msgid="5356566418548737121">"חשבונות עבור <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="configure_section_header" msgid="7391183586410814450">"הגדרה"</string>
- <string name="auto_sync_account_title" msgid="898796354710116383">"סנכרן נתונים באופן אוטומטי"</string>
- <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"סנכרן נתונים אישיים באופן אוטומטי"</string>
+ <string name="auto_sync_account_title" msgid="898796354710116383">"סנכרון נתונים באופן אוטומטי"</string>
+ <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"סנכרון נתונים אישיים באופן אוטומטי"</string>
<string name="auto_sync_work_account_title" msgid="4489172450037434152">"סנכרן נתוני עבודה באופן אוטומטי"</string>
<string name="auto_sync_account_summary" msgid="692499211629185107">"אפשר לאפליקציות לרענן נתונים באופן אוטומטי"</string>
<string name="account_sync_title" msgid="7214747784136106491">"סנכרון חשבון"</string>
@@ -3671,8 +3675,6 @@
<string name="storage_games" msgid="7703159201697117621">"משחקים"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"אפליקציות אחרות"</string>
<string name="storage_files" msgid="8581083146777364063">"קבצים"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"אחסון בטאבלט"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"אחסון בטלפון"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"בשימוש מתוך <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"בשימוש"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e968c5c..41b3704 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -313,9 +313,9 @@
<string name="date_picker_title" msgid="1338210036394128512">"日付"</string>
<string name="time_picker_title" msgid="483460752287255019">"時間"</string>
<string name="lock_after_timeout" msgid="4590337686681194648">"自動ロック"</string>
- <string name="lock_after_timeout_summary" msgid="6128431871360905631">"スリープ開始後<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
- <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"スリープの開始直後（<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>がロック解除を管理している場合を除く）"</string>
- <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"スリープ開始後<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>（<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>がロック解除を管理している場合を除く）"</string>
+ <string name="lock_after_timeout_summary" msgid="6128431871360905631">"スリープ開始後 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
+ <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"スリープの開始直後（<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> がロック解除を管理している場合を除く）"</string>
+ <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"スリープ開始後 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>（<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> がロック解除を管理している場合を除く）"</string>
<string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"ロック画面に所有者情報を表示"</string>
<string name="owner_info_settings_title" msgid="5530285568897386122">"ロック画面メッセージ"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"ウィジェットの有効化"</string>
@@ -571,8 +571,8 @@
<string name="manage_device_admin" msgid="537804979483211453">"端末管理アプリ"</string>
<string name="number_of_device_admins_none" msgid="7185056721919496069">"アクティブなアプリはありません"</string>
<plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
- <item quantity="other">有効なアプリ <xliff:g id="COUNT_1">%d</xliff:g> 個</item>
- <item quantity="one">有効なアプリ <xliff:g id="COUNT_0">%d</xliff:g> 個</item>
+ <item quantity="other">有効なアプリ: <xliff:g id="COUNT_1">%d</xliff:g> 個</item>
+ <item quantity="one">有効なアプリ: <xliff:g id="COUNT_0">%d</xliff:g> 個</item>
</plurals>
<string name="manage_trust_agents" msgid="4629279457536987768">"信頼できるエージェント"</string>
<string name="disabled_because_no_backup_security" msgid="6877660253409580377">"使用するには、まず画面ロックを設定してください"</string>
@@ -1467,7 +1467,7 @@
<string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"プロファイルのパターンを表示する"</string>
<string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"タップ操作時のバイブ"</string>
<string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"電源ボタンですぐにロックする"</string>
- <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>がロック解除を管理している場合を除く"</string>
+ <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> がロック解除を管理している場合を除く"</string>
<string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"ロック解除パターン設定"</string>
<string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"パターンの変更"</string>
<string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"ロック解除パターンの描き方"</string>
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>を利用しますか？"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>では以下が必要です。"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"アプリが許可リクエストを隠しているため、設定側でユーザーの応答を確認できません。"</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"このオプションに重なって他のアプリが表示されているため、[設定] を操作しても反応しません。"</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>をONにすると、端末データの暗号化の強化に画面ロックは使用されなくなります。"</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"ユーザー補助サービスがONに設定されているため、端末データの暗号化の強化に画面ロックは使用されません。"</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>をONにするとデータの暗号化に影響するため、パターンの確認が必要となります。"</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"モバイル ネットワークのスキャン"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>前"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"フル充電（<xliff:g id="TIME">^1</xliff:g>前）以降のアプリの電池使用状況"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"フル充電（<xliff:g id="TIME">^1</xliff:g>前）以降の端末の電池使用状況"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"フル充電以降の画面がオンの時間"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"フル充電以降の端末の電池使用状況"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"電池使用時間"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"過剰算出された消費電力"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>、使用"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"画面の使用: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g>: <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"電池使用量全体の <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"前回のフル充電以降の内訳"</string>
@@ -2781,7 +2782,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"通知"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"詳細設定"</string>
<string name="profile_section_header" msgid="2320848161066912001">"仕事用プロファイルの通知"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"アイコンバッジの許可"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"点滅"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"ロック画面の通知"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"すべての通知内容を表示する"</string>
@@ -2856,14 +2858,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 件のカテゴリを削除しました</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 件のカテゴリを削除しました</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"通知バッジ"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"ON"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"OFF"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"すべてブロック"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"今後はこの通知を表示しない"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"通知の表示"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"シェードにも周辺端末にも通知を表示しない"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"アイコンバッジの許可"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"マナーモードをオーバーライドする"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"[マナーモード] が [優先する通知のみ] に設定されているとき、この通知を引き続き表示する"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ロック画面"</string>
@@ -3096,8 +3100,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g>（<xliff:g id="COUNT">%2$d</xliff:g>）"</string>
<string name="high_power_apps" msgid="3459065925679828230">"電池の最適化"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"使用状況に関する通知"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"すべてのアプリを表示"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"余分なアプリを非表示"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"フル充電以降の端末の電池使用状況を表示"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"アプリの使用状況を表示"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"最適化していないアプリ"</string>
<string name="high_power_on" msgid="6216293998227583810">"最適化していないアプリ"</string>
<string name="high_power_off" msgid="3393904131961263278">"電池の使用を最適化"</string>
@@ -3571,8 +3575,6 @@
<string name="storage_games" msgid="7703159201697117621">"ゲーム"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"その他のアプリ"</string>
<string name="storage_files" msgid="8581083146777364063">"ファイル"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"タブレットのストレージ"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"スマートフォン ストレージ"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"/ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"使用"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 6d72c71..f7ea697 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"გსურთ <xliff:g id="SERVICE">%1$s</xliff:g>-ის გამოყენება?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>-ს ესაჭიროება:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"აპის მიერ ნებართვის მოთხოვნის დაფარვის გამო, ვერ ხერხდება თქვენი პასუხის დადასტურება პარამეტრებით."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"პარამეტრები თქვენს მოქმედებაზე ვერ რეაგირებს, რადგან სხვა აპი გადაფარვითაა ნაჩვენები ამ ვარიანტებზე."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>-ს თუ ჩართავთ, მონაცემთა დაშიფვრის გასაფართოებლად თქვენი მოწყობილობა ჩაკეტვის ეკრანს არ გამოიყენებს."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"ვინაიდან ხელმისაწვდომობის სერვისი ჩართეთ, მონაცემთა დაშიფვრის გასაფართოებლად თქვენი მოწყობილობა ჩაკეტვის ეკრანს არ გამოიყენებს."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"ვინაიდან <xliff:g id="SERVICE">%1$s</xliff:g>-ის ჩართვას მონაცემთა დაშიფვრაზე აქვს გავლენა, გთხოვთ, ხელახლა შეიყვანოთ ნიმუში."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"მობილური ქსელის სკანირება"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>-ის წინ"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"აპების მიერ მოხმარება ბოლო დატენვიდან (<xliff:g id="TIME">^1</xliff:g>-ის წინ)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"მოწყობილობის მოხმარება ბოლო დატენვიდან (<xliff:g id="TIME">^1</xliff:g>-ის წინ)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"დროის ხანგრძლივობა სრული დატენვიდან, რომლის განმავლობაშიც ეკრანი ჩართული იყო"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"მოწყობილობის მოხმარება ბოლო სრული დატენვიდან"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"ბატარეის ხარჯი დამტენის გამოერთების შემდეგ"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"ზედმეტად ჩათვლილი ელკვების გამოყენება"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"გამოიყენება <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"ეკრანის მოხმარება: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g>-ს იყენებს <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"ბატარეის საერთო მოხმარების <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"დეტალები ბოლო სრული დატენვიდან"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"შეტყობინებები"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"გაფართოებული"</string>
<string name="profile_section_header" msgid="2320848161066912001">"სამსახურის შეტყობინებები"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"ხატულას ბეჯების დაშვება"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"სინათლის ციმციმი"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"ჩაკეტილ ეკრანზე"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"შეტყობინების მთელი შინაარსის ჩვენება"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> კატეგორია წაიშალა</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> კატეგორია წაიშალა</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"შეტყობინებების ბეჯები"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"ჩართული"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"გამორთული"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"ყველას დაბლოკვა"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"ამ შეტყობინებების ჩვენების შეწყვეტა"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"შეტყობინებების ჩვენება"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"შეტყობინებების ჩრდილოვნად ან პერიფერიულ მოწყობილობებზე ჩვენების აღკვეთა"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"ხატულას ბეჯის დაშვება"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"„არ შემაწუხოთ“-ის უგულებელყოფა"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ამ შეტყობინებების ჩვენება მაშინაც კი, როცა რეჟიმისთვის „არ შემაწუხოთ“ არჩეულია „მხოლოდ პრიორიტეტული“"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ჩაკეტილ ეკრანზე"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"ბატარეის ოპტიმიზაცია"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"მოხმარების გაფრთხილებები"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"ყველა აპის ჩვენება"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"დამატებითი აპების დამალვა"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"მოწყობილობის მოხმარების სრულად ჩვენება"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"აპების მოხმარების ჩვენება"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"არ არის ოპტიმიზებული"</string>
<string name="high_power_on" msgid="6216293998227583810">"არ არის ოპტიმიზებული"</string>
<string name="high_power_off" msgid="3393904131961263278">"ხდება ბატარეის გამოყენების ოპტიმიზაცია"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"თამაშები"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"სხვა აპები"</string>
<string name="storage_files" msgid="8581083146777364063">"ფაილები"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ტაბლეტის მეხსიერება"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ტელეფონის მეხსიერება"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"გამოყენებულია <xliff:g id="TOTAL">%1$s</xliff:g>-დან"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"გამოყენებული"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 49b4387..ff0d227 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> қолданылсын ба?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> қызметіне қажет:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Бағдарлама рұқсат сұрауын жасырып тұрғандықтан, Параметрлер жауабыңызды тексере алмайды."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Себебі бұл опциялардың жоғарғы жағында басқа қолданба көрсетіледі. Параметрлер әрекетіңізге әсер етпейді."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> қоссаңыз, құрылғыңыз деректерді шифрлау үшін экранды бекітуді пайдаланбайды."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Сіз арнайы мүмкіндіктер қызметін қосқандықтан, құрылғыңыз деректерді шифрлау үшін экранды бекітуді пайдаланбайды."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> қосу деректерді шифрлауға әсер ететіндіктен, өрнекті растау керек."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Мобильдік желіні сканерлеу"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> бұрын"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Толық зарядтан кейін (<xliff:g id="TIME">^1</xliff:g> бұрын) қолданба тұтынуы"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Толық зарядтан кейін құрылғы тұтынуы (<xliff:g id="TIME">^1</xliff:g> бұрын)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Толық зарядталғаннан кейін экран қосулы болған уақыт мөлшері"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Толық зарядталғаннан кейін құрылғының пайдаланылуы"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Ажыратылғаннан бері батарея қолданысы"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Мөлшерінен жоғары есептелген қуатты қолдану"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> Ампер/сағ"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Пайдаланылу уақыты: <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Экранның тұтынуы: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g>-н пайдаланды"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"Жалпы батарея зарядының <xliff:g id="PERCENT">%1$s</xliff:g>-ы"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Толық зарядталғаннан кейін пайдаланылғаны"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Хабарландырулар"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Кеңейтілген"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Жұмыс хабарландырулары"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Белгіше танымбелгілеріне рұқсат беру"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Жыпылықтаған жарық"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Құлып экранында"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Бүкіл хабарландыру мазмұнын көрсету"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> санат жойылды</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> санат жойылды</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Хабарландыру танымбелгілері"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Қосулы"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Өшірулі"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Барлығына тыйым салу"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Бұл хабарландыруларды ешқашан көрсетпеу"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Хабарландыруларды көрсету"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Тақтада немесе перифериялық құрылғыларда хабарландыруларды ешқашан көрсетпеу"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Белгішеге рұқсат ету"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Мазаламау\" режимін қайта анықтау"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Мазаламау\" режимі \"Тек маңызды\" күйіне орнатылған кезде, осы хабарландыруларға рұқсат беру"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Құлып экранында"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Батареяны оңтайландыру"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Пайдаланушы ескертулері"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Барлығын көрсету"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Қосымша қолданбаларды жасыру"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Толық құрылғы тұтынуы"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Қолданбаны пайдалануды көрсету"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Оңтайландырылмаған"</string>
<string name="high_power_on" msgid="6216293998227583810">"Оңтайландырылмаған"</string>
<string name="high_power_off" msgid="3393904131961263278">"Батареяны пайдалануды оңтайландыру"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Ойындар"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Басқа қолданбалар"</string>
<string name="storage_files" msgid="8581083146777364063">"Файлдар"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Планшет жады"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Телефон жады"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Жалпы <xliff:g id="TOTAL">%1$s</xliff:g> жадтан пайдаланылған"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"пайдаланылған"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 0a3aed7..9f43eca 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"ប្រើ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ត្រូវការ៖"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"ដោយសារកម្មវិធីមួយកំពុងធ្វើឲ្យសំណើរអនុញ្ញាតមានភាពមិនច្បាស់ ការកំណត់នេះមិនអាចផ្ទៀងផ្ទាត់ការឆ្លើយតបរបស់អ្នកបានទេ។"</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"ការកំណត់មិនអាចឆ្លើយតបនឹងសកម្មភាពរបស់អ្នកបានទេ ដោយសារកម្មវិធីផ្សេងទៀតកំពុងបង្ហាញនៅលើជម្រើសទាំងនេះ។"</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"បើអ្នកបើក <xliff:g id="SERVICE">%1$s</xliff:g>, ឧបករណ៍របស់អ្នកនឹងមិនប្រើអេក្រង់ជាប់សោរបស់អ្នកដើម្បីបង្កើនការអ៊ិនគ្រីបទិន្នន័យទេ។"</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"ព្រោះអ្នកបានបើកសេវាកម្មភាពងាយស្រួល ឧបករណ៍របស់អ្នកនឹងមិនប្រើអេក្រង់ជាប់សោរបស់អ្នកដើម្បីបង្កើនការអ៊ិនគ្រីបទិន្នន័យ។"</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"ព្រោះបើក <xliff:g id="SERVICE">%1$s</xliff:g> ប៉ះពាល់ដល់ការអ៊ិនគ្រីបទិន្នន័យ អ្នកត្រូវតែបញ្ជាក់លំនាំរបស់អ្នក។"</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"ការស្កេនបណ្ដាញទូរសព្ទចល័ត"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> មុន"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"ការប្រើប្រាស់កម្មវិធីគិតចាប់តាំងពីសាកថ្មពេញ (<xliff:g id="TIME">^1</xliff:g> មុន)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"ការប្រើប្រាស់ឧបករណ៍គិតចាប់តាំងពីសាកថ្មពេញ (<xliff:g id="TIME">^1</xliff:g> មុន)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"អេក្រង់រយៈពេលបានបើកចាប់តាំងពីសាកថ្មពេញ"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"ការប្រើប្រាស់ឧបករណ៍ចាប់តាំងពីសាកថ្មពេញ"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"ថ្មដែលបានប្រើតាំងពីលែងបញ្ចូល"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"ការប្រើប្រាស់ថាមពលលើស"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"បានប្រើអស់រយៈពេល <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"ការប្រើប្រាស់អេក្រង់មានរយៈពេល <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ប្រើប្រាស់ដោយ <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> នៃថ្មទាំងអស់"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ព័ត៌មានលម្អិតចាប់តាំងពីសាកថ្មពេញលើកចុងក្រោយ"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"ការជូនដំណឹង"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"កម្រិតខ្ពស់"</string>
<string name="profile_section_header" msgid="2320848161066912001">"ការជូនដំណឹងពីកន្លែងធ្វើការ"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"អនុញ្ញាតស្លាកសញ្ញាជារូបតំណាង"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"ភ្លើងលោត"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"នៅលើអេក្រង់ជាប់សោ"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"បង្ហាញខ្លឹមសារនៃការជូនដំណឹងទាំងអស់"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other">បានលុបប្រភេទចំនួន <xliff:g id="COUNT_1">%d</xliff:g></item>
<item quantity="one">បានលុបប្រភេទចំនួន <xliff:g id="COUNT_0">%d</xliff:g></item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"គ្រឿងសម្គាល់ការជូនដំណឹង"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"បើក"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"បិទ"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"រារាំងទាំងអស់"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"កុំបង្ហាញការជូនដំណឹងទាំងនេះ"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"បង្ហាញការជូនដំណឹង"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"កុំបង្ហាញការជូនដំណឹងនៅក្នុងផ្ទាំងទម្លាក់ ឬនៅលើឧបករណ៍ភ្ជាប់ជាមួយកុំព្យូទ័រ"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"អនុញ្ញាតស្លាកសញ្ញាជារូបតំណាង"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"បដិសេធរបៀបកុំរំខាន"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"អនុញ្ញាតឲ្យការជូនដំណឹងទាំងនេះបន្តរំខាន នៅពេលដែលរបៀបកុំរំខានត្រូវបានកំណត់ទៅ របៀបអាទិភាពប៉ុណ្ណោះ"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"នៅលើអេក្រង់ជាប់សោ"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"ការបង្កើនប្រសិទ្ធភាពថ្ម"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"ការដាស់តឿនលើការប្រើប្រាស់"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"បង្ហាញកម្មវិធីទាំងអស់"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"លាក់កម្មវិធីបន្ថែមទៀត"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"បង្ហាញការប្រើប្រាស់ឧបករណ៍ពេញលេញ"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"បង្ហាញការប្រើប្រាស់កម្មវិធី"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"មិនបានបង្កើនប្រសិទ្ធភាព"</string>
<string name="high_power_on" msgid="6216293998227583810">"មិនបានសម្រួលឲ្យមានប្រសិទ្ធភាពទេ"</string>
<string name="high_power_off" msgid="3393904131961263278">"បង្កើនប្រសិទ្ធភាពប្រើប្រាស់ថ្ម"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"ហ្គេម"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"កម្មវិធីផ្សេងទៀត"</string>
<string name="storage_files" msgid="8581083146777364063">"ឯកសារ"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ទំហំផ្ទុកក្នុងថេប្លេត"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ទំហំផ្ទុកក្នុងទូរសព្ទ"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"បានប្រើនៃ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"បានប្រើប្រាស់"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 97e01ab..120d6ff 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ಬಳಸುವುದೇ?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ಈ ಕೆಳಗಿನವುಗಳನ್ನು ಮಾಡುತ್ತದೆ:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"ಅನುಮತಿ ವಿನಂತಿಯನ್ನು ಅಪ್ಲಿಕೇಶನ್ ಮರೆಮಾಚುತ್ತಿರುವ ಕಾರಣ, ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ನಿಮ್ಮ ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಪರಿಶೀಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"ಈ ಆಯ್ಕೆಗಳ ಮೇಲ್ಭಾಗದಲ್ಲಿ ಇನ್ನೊಂದು ಅಪ್ಲಿಕೇಶನ್ ಡಿಸ್ಪ್ಲೇ ಆಗುತ್ತಿರುವುದರಿಂದ, ಸೆಟ್ಟಿಂಗ್ಗಳು ನಿಮ್ಮ ಕ್ರಿಯೆಗೆ ಪ್ರತಿಕ್ರಿಯಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> ಅನ್ನು ನೀವು ಆನ್ ಮಾಡಿದರೆ, ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್ ಅನ್ನು ವರ್ಧಿಸಲು ನಿಮ್ಮ ಸಾಧನವು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬಳಸುವುದಿಲ್ಲ."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"ನೀವು ಪ್ರವೇಶಿಸುವಿಕೆ ಸೇವೆಯನ್ನು ಆನ್ ಮಾಡಿರುವುದರರಿಂದ, ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್ ಅನ್ನು ವರ್ಧಿಸಲು ನಿಮ್ಮ ಸಾಧನವು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬಳಸುವುದಿಲ್ಲ."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> ಆನ್ ಮಾಡುವುದರಿಂದಾಗಿ ಡೇಟಾ ಎನ್ಕ್ರಿಪ್ಷನ್ಗೆ ಪರಿಣಾಮಬೀರುವ ಕಾರಣ, ನಿಮ್ಮ ನಮೂನೆಯನ್ನು ನೀವು ಖಚಿತಡಿಸಬೇಕಾದ ಅಗತ್ಯವಿದೆ."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ ಸ್ಕ್ಯಾನ್ ಮಾಡುವುದು"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ನಿಮಿಷಗಳ ಹಿಂದೆ"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ನಂತರದಿಂದ ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆ (<xliff:g id="TIME">^1</xliff:g> ಹಿಂದೆ)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ನಂತರದಿಂದ ಸಾಧನದ ಬಳಕೆ (<xliff:g id="TIME">^1</xliff:g> ಹಿಂದೆ)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ಬಳಿಕ ಪರದೆ ಆನ್ ಆಗಿದ್ದ ಅವಧಿ"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"ಕೊನೆಯ ಬಾರಿ ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದ ನಂತರದಿಂದ ಸಾಧನದ ಬಳಕೆ"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"ಅನ್ಪ್ಲಗ್ ಆದಾಗಿನಿಂದ ಬ್ಯಾಟರಿಯ ಬಳಕೆ"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"ಅಧಿಕ ಗಣನೆಯ ಪವರ್ ಬಳಕೆ"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ಕಾಲ ಬಳಸಲಾಗಿದೆ"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"ಸ್ಕ್ರೀನ್ ಬಳಕೆ <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ಬಳಸುತ್ತಿರುವುದು <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"ಒಟ್ಟು ಬ್ಯಾಟರಿಯ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ಕೊನೆಯ ಬಾರಿ ಚಾರ್ಜ್ ಆದ ನಂತರದ ಬಳಕೆಯ ವಿವರ"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"ಅಧಿಸೂಚನೆಗಳು"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"ಸುಧಾರಿತ"</string>
<string name="profile_section_header" msgid="2320848161066912001">"ಕೆಲಸದ ಅಧಿಸೂಚನೆಗಳು"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"ಐಕಾನ್ ಬ್ಯಾಡ್ಜ್ಗಳಿಗೆ ಅನುಮತಿಸಿ"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"ಮಿನುಗುವ ಬೆಳಕು"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"ಲಾಕ್ ಸ್ಕ್ರೀನ್ನಲ್ಲಿ"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ಅಧಿಸೂಚನೆ ವಿಷಯವನ್ನು ಪೂರ್ತಿ ತೋರಿಸು"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ವರ್ಗಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ವರ್ಗಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"ಅಧಿಸೂಚನೆ ಬ್ಯಾಡ್ಜ್ಗಳು"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"ಆನ್"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"ಆಫ್"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"ಎಲ್ಲವನ್ನೂ ನಿರ್ಬಂಧಿಸು"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ಎಂದಿಗೂ ತೋರಿಸಬೇಡ"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸು"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"ಶೇಡ್ ಅಥವಾ ಪೆರಿಪೆರಲ್ ಸಾಧನಗಳಲ್ಲಿ ಎಂದಿಗೂ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಬೇಡಿ"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"ಐಕಾನ್ ಬ್ಯಾಡ್ಜ್ಗೆ ಅನುಮತಿಸಿ"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಅತಿಕ್ರಮಿಸು"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಅನ್ನು ಆದ್ಯತೆಗೆ ಹೊಂದಿಸಿದಾಗ ಮಾತ್ರ ಅಡ್ಡಿಪಡಿಸಲು ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ಮುಂದುವರಿಸಲು ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ಲಾಕ್ ಸ್ಕ್ರೀನ್ನಲ್ಲಿ"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಷನ್"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"ಬಳಕೆ ಎಚ್ಚರಿಕೆಗಳು"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್ ಪ್ರದರ್ಶಿಸಿ"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"ಹೆಚ್ಚುವರಿ ಅಪ್ಲಿಕೇಶನ್ ಮರೆಮಾಡಿ"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"ಸಾಧನದ ಸಂಪೂರ್ಣ ಬಳಕೆಯನ್ನು ತೋರಿಸಿ"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆಯನ್ನು ತೋರಿಸಿ"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
<string name="high_power_on" msgid="6216293998227583810">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
<string name="high_power_off" msgid="3393904131961263278">"ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"ಗೇಮ್ಗಳು"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string>
<string name="storage_files" msgid="8581083146777364063">"ಫೈಲ್ಗಳು"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ಟ್ಯಾಬ್ಲೆಟ್ ಸಂಗ್ರಹಣೆ"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ಫೋನ್ ಸಂಗ್ರಹಣೆ"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> ನಲ್ಲಿ ಬಳಸಿರುವುದು"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"ಬಳಕೆಯಾಗಿದೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 82b42a8..9bfb632 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>에 필요한 기능:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"권한 요청을 보이지 않게 하는 앱이 있어서 설정에서 내 응답을 확인할 수 없습니다."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"다른 앱이 이 옵션 위에 표시되므로 설정에서 내 작업에 응답할 수 없습니다."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용 설정하면 기기에서 데이터 암호화를 개선하기 위해 화면 잠금을 사용하지 않습니다."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"접근성 서비스를 사용 설정했으므로 기기에서 데이터 암호화를 개선하기 위해 화면 잠금을 사용하지 않습니다."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용 설정하면 데이터 암호화에 영향을 주기 때문에 패턴 확인이 필요합니다."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"모바일 네트워크 검색"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> 전"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"충전 완료(<xliff:g id="TIME">^1</xliff:g> 전) 후 앱 사용"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"충전 완료 후 기기 사용(<xliff:g id="TIME">^1</xliff:g> 전)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"충전 완료 후 화면이 켜진 시간"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"충전 완료 후 기기 사용"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"플러그를 뽑은 이후 배터리 전원 사용"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"전력 사용량 과다 산정됨"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> 사용됨"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"화면 사용 시간: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>에서 <xliff:g id="PERCENT">%1$s</xliff:g> 사용"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"전체 배터리 사용량의 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"마지막 충전 완료 후 사용 내역 분석"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"알림"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"고급"</string>
<string name="profile_section_header" msgid="2320848161066912001">"직장 알림"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"아이콘 배지 허용"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"표시등이 깜박거림"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"잠금 화면에서"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"모든 알림 내용 표시"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other">카테고리 <xliff:g id="COUNT_1">%d</xliff:g>개 삭제됨</item>
<item quantity="one">카테고리 <xliff:g id="COUNT_0">%d</xliff:g>개 삭제됨</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"알림 배지"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"사용"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"사용 안함"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"모두 차단"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"이러한 알림을 다시 표시하지 않음"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"알림 표시"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"알림을 창이나 주변기기에 표시하지 않음"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"아이콘 배지 허용"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"알림 일시중지 무시"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"알림 일시중지가 중요 알림만으로 설정된 경우 이러한 알림을 계속 받도록 허용"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"잠금 화면에서"</string>
@@ -3030,7 +3034,7 @@
<string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"요청한 권한이 없습니다."</string>
<string name="filter_all_apps" msgid="1988403195820688644">"모든 앱"</string>
<string name="filter_enabled_apps" msgid="5395727306799456250">"설치된 앱"</string>
- <string name="filter_instant_apps" msgid="574277769963965565">"빠른 실행 앱"</string>
+ <string name="filter_instant_apps" msgid="574277769963965565">"인스턴트 앱"</string>
<string name="filter_personal_apps" msgid="3277727374174355971">"개인"</string>
<string name="filter_work_apps" msgid="24519936790795574">"직장"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"앱: 전체"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g>(<xliff:g id="COUNT">%2$d</xliff:g>개)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"배터리 최적화"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"배터리 사용량 알림"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"모든 앱 표시"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"추가 앱 숨기기"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"전체 기기 사용 정보 표시"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"앱 사용 정보 표시"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"최적화되지 않음"</string>
<string name="high_power_on" msgid="6216293998227583810">"최적화되지 않음"</string>
<string name="high_power_off" msgid="3393904131961263278">"배터리 최적화 사용"</string>
@@ -3481,10 +3485,10 @@
<string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"인터넷에 연결하거나 이동통신사에 문의하세요."</string>
<string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"특정 이동통신사만 사용하도록 잠긴 기기에서 사용할 수 없음"</string>
<string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"사용 가능한 전체 크기: <xliff:g id="SIZE">%1$s</xliff:g>\n\n마지막 실행일: <xliff:g id="DATE">%2$s</xliff:g>"</string>
- <string name="web_action_enable_title" msgid="4051513950976670853">"빠른 실행 앱"</string>
+ <string name="web_action_enable_title" msgid="4051513950976670853">"인스턴트 앱"</string>
<string name="web_action_enable_summary" msgid="3108127559723396382">"앱이 설치되어 있지 않아도 앱에서 링크 열기"</string>
- <string name="web_action_section_title" msgid="7364647086538399136">"빠른 실행 앱"</string>
- <string name="instant_apps_account" msgid="1433620209791992528">"빠른 실행 앱 계정"</string>
+ <string name="web_action_section_title" msgid="7364647086538399136">"인스턴트 앱"</string>
+ <string name="instant_apps_account" msgid="1433620209791992528">"인스턴트 앱 계정"</string>
<string name="domain_url_section_title" msgid="7046835219056428883">"설치된 앱"</string>
<string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"현재 저장용량 관리자가 저장용량을 관리하고 있습니다."</string>
<string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>님의 계정"</string>
@@ -3567,13 +3571,11 @@
<string name="storage_games" msgid="7703159201697117621">"게임"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"기타 앱"</string>
<string name="storage_files" msgid="8581083146777364063">"파일"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"태블릿 저장용량"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"휴대전화 저장용량"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>"<xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"/<xliff:g id="TOTAL">%1$s</xliff:g> 사용"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"사용됨"</string>
<string name="clear_instant_app_data" msgid="2004222610585890909">"앱 삭제"</string>
- <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"이 빠른 실행 앱을 삭제하시겠습니까?"</string>
+ <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"이 인스턴트 앱을 삭제하시겠습니까?"</string>
<string name="game_storage_settings" msgid="3410689937046696557">"게임"</string>
<string name="audio_files_title" msgid="4777048870657911307">"오디오 파일"</string>
<string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g>님의 경우 제거됨)"</string>
@@ -3586,7 +3588,7 @@
<string name="storage_manager_indicator" msgid="1516810749625915020">"저장용량 관리자: <xliff:g id="STATUS">^1</xliff:g>"</string>
<string name="storage_manager_indicator_off" msgid="7488057587180724388">"사용 안함"</string>
<string name="storage_manager_indicator_on" msgid="8625551710194584733">"사용"</string>
- <string name="install_type_instant" msgid="3174425974536078647">"빠른 실행 앱"</string>
+ <string name="install_type_instant" msgid="3174425974536078647">"인스턴트 앱"</string>
<string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"저장용량 관리자를 사용 중지하시겠습니까?"</string>
<string name="storage_movies_tv" msgid="5498394447562086890">"영화 및 TV 앱"</string>
<string name="app_info_storage_title" msgid="5554719444625611987">"사용 중인 공간"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 7745e5c..83f4382 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -1853,7 +1853,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> колдоносузбу?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Колдонмо уруксат суроо-талабын түшүнбөй жаткандыктан, Жөндөөлөр жообуңузду текшере албайт."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Бул опциялардын үстүндө башка колдонмо көрсөтүлүп жаткандыктан, Жөндөөлөр сиздин аракетиңизге жооп бере албайт."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Эгер <xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлсө, түзмөгүңүз дайындарды шифрлөөнү күчтөндүрүү үчүн экраныңыздын кулпусун пайдаланбайт."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Атайын мүмкүнчүлүктөр кызматы күйгүзүлгөндүктөн, түзмөгүңүз дайындарды шифрлөөнү күчтөндүрүү үчүн экраныңыздын кулпусун пайдаланбайт."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлгөндө дайындарды шифрлөөгө таасир тийгизгендиктен, үлгүңүздү ырасташыңыз керек."</string>
@@ -1913,6 +1912,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Мобилдик тармак скандалууда"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> мурун"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Толук кубаттлг бери иштегн колднмлр (<xliff:g id="TIME">^1</xliff:g> мурун)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Толук кубатталгандан бери түзмөктүн колдонулушу (<xliff:g id="TIME">^1</xliff:g> мурун)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Толук кубатталгандан бери экрандын күйүп турган убактысы"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Толук кубатталгандан бери түзмөктүн колдонулушу"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Суурулгандан бери батареянын колдонулушу"</string>
@@ -2004,6 +2004,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Ашыкча эсептелген кубаттын пайдаланылышы"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> бою колдонулду"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Экрандын колдонулушу - <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> колдонмосу <xliff:g id="PERCENT">%1$s</xliff:g> сарптады"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"Батарея кубатынын <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Толук кубатталгандан бери канчасы колдонулду:"</string>
@@ -2780,7 +2781,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Эскертмелер"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Өркүндөтүлгөн"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Жумуш боюнча эскертмелер"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Бейджиктин сүрөтчөлөрүн көрсөтүүгө уруксат берүү"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Жарык индикатору"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Кулпуланган экранда"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Эскертме толугу менен көрүнсүн"</string>
@@ -2855,14 +2857,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> категория жок кылынды</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> категория жок кылынды</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Эскертме бейджиктери"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Күйүк"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Өчүк"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Баарын бөгөттөө"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Бул эскертмелер эч качан көрсөтүлбөсүн"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Эскертмелерди көрсөтүү"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Эскертмелер эч качан көлөкөдө же сырткы түзмөктөрдө көрсөтүлбөсүн"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Бейджиктин сүрөтчөсүн көрсөтүүгө уруксат берүү"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Тынчымды албаны өзгөртүп коюу"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Тынчымды алба режиминде\" \"Шашылыш эскертмелер гана\" деп белгиленсе ушул эскертмелер көрүнөт"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Кулпуланган экранда"</string>
@@ -3095,8 +3099,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Батареяны үнөмдөө"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Батареянын сарпталышы"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Бардык колдонмолорду көрсөтүү"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Кошумча колдонмолорду жашыруу"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Түзмөктүн колдонулушун толук көрсөтүү"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Колдонмонун иштетилиши"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Батареяны үнөмдөшпөйт"</string>
<string name="high_power_on" msgid="6216293998227583810">"Батарянын кубатын үнөмдөшпөйт"</string>
<string name="high_power_off" msgid="3393904131961263278">"Батареянын кубатын үнөмдөө иштетилген"</string>
@@ -3570,8 +3574,6 @@
<string name="storage_games" msgid="7703159201697117621">"Оюндар"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Башка колдонмолор"</string>
<string name="storage_files" msgid="8581083146777364063">"Файлдар"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Планшеттин сактагычы"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Телефондун сактагычы"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"колдонулду <xliff:g id="TOTAL">%1$s</xliff:g> ичинен"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"колдонулду"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index feb30a9..1701144 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ຕ້ອງການ:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"ເພາະວ່າແອັບຯກຳລັງຂັດຂວາງການຂໍອະນຸຍາດ, ການຕັ້ງຄ່າບໍ່ສາມາດກວດສອບການຕອບຮັບຂອງທ່ານໄດ້."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"ເນື່ອງຈາກແອັບອື່ນກຳລັງສະແດງຜົນບັງຕົວເລືອກເຫຼົ່ານີ້, ການຕັ້ງຄ່າຈຶ່ງບໍ່ສາມາດຕອບສະໜອງຄຳສັ່ງຂອງທ່ານໄດ້."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"ຫາກທ່ານເປີດໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>, ອຸປະກອນຂອງທ່ານຈະບໍ່ໃຊ້ການລັອກໜ້າຈໍຂອງທ່ານເພື່ອເພີ່ມການເຂົ້າລະຫັດຂໍ້ມູນ."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"ເນື່ອງຈາກທ່ານໄດ້ເປີດບໍລິການການຊ່ວຍການເຂົ້າເຖິງ, ອຸປະກອນຂອງທ່ານຈະບໍ່ໃຊ້ການລັອກໜ້າຈໍຂອງທ່ານເພື່ອເພີ່ມການເຂົ້າລະຫັດຂໍ້ມູນ."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"ເພາະວ່າການເປີດ <xliff:g id="SERVICE">%1$s</xliff:g> ມີຜົນຕໍ່ການເຂົ້າລະຫັດ, ທ່ານຈຶ່ງຈຳຕ້ອງຢືນຢັນຮູບແບບການລັອກຂອງທ່ານ."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"ການສະແກນເຄືອຂ່າຍມືຖື"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ກ່ອນ"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"ການນຳໃຊ້ແອັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ (<xliff:g id="TIME">^1</xliff:g> ກ່ອນ)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"ການນຳໃຊ້ອຸປະກອນຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ (<xliff:g id="TIME">^1</xliff:g> ກ່ອນ)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"ໄລຍະເວລາທີ່ໜ້າຈໍເປີດຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"ການນຳໃຊ້ອຸປະກອນຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"ການນຳໃຊ້ແບັດເຕີຣີຕັ້ງແຕ່ຖອດສາຍສາກ"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"ການໃຊ້ພະລັງງານທີ່ຄິດໄລ່ເກີນ"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"ໃຊ້ເປັນເວລາ <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"ການນຳໃຊ້ໜ້າຈໍ <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ໃຊ້ໄປແລ້ວໂດຍ <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ຂອງແບັດເຕີຣີໂດຍຮວມ"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ວິເຄາະນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"ການແຈ້ງເຕືອນ"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"ຂັ້ນສູງ"</string>
<string name="profile_section_header" msgid="2320848161066912001">"ການແຈ້ງເຕືອນວຽກ"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"ອະນຸຍາດປ້າຍໄອຄອນ"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"ກະພິບໄຟ"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"ຢູ່ໜ້າຈໍລັອກ"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ສະແດງເນື້ອຫາການແຈ້ງເຕືອນທັງໝົດ"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other">ລຶບ <xliff:g id="COUNT_1">%d</xliff:g> ໝວດໝູ່ອອກແລ້ວ</item>
<item quantity="one">ລຶບ <xliff:g id="COUNT_0">%d</xliff:g> ໝວດໝູ່ອອກແລ້ວ</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"ປ້າຍການແຈ້ງເຕືອນ"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"ເປີດ"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"ປິດ"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"ບລັອກທັງໝົດ"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"ຢ່າສະແດງການແຈ້ງເຕືອນເຫຼົ່ານີ້ອີກ"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"ສະແດງການແຈ້ງເຕືອນ"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"ຢ່າສະແດງການແຈ້ງເຕືອນໃນເງົາ ຫຼື ອຸປະກອນຕໍ່ພ່ວງອີກ."</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"ອະນຸຍາດປ້າຍໄອຄອນ"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ຍົກເລີກຫ້າມລົບກວນ"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ອະນຸຍາດໃຫ້ການແຈ້ງເຕືອນເຫຼົ່ານີ້ສືບຕໍ່ຂັດຈັງຫວະ ເມື່ອຄຸນສົມບັດ ຫ້າມລົບກວນ ຖືກຕັ້ງເປັນແບບບຸລິມະສິດເທົ່ານັ້ນ"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ຢູ່ໜ້າຈໍລັອກ"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"ການປັບແບັດເຕີຣີໃຫ້ເໝາະສົມ"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"ການແຈ້ງເຕືອນການນຳໃຊ້"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"ສະແດງແອັບທັງໝົດ"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"ເຊື່ອງແອັບເພີ່ມເຕີມ"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"ສະແດງການນຳໃຊ້ແອັບແບບເຕັມ"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"ສະແດງການນຳໃຊ້ແອັບ"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"ບໍ່ໄດ້ປັບໃຫ້ເໝາະສົມ"</string>
<string name="high_power_on" msgid="6216293998227583810">"ບໍ່ໄດ້ປັບໃຫ້ເໝາະສົມ"</string>
<string name="high_power_off" msgid="3393904131961263278">"ກຳລັງປັບການໃຊ້ແບັດເຕີຣີໃຫ້ເໝາະສົມ"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"ເກມ"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"ແອັບຯອື່ນໆ"</string>
<string name="storage_files" msgid="8581083146777364063">"ໄຟລ໌"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ບ່ອນຈັດເກັບຂໍ້ມູນແທັບເລັດ"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ບ່ອນຈັດເກັບຂໍ້ມູນໂທລະສັບ"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"ໃຊ້ໄປແລ້ວຈາກ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"ໃຊ້ໄປແລ້ວ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0e5fe29..4ab9f0b 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1894,7 +1894,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Naudoti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"„<xliff:g id="SERVICE">%1$s</xliff:g>“ reikia:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Kadangi programa užstoja leidimo užklausą, nustatymuose negalima patvirtinti jūsų atsakymo."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Kadangi kita programa rodoma virš šių parinkčių, nustatymai negali reaguoti į jūsų veiksmą."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jei įjungsite „<xliff:g id="SERVICE">%1$s</xliff:g>“, įrenginyje nebus naudojamas ekrano užraktas siekiant patobulinti duomenų šifruotę."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Kadangi įjungėte pritaikymo neįgaliesiems paslaugą, įrenginyje nebus naudojamas ekrano užraktas siekiant patobulinti duomenų šifruotę."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Įjungus „<xliff:g id="SERVICE">%1$s</xliff:g>“ paveikiama duomenų šifruotė, todėl reikia patvirtinti atrakinimo piešinį."</string>
@@ -1956,6 +1955,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Mobiliojo ryšio tinklo nuskaitymas"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"prieš <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Programų naud. po visiško įkrovimo (prieš <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Įrenginio naudojimas po visiško įkrovimo (prieš <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Kiek laiko ekranas buvo įjungtas po visiško įkrovimo"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Įrenginio naudojimas po visiško įkrovimo"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Akumuliatoriaus naudojimas po to, kai buvo ištrauktas iš lizdo"</string>
@@ -2047,6 +2047,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Per daug apskaičiuotos energijos naudojimas"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Naudojama <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Ekrano naudojimas: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> naudoja „<xliff:g id="APP">%2$s</xliff:g>“"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> visos akumuliatoriaus įkrovos"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Naudojimo nuo paskutinio visiško įkrovimo analizė"</string>
@@ -2831,7 +2832,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Pranešimai"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Išplėstiniai"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Darbo profilio pranešimai"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Leisti piktogramų ženklelius"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Mirksinti šviesa"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Užrakinimo ekrane"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Rodyti visą pranešimo turinį"</string>
@@ -2912,14 +2914,16 @@
<item quantity="many">Ištrinta <xliff:g id="COUNT_1">%d</xliff:g> kategorijos</item>
<item quantity="other">Ištrinta <xliff:g id="COUNT_1">%d</xliff:g> kategorijų</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Pranešimų ženkleliai"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Įjungta"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Išjungta"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blokuoti viską"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Niekada nerodyti šių pranešimų"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Rodyti pranešimus"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Niekada nerodyti pranešimų skydelyje ar išoriniuose įrenginiuose"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Leisti piktogramos ženklelį"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Nepaisyti netrukdymo režimo"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Leisti ir toliau teikti šiuos pranešimus, kai netrukdymo režimas nustatytas į „Tik prioritetiniai“"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Užrakinimo ekrane"</string>
@@ -3164,8 +3168,8 @@
<string name="process_format" msgid="77905604092541454">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Akumuliatoriaus optimiz."</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Naudojimo įspėjimai"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Rodyti visas programas"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Slėpti papildomas programas"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Rodyti visą įrenginio naudojimo informaciją"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Rodyti progr. naud. inform."</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimizuota"</string>
<string name="high_power_on" msgid="6216293998227583810">"Neoptimizuota"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimizuojamas akumuliatoriaus naudojimas"</string>
@@ -3669,8 +3673,6 @@
<string name="storage_games" msgid="7703159201697117621">"Žaidimai"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Kitos programos"</string>
<string name="storage_files" msgid="8581083146777364063">"Failai"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Planš. komp. saugykla"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefono saugykla"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Naudojama iš <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"naudoj."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index c1177d2..0c236b3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1874,7 +1874,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Vai izmantot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"Pakalpojumam <xliff:g id="SERVICE">%1$s</xliff:g> nepieciešams:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Lietotne Iestatījumi nevar verificēt jūsu atbildi, jo cita lietotne aizsedz atļaujas pieprasījumu."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Lietotne Iestatījumi nevar atbildēt uz jūsu darbību, jo cita lietotne tiek rādīta virs šīm opcijām."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ja ieslēgsiet pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>, ierīce neizmantos ekrāna bloķēšanu datu šifrēšanas uzlabošanai."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Tā kā esat ieslēdzis pieejamības pakalpojumu, ierīce neizmantos ekrāna bloķēšanu datu šifrēšanas uzlabošanai."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Tā kā pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> ieslēgšana ietekmē datu šifrēšanu, jums ir jāapstiprina sava grafiskā atslēga."</string>
@@ -1935,6 +1934,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Mobilo tīklu meklēšana"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Pirms <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Jaudas patēriņš lietotnēs kopš pilnas uzlādes (pirms <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Ierīces lietojums kopš pilnas uzlādes (pirms šāda laika: <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Cik ilgi ekrāns ir ieslēgts kopš pilnas uzlādes"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Ierīces lietojums kopš pilnas uzlādes"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Akumulatora lietojums kopš atslēgšanas"</string>
@@ -2026,6 +2026,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Par daudz uzskaitītais enerģijas patēriņš"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Izmantots šādu laiku: <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Ekrāna lietojums: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> izmanto lietotne <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> no vispārējā akumulatora lietojuma"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Sadalījums kopš pēdējās pilnās uzlādes"</string>
@@ -2804,7 +2805,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Paziņojumi"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Papildu"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Darba paziņojumi"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Atļaut ikonu emblēmas"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Mirgojošs gaismas signāls"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Bloķēšanas ekrānā"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Rādīt visu saturu paziņojumos"</string>
@@ -2882,14 +2884,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategorija dzēsta</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorijas dzēstas</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Paziņojumu emblēmas"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Ieslēgti"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Izslēgti"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Bloķēt visus"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Nekad nerādīt šos paziņojumus"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Rādīt paziņojumus"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Nekad nerādīt paziņojumus panelī vai perifērijas ierīcēs"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Atļaut ikonas emblēmu"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorēt režīmu “Netraucēt”"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Ļaut šiem paziņojumiem pārtraukt arī turpmāk, ja režīms “Netraucēt” ir iestatīts uz “Tikai prioritārie”"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Bloķēšanas ekrānā"</string>
@@ -3128,8 +3132,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Akumulatora optimizācija"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Brīdinājumi par lietojumu"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Rādīt visas lietotnes"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Paslēpt papildu lietotnes"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Rādīt pilnu ierīces lietojumu"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Rādīt lietotnes izmantojumu"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Netiek optimizēts"</string>
<string name="high_power_on" msgid="6216293998227583810">"Netiek optimizēts"</string>
<string name="high_power_off" msgid="3393904131961263278">"Akumulatora darbība tiek optimizēta"</string>
@@ -3618,8 +3622,6 @@
<string name="storage_games" msgid="7703159201697117621">"Spēles"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Citas lietotnes"</string>
<string name="storage_files" msgid="8581083146777364063">"Faili"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Planšetdatora krātuve"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Tālruņa krātuve"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Izmantoti no <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"izmantots"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index ef0a2ec..18d967f 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Користи <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> треба да:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Бидејќи апликацијата го прикрива барањето за дозвола, Поставките не може да го потврдат вашиот одговор."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"„Поставки“ не може да реагира на вашето дејство, бидејќи друга апликација се прикажува врз опцииве."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ако вклучите <xliff:g id="SERVICE">%1$s</xliff:g>, уредот нема да го користи заклучувањето на екранот за да го подобри шифрирањето на податоците."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Со оглед на тоа што вклучивте услуга на пристапност, уредот нема да го користи заклучувањето на екранот за да го подобри шифрирањето на податоците."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Со оглед на тоа што вклучувањето <xliff:g id="SERVICE">%1$s</xliff:g> влијае врз шифрирањето податоци, треба да ја потврдите шемата."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилна мрежа"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"пред <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Употреба на апликациите по целосно полнење (пред <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Употреба на уредот по целосно полнење (пред <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Време на активен екран по целосно полнење"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Употреба на уредот по целосно полнење"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Употреба на батеријата од исклучување"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Надмината употреба на напојување"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Користење <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Користење на екранот <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> искористени од <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> од целокупната батерија"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Детали по последното целосно полнење"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Известувања"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Напредни"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Известувања за работен профил"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Дозволете значки на иконите"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Трепкај со сијаличката"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"На заклучениот екран"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Прикажи ја целата содржина од известувањето"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> категорија е избришана</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> категории се избришани</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Значки за известувања"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Вклучени"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Исклучени"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Блокирај ги сите"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Никогаш не прикажувај ги известувањава"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Прикажувај известувања"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Никогаш не прикажувај известувања во сенка или на периферни уреди"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Дозволете значка на икона"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Отфрли го Не вознемирувај"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Оставете ги известувањава да продолжат да прекинуваат кога опцијата Не вознемирувај е поставена на Само приоритетни"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На заклучениот екран"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Оптимизација на батерија"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Предупредувања за батеријата"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Прикажи ги сите апликации"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Сокриј дополнителни апликации"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Прикажи ја употребата на целосно полниот уред"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Прикажи употреба на апликација"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Не се оптимизирани"</string>
<string name="high_power_on" msgid="6216293998227583810">"Не е оптимизирано"</string>
<string name="high_power_off" msgid="3393904131961263278">"Се оптимизира користењето на батеријата"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Игри"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Други апликации"</string>
<string name="storage_files" msgid="8581083146777364063">"Датотеки"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Меморија на таблетот"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Меморија на телефонот"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Искористено од <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"искор."</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 5b47d8d..0e12e48 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ഉപയോഗിക്കണോ?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> എന്നതിന് ഇവ ആവശ്യമാണ്:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"അനുമതി അഭ്യർത്ഥനയെ ഒരു അപ്ലിക്കേഷൻ മറയ്ക്കുന്നതിനാൽ, ക്രമീകരണത്തിന് നിങ്ങളുടെ പ്രതികരണം പരിശോധിച്ചുറപ്പിക്കാനാകില്ല."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"ഈ ഓപ്ഷനുകളുടെ മുകളിൽ മറ്റൊരു ആപ്പ് ദൃശ്യമാകുന്നതിനാൽ, ക്രമീകരണത്തിന് നിങ്ങളുടെ നടപടിയോട് പ്രതികരിക്കാനാവില്ല."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> ഓണാക്കിയെങ്കിൽ, ഡാറ്റ എൻക്രിപ്ഷൻ മെച്ചപ്പെടുത്താനായി ഉപകരണം നിങ്ങളുടെ സ്ക്രീൻ ലോക്ക് ഉപയോഗിക്കില്ല."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"നിങ്ങൾ ഉപയോഗസഹായി സേവനം ഓണാക്കിയതിനാൽ, ഡാറ്റ എൻക്രിപ്ഷൻ മെച്ചപ്പെടുത്താനായി ഉപകരണം നിങ്ങളുടെ സ്ക്രീൻ ലോക്ക് ഉപയോഗിക്കില്ല."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> ഓണാക്കുന്നത് ഡാറ്റ എൻക്രിപ്ഷനെ ബാധിക്കുന്നതിനാൽ, നിങ്ങളുടെ പാറ്റേൺ സ്ഥിരീകരിക്കേണ്ടതുണ്ട്."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"മൊബൈൽ നെറ്റ്വർക്ക് സ്കാൻ ചെയ്യൽ"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> മുമ്പ്"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"ഫുൾ ചാർജുചെയ്തശേഷമുള്ള ആപ്പ് ഉപയോഗം (<xliff:g id="TIME">^1</xliff:g> മുമ്പ്)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"പൂർണ്ണമായി ചാർജുചെയ്തതിന് ശേഷമുള്ള ഉപകരണ ഉപയോഗം (<xliff:g id="TIME">^1</xliff:g> മുമ്പ്)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"പൂർണ്ണമായി ചാർജ് ചെയ്തത് മുതൽ സ്ക്രീൻ ഓണായിരുന്ന സമയം"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"പൂർണ്ണമായി ചാർജ്ജുചെയ്തത് മുതലുള്ള ഉപകരണ ഉപയോഗം"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"അൺപ്ലഗ്ഗുചെയ്തതിനുശേഷമുള്ള ബാറ്ററി ഉപയോഗം"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"കണക്കാക്കിയ പവർ ഉപയോഗം"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> സമയം ഉപയോഗിച്ചു"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"സ്ക്രീൻ ഉപയോഗം <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ആപ്പ് <xliff:g id="PERCENT">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"മൊത്തം ബാറ്ററിയുടെ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ഫുൾ ചാർജിനുശേഷമുള്ള ഉപയോഗ വിശദാംശങ്ങൾ"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"അറിയിപ്പുകൾ"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"വിപുലമായത്"</string>
<string name="profile_section_header" msgid="2320848161066912001">"ഔദ്യോഗിക അറിയിപ്പുകൾ"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"ഐക്കൺ ബാഡ്ജുകൾ അനുവദിക്കുക"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"ലൈറ്റ് മിന്നുക"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"ലോക്ക് സ്ക്രീനിൽ"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"എല്ലാ അറിയിപ്പുകളും കാണിക്കുക"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> വിഭാഗങ്ങൾ ഇല്ലാതാക്കി</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> വിഭാഗം ഇല്ലാതാക്കി</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"അറിയിപ്പ് ബാഡ്ജുകൾ"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"ഓൺ"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"ഓഫ്"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"എല്ലാം തടയുക"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"ഈ അറിയിപ്പുകൾ ഒരിക്കലും കാണിക്കരുത്"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"അറിയിപ്പുകൾ കാണിക്കുക"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"ഷെയ്ഡിലോ പെരിഫെറൽ ഉപകരണങ്ങളിലോ ഒരിക്കലും അറിയിപ്പുകൾ കാണിക്കരുത്"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"ഐക്കൺ ബാഡ്ജ് അനുവദിക്കുക"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'ശല്യപ്പെടുത്തരുത്\' അസാധുവാക്കുക"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\'മുൻഗണനയുള്ളവ മാത്രം\' എന്നതിലേക്ക് \'ശല്യപ്പെടുത്തരുത്\' സജ്ജമാക്കിയിട്ടുള്ളപ്പോൾ തടസ്സപ്പെടുത്തുന്നത് തുടരാൻ ഈ അറിയിപ്പുകളെ അനുവദിക്കുക"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ലോക്ക് സ്ക്രീനിൽ"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"ബാറ്ററി ഓപ്റ്റിമൈസേഷൻ"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"ബാറ്ററി ഉപഭോഗ മുന്നറിയിപ്പ്"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"എല്ലാ ആപ്പുകളും കാണിക്കൂ"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"അധികമുള്ള ആപ്പുകൾ മറയ്ക്കുക"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"ഉപകരണത്തിന്റെ മുഴുവൻ ഉപയോഗം കാണിക്കുക"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"ആപ്പ് ഉപയോഗം കാണിക്കുക"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"ഓപ്റ്റിമൈസ് ചെയ്തിട്ടില്ല"</string>
<string name="high_power_on" msgid="6216293998227583810">"ഓപ്റ്റിമൈസ് ചെയ്തിട്ടില്ല"</string>
<string name="high_power_off" msgid="3393904131961263278">"ബാറ്ററി ഉപയോഗം ഓപ്റ്റിമൈസ് ചെയ്യുന്നു"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"ഗെയിമുകള്"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"മറ്റ് ആപ്സ്"</string>
<string name="storage_files" msgid="8581083146777364063">"ഫയലുകള്"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ടാബ്ലെറ്റ് സ്റ്റോറേജ്"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ഫോൺ സ്റ്റോറേജ്"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"ഉപയോഗിച്ചത്"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index cc6b54c..98d52ea 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>-г ашиглах уу?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> шаардлага:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Апп нь зөвшөөрөл авах хүсэлтийг танихгүй байгаа тул Тохиргооноос таны хариултыг баталгаажуулж чадахгүй байна."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Өөр апп эдгээр сонголтын дээр гарч ирж байгаа тул таны тохиргоог хийх боломжгүй байна."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Хэрэв та <xliff:g id="SERVICE">%1$s</xliff:g>-г асаавал таны төхөөрөмж дата шифрлэлтийг сайжруулах дэлгэцийн түгжээг ашиглахгүй."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Та хандалтын үйлчилгээг асаасан учир таны төхөөрөмж таны дэлгэцийн түгжээг дата шифрлэлтэнд ашиглахгүй."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>-г асаах нь дата шифрлэлтэд нөлөөлөх учир та хээгээ баталгаажуулах шаардлагатай."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Мобайл сүлжээний скан"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>-н өмнө"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Бүрэн цэнэглэснээс хойших апп ашиглалт (<xliff:g id="TIME">^1</xliff:g>-н өмнө)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Бүрэн цэнэглэснээс хойших төхөөрөмж ашиглалт (<xliff:g id="TIME">^1</xliff:g>-н өмнө)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Бүрэн цэнэглэснээс хойших дэлгэцийг асаалттай байлгасан хугацаа"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Бүрэн цэнэглэснээс хойших төхөөрөмжийн ашиглалт"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Салгаснаас хойшхи зайны ашиглалт"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Хэтрүүлэн тооцсон цахилгаан ашиглалт"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>-д ашигласан"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Дэлгэц ашиглалт <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g>-г ашигласан"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"Бүх батерейны <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Сүүлд бүрэн цэнэглэснээс хойших ашиглалтын мэдээлэл"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Мэдэгдэл"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Нарийвчилсан"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Ажлын мэдэгдэл"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Дүрс тэмдгийг зөвшөөрөх"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Анивчих гэрэл"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Түгжигдсэн дэлгэц дээр"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Бүх мэдэгдлийн агуулгыг харуулах"</string>
@@ -2850,14 +2852,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> категорийг устгасан</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> категорийг устгасан</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Мэдэгдлийн тэмдэг"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Идэвхтэй"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Идэвхгүй"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Бүгдийг блокло"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Эдгээр мэдэгдлийг хэзээ ч харуулахгүй"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Мэдэгдэл харуулах"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Мэдэгдлийг сүүдэрт, эсвэл захын төхөөрөмжид хэзээ ч харуулахгүй"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Дүрс тэмдгийг зөвшөөрөх"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Бүү саад бол\"-г дарах"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Бүү саад бол\" горимыг \"Зөвхөн Тэргүүлэх ач холбогдолтой\" болгон тохируулсан үед эдгээр мэдэгдэл үргэлжлэн саад болохыг зөвшөөрнө үү."</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Түгжигдсэн дэлгэц дээр"</string>
@@ -3090,8 +3094,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Тэжээлийн оновчлол"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Хэрэглээний сануулга"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Бүх аппыг харуулах"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Нэмэлт аппыг нуух"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Төхөөрөмжийн бүрэн ашиглалтыг харуулах"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Апп ашиглалтыг харуулах"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Оновчлоогүй"</string>
<string name="high_power_on" msgid="6216293998227583810">"Оновчлоогүй"</string>
<string name="high_power_off" msgid="3393904131961263278">"Тэжээлийн хэрэглээг оновчилж байна"</string>
@@ -3565,8 +3569,6 @@
<string name="storage_games" msgid="7703159201697117621">"Тоглоом"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Бусад апп"</string>
<string name="storage_files" msgid="8581083146777364063">"Файл"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Таблетын сан"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Зургийн сан"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g>-с ашигласан"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"ашигласан"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index fe686eb..0253537 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> वापरायचे?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"यासाठी <xliff:g id="SERVICE">%1$s</xliff:g> आवश्यक आहे:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"अॅप परवानगी विनंती अस्पष्ट करीत असल्याने, सेटिंग्ज आपला प्रतिसाद सत्यापित करू शकत नाहीत."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"या पर्यायांच्यावर दुसरे अॅप प्रदर्शित होत असल्याने, सेटिंग्ज आपल्या क्रियेला प्रतिसाद देऊ शकत नाहीत."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"आपण <xliff:g id="SERVICE">%1$s</xliff:g> चालू केल्यास, आपले डिव्हाइस डेटा कूटबद्धीकरण वर्धित करण्यासाठी आपला स्क्रीन लॉक वापरणार नाही."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"आपण प्रवेशयोग्यता सेवा चालू केली असल्यामुळे, आपले डिव्हाइस डेटा कूटबद्धीकरण वर्धित करण्यासाठी आपला स्क्रीन लॉक वापरणार नाही."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा कूटबद्धीकरण प्रभावित होते, आपल्याला आपल्या नमुन्याची पुष्टी करण्याची आवश्यकता आहे."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कॅनिंग"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> पूर्वी"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"पूर्ण चार्ज झाल्यापासून अॅप वापर (<xliff:g id="TIME">^1</xliff:g> पूर्वी)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"पूर्ण चार्ज झाल्यापासूनचा डिव्हाइस वापर (<xliff:g id="TIME">^1</xliff:g> पूर्वी)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"पूर्ण चार्जपासून स्क्रीन चालू असण्याच्या वेळाचे प्रमाण"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"शेवटच्या पूर्ण चार्जपासून डिव्हाइस वापर"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग केल्यापासून बॅटरी वापर"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"जास्त प्रमाणात पॉवर वापर"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>साठी वापरले"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"स्क्रीनचा वापर <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ने <xliff:g id="PERCENT">%1$s</xliff:g> वापरले"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"एकूण बॅटरीचे <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"मागच्या वेळेस पूर्ण चार्ज झाल्यापासूनचा ब्रेकडाउन"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"सूचना"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"प्रगत"</string>
<string name="profile_section_header" msgid="2320848161066912001">"कार्य सूचना"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"चिन्ह बॅजना अनुमती द्या"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"लुकलुकता प्रकाश"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"लॉक स्क्रीनवर"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सर्व सूचना सामग्री दर्शवा"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> श्रेणी हटवली</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> श्रेण्या हटवल्या</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"सूचना बॅज"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"चालू"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"बंद"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"सर्व अवरोधित करा"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"या सूचना कधीही दर्शवू नका"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"सूचना दर्शवा"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"सूचना कधीही रंगछटांंमध्ये किंवा डिव्हाइसच्या किनारीवर दर्शवू नका"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"चिन्ह बॅजला अनुमती द्या"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"व्यत्यय आणू नका अधिशून्य करा"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"व्यत्यय आणू नका केवळ प्राधान्यावर सेट केले असते तेव्हा या सूचनांना व्यत्यय आणणे सुरु ठेवू द्या"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"लॉक स्क्रीनवर"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"बॅटरी ऑप्टिमायझेशन"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"वापरासंबंधी सूचना"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"सर्व अॅप्स दर्शवा"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"अतिरिक्त अॅप्स लपवा"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"पूर्ण डिव्हाइस वापर दाखवा"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"अॅपचा वापर दाखवा"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"ऑप्टिमाइझ न केलेले"</string>
<string name="high_power_on" msgid="6216293998227583810">"ऑप्टिमाइझ न केलेले"</string>
<string name="high_power_off" msgid="3393904131961263278">"बॅटरी वापर ऑप्टिमाइझ करीत आहे"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"गेम"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"अन्य अॅप्स"</string>
<string name="storage_files" msgid="8581083146777364063">"फायली"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"टॅबलेट संचय"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"फोन संचय"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small></string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> पैकी वापरले"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"वापरलेली"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 0c0a05a..c78726b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> perlu:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Oleh sebab apl melindungi permintaan kebenaran, Tetapan tidak dapat mengesahkan jawapan anda."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Tetapan tidak dapat bertindak balas terhadap tindakan anda kerana apl lain sedang dipaparkan di atas pilihan ini."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jika anda menghidupkan <xliff:g id="SERVICE">%1$s</xliff:g>, peranti anda tidak akan menggunakan kunci skrin anda untuk meningkatkan penyulitan data."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Oleh sebab anda telah menghidupkan perkhidmatan kebolehaksesan, peranti anda tidak akan menggunakan kunci skrin anda untuk meningkatkan penyulitan data."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Oleh kerana menghidupkan <xliff:g id="SERVICE">%1$s</xliff:g> mempengaruhi penyulitan data, anda perlu mengesahkan corak anda."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Pengimbasan rangkaian mudah alih"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> yang lalu"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Penggunaan apl sejak cas penuh (<xliff:g id="TIME">^1</xliff:g> yang lalu)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Penggunaan peranti sejak cas penuh (<xliff:g id="TIME">^1</xliff:g> yang lalu)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Jumlah masa skrin dihidupkan sejak cas penuh"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Penggunaan peranti sejak cas penuh"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Bateri digunakan sejak palam dicabut"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan kuasa terlebih kira"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Digunakan selama <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Penggunaan skrin <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> digunakan oleh <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> daripada keseluruhan bateri"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pecahan sejak cas penuh terakhir"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Pemberitahuan"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Terperinci"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Pemberitahuan kerja"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Benarkan lencana ikon"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Lampu berkelip"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Pada skrin kunci"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tunjukkan semua kandungan pemberitahuan"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategori dipadamkan</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori dipadamkan</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Lencana pemberitahuan"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Hidup"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Mati"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Sekat semua"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Jangan sekali-kali tunjukkan pemberitahuan ini"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Tunjukkan pemberitahuan"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Jangan sekali-kali tunjukkan pemberitahuan dalam bidai atau pada peranti persisian"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Benarkan lencana ikon"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Atasi Jangan Ganggu"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Benarkan pemberitahuan ini terus mengganggu apabila tetapan Jangan Ganggu ditetapkan kepada Keutamaan Sahaja"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pada skrin kunci"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Pengoptimuman bateri"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Makluman penggunaan"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Tunjukkan semua apl"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Sembunyikan apl tambahan"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Tunjukkan penggunaan peranti penuh"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Tunjukkan penggunaan apl"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Tidak dioptimumkan"</string>
<string name="high_power_on" msgid="6216293998227583810">"Tidak dioptimumkan"</string>
<string name="high_power_off" msgid="3393904131961263278">"Mengoptimumkan penggunaan bateri"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Permainan"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Apl lain"</string>
<string name="storage_files" msgid="8581083146777364063">"Fail"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Storan tablet"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Storan telefon"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Digunakan daripada <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"digunakan"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index c94d9b2..98a632b 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ကို သုံးမလား။"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ကလုပ်ဆောင်ရန်များ-"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"အပလီကေးရှင်းသည် ခွင့်ပြုချက်တောင်းခံမှုကို ပိတ်လိုက်ခြင်းကြောင့်၊ သင့်တုန့်ပြန်မှုကို အချိန်ညှိချက်များ အတည်မပြုနိုင်ပါ။"</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"အခြားအက်ပ်တစ်ခုက ဤအကြောင်းအရာများထိပ်မှာ ပေါ်နေသောကြောင့် ဆက်တင်များက သင်၏ လုပ်ဆောင်ကို တုံ့ပြန်နိုင်ခြင်းမရှိပါ။"</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"သင် ဖွင့်လိုက်လျှင် <xliff:g id="SERVICE">%1$s</xliff:g>၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"သင်က ရယူသုံးစွဲရန် ဝန်ဆောင်မှုကို ဖွင့်ထား၍ ၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသောကြောင့်၊ သင့် ရေးဆွဲပုံစံဖြင့် အတည်ပြုရန် လိုသည်။"</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"မိုဘိုင်းကွန်ရက် ရှာဖွေခြင်း"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"ပြီးခဲ့သည့် <xliff:g id="TIME">^1</xliff:g> က"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"အားဖြည့်ပြီးချိန်မှစ၍ (ပြီးခဲ့သည့် <xliff:g id="TIME">^1</xliff:g> က)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"အားအပြည့် သွင်းပြီးချိန်မှစ၍ အက်ပ်အသုံးပြုမှု (ပြီးခဲ့သည့် <xliff:g id="TIME">^1</xliff:g> က)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"အားအပြည့်သွင်းပြီးသည့် အချိန်မှစ၍ မျက်နှာပြင်ကို ဖွင့်ထားသောအချိန်"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"အားအပြည့်သွင်းထားသည့် အချိန်မှစ၍ စက်ပစ္စည်း အသုံးပြုမှု"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"အားသွင်းကြိုးဖြုတ်စဉ်မှဘတ္တရီအသုံးပြုနှုန်း"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"အပိုရေတွက်မှု စွမ်းရည် အသုံးပြုမှု"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ကြာ သုံးထားသည်"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"မျက်နှာပြင်အသုံးပြုချိန် <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ကို <xliff:g id="APP">%2$s</xliff:g> က အသုံးပြုထားသည်"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"စုစုပေါင်း ဘက်ထရီ၏<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"နောက်ဆုံးအကြိမ် အားဖြည့်ပြီးချိန်မှစ၍ ခွဲခြမ်းစိတ်ဖြာချက်"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"အကြောင်းကြားချက်များ"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"အဆင့်မြင့်"</string>
<string name="profile_section_header" msgid="2320848161066912001">"အလုပ်သတိပေးချက်များ"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"သင်္ကေတတံဆိပ်များကို ခွင့်ပြုရန်"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"မီး မှိတ်တုတ်မှိတ်တုတ်လုပ်ရန်"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"လော့ခ်ချထားသည့်မျက်နှာပြင်ပေါ်တွင်"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"အကြောင်းကြားချက်ပါ အကြောင်းအရာအားလုံးကို ပြမည်"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other">အုပ်စု <xliff:g id="COUNT_1">%d</xliff:g> ခုကို ဖျက်လိုက်ပါပြီ</item>
<item quantity="one">အုပ်စု <xliff:g id="COUNT_0">%d</xliff:g> ခုကို ဖျက်လိုက်ပါပြီ</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"အကြောင်းကြားချက် တံဆိပ်များ"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"ဖွင့်ထားသည်"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"ပိတ်ထားသည်"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"အားလုံးကို ပိတ်ဆို့ရန်။"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"ဤအကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြပါနှင့်"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"အကြောင်းကြားချက်များ ပြပါ"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"အရိပ်ထဲ သို့မဟုတ် တွဲချိတ်ထားသည့် စက်ပစ္စည်းများပေါ်တွင် အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြပါနှင့်"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"သင်္ကေတတံဆိပ်ကို ခွင့်ပြုရန်"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"မနှောင်ယှက်ပါနှင့် ကို အပေါ်မှဖျက်ရေးပါ"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"မနှောင်ယှက်ပါနှင့် ကို ဦးစားပေးမှု အတွက်သာ ဆိုပြီး သတ်မှတ်ထားလျှင် ဤသတိပေးချက်များအား ဆက်လက်ပြီး စွက်ဖက်ခွင့် ပြုပါ"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"လော့ခ်ချထားသည့်မျက်နှာပြင်ပေါ်တွင်"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> ( <xliff:g id="COUNT">%2$d</xliff:g> )"</string>
<string name="high_power_apps" msgid="3459065925679828230">"ဘက်ထရီအသုံးမြှင့်ခြင်း"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"သုံးစွဲမှုသတိပေးချက်များ"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"အက်ပ်အားလုံးပြရန်"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"အပိုအက်ပ်များကို ဝှက်ရန်"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"စက်ပစ္စည်း အသုံးပြုမှု အပြည့်အစုံကို ပြရန်"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"အက်ပ်အသုံးပြုမှုကို ပြရန်"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"မလုပ်ရသေးပါ"</string>
<string name="high_power_on" msgid="6216293998227583810">"သင့်မြတ်အောင် မလုပ်ရသေး"</string>
<string name="high_power_off" msgid="3393904131961263278">"ဘက်ထရီ အသုံးပြုမှု သင့်မြတ်အောင် လုပ်နေ"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"ဂိမ်းများ"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"အခြားအက်ပ်များ"</string>
<string name="storage_files" msgid="8581083146777364063">"ဖိုင်များ"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"တက်ဘလက် သိုလှောင်ခန်း"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ဖုန်း၏ သိုလှောင်ခန်း"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> အနက်မှ အသုံးပြုထားပါသည်"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"သုံးထား"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 7c09058..d2d0da3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Vil du bruke <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> må"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Fordi en app skjuler tillatelsesforespørselen, kan ikke Innstillinger bekrefte svaret ditt."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Fordi en annen app vises oppå disse alternativene, kan ikke Innstillinger svare på handlingen din."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Hvis du slår på <xliff:g id="SERVICE">%1$s</xliff:g>, bruker ikke enheten skjermlåsen til å forbedre datakryptering."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Fordi du har slått på en tilgjengelighetstjeneste, bruker ikke enheten skjermlåsen til å forbedre datakryptering."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Du må bekrefte mønsteret ditt for å slå på <xliff:g id="SERVICE">%1$s</xliff:g>, fordi den påvirker datakryptering."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Skanning etter mobilnettverk"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"for <xliff:g id="TIME">^1</xliff:g> siden"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Appbruk siden batteriet var fulladet (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Bruk av enheten siden sist batteriet var fulladet (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Hvor lenge skjermen har vært på siden batteriet var fulladet"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Enhetsbruk siden batteriet var fulladet"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Batteribruk siden strømmen ble trukket ut"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Overberegnet strømforbruk"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Brukt i <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Skjermbruk <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> brukt av <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> av total batteribruk"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Oversikt siden sist batteriet var fulladet"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Varsler"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avansert"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Jobbvarsler"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Tillat ikonmerker"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Blinkende lys"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"På låseskjermen"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Vis alt innhold i varsler"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorier er slettet</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori er slettet</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Varselmerker"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"På"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Av"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blokkér alle"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Vis aldri disse varslene"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Vis varsler"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Vis aldri varlser i panelet eller på eksterne enheter"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Tillat ikonmerke"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Overstyr Ikke forstyrr"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"La disse varslene fortsette å forstyrre når Ikke forstyrr er angitt til Bare prioriterte"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"På låseskjermen"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Batterioptimalisering"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Bruksvarsler"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Vis alle apper"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Skjul ekstra apper"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Vis fullstendig enhetsbruk"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Vis appbruk"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Ikke optimalisert"</string>
<string name="high_power_on" msgid="6216293998227583810">"Ikke optimalisert"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimaliserer batteribruken"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Spill"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Andre apper"</string>
<string name="storage_files" msgid="8581083146777364063">"Filer"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Lagring på nettbrett"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefonlagring"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"brukt av <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"brukt"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 23a89e5..cd11544 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> प्रयोग गर्नुहुन्छ?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई आवश्यक:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"एपले अनुमति अनुरोधलाई अस्पष्ट मानिरहेको हुनाले, सेटिङहरूलले तपाईंको प्रतिक्रियालाई प्रमाणित गर्न सक्दैनन्।"</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"यी विकल्पहरूको शीर्ष भागमा अर्को अनुप्रयोग देखिइरहेको हुनाले सेटिङहरूले तपाईंको कारबाहीको प्रतिक्रिया दिन सक्दैनन्।"</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"यदि तपाईंले <xliff:g id="SERVICE">%1$s</xliff:g> खोल्नुभयो भने, आफ्नो उपकरणले डेटा गुप्तिकरण अभिवृद्धि गर्न स्क्रिन लक प्रयोग गर्ने छैन।"</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"आफ्नो उपकरणले डेटा गुप्तिकरण अभिवृद्धि गर्न स्क्रिन लक प्रयोग गर्ने छैन, किनभने तपाईंले पहुँच सेवा खोल्नुभएको छ।"</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"किनभने <xliff:g id="SERVICE">%1$s</xliff:g> सेवा प्रयोग गर्दा डेटा गुप्तिकरणमा असर गर्छ, तपाईंले आफ्नो प्याटर्न पुष्टि गर्न आवश्यक छ।"</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्क्यान गर्ने कार्य"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> पहिले"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"पूर्ण चार्ज भएदेखि अनुप्रयोगको प्रयोग (<xliff:g id="TIME">^1</xliff:g> पहिले)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"पूर्ण चार्ज भएदेखि यन्त्रको प्रयोग (<xliff:g id="TIME">^1</xliff:g> पहिले)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"पूर्ण चार्ज भएदेखि स्क्रिन सक्रिय रहेको समय"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"पूर्ण चार्ज भएदेखि यन्त्रको प्रयोग"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग भएदेखि ब्याट्री प्रयोग"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"बढी गिन्ती गरिएको उर्जा प्रयोग"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> का लागि प्रयोग गरियो"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"स्क्रिन प्रयोग गरेको समय <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ले प्रयोग गरेको <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"समग्र ब्याट्रीको <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"पछिल्लो पटक पूर्ण चार्ज भएदेखिको विश्लेषण"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"सूचनाहरू"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"उन्नत"</string>
<string name="profile_section_header" msgid="2320848161066912001">"कार्यका सूचनाहरू"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"आइकनका ब्याजहरूलाई अनुमति दिनुहोस्"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"झिम झिम गर्ने बत्ती"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"लक स्क्रिनमा"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सबै सूचना सामग्री देखाउनुहोस्"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मेटाइएका कोटिहरू</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> मेटाइएको कोटि</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"सूचनाका पदकहरू"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"सक्रिय छ"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"निष्क्रिय छ"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"सबै रोक्नुहोस्"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"यी सूचनाहरू कहिल्यै नदेखाउनुहोस्"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"सूचनाहरू देखाउनुहोस्"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"ओझेलमा वा पेरिफेरल यन्त्रहरूमा कहिल्यै सूचनाहरू नदेखाउनुहोस्"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"आइकनको ब्याजलाई अनुमति दिनुहोस्"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"बाधा नपुर्याउनुहोस् मा ओभरराइड गर्नुहोस्"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"बाधा नपुर्याउनुहोस् प्राथमिकतामा मात्र सेट भएको बेला यी सूचनाहरूबाट हुने अवरोधका लागि अनुमति दिनुहोस्।"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"लक स्क्रिनमा"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"ब्याट्रीको अप्टिमाइजेसन"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"ब्याट्रीको प्रयोग सम्बन्धी अलर्ट"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"सबै अनुप्रयोगहरू देखाउनुहोस्"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"अतिरिक्त अनुप्रयोगहरू लुकाउनु"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"यन्त्रको पूर्ण प्रयोग देखाउनुहोस्"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"अनुप्रयोगको प्रयोग देखाउनुहोस्"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"आफू अनुकूल भएको छैन"</string>
<string name="high_power_on" msgid="6216293998227583810">"आफू अनुकूल नगरिएको"</string>
<string name="high_power_off" msgid="3393904131961263278">"ब्याट्री प्रयोग आफू अनुकूल गर्दै"</string>
@@ -3569,8 +3573,6 @@
<string name="storage_games" msgid="7703159201697117621">"खेलहरू"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"अन्य अनुप्रयोगहरू"</string>
<string name="storage_files" msgid="8581083146777364063">"फाइलहरू"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ट्याब्लेटको भण्डारण"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"फोनको भण्डारण"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> मध्ये प्रयोग भएको"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"प्रयोग भयो"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 461c12b..b551f01 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> gebruiken?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> moet het volgende kunnen:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Aangezien een app een toestemmingsverzoek afdekt, kan Instellingen je reactie niet verifiëren."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Omdat een andere app deze opties afdekt, kan Instellingen niet reageren op je actie."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Als je <xliff:g id="SERVICE">%1$s</xliff:g> inschakelt, maakt je apparaat geen gebruik van schermvergrendeling om de gegevensversleuteling te verbeteren."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Omdat je een toegankelijkheidsservice hebt ingeschakeld, maakt je apparaat geen gebruik van schermvergrendeling om de gegevensversleuteling te verbeteren."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Aangezien het inschakelen van <xliff:g id="SERVICE">%1$s</xliff:g> van invloed is op de gegevensversleuteling, moet je je patroon bevestigen."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Scannen naar mobiele netwerken"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> geleden"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"App-gebruik sinds volledige lading (<xliff:g id="TIME">^1</xliff:g> geleden)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Apparaatgebruik sinds laatste keer volledig opladen (<xliff:g id="TIME">^1</xliff:g> geleden)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tijd die het scherm is ingeschakeld sinds volledige lading"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Apparaatgebruik sinds volledige lading"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Accugebruik sinds losgekoppeld"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Te hoog berekend stroomgebruik"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> gebruikt"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Schermgebruik <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> gebruikt door <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> van batterij"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Uitsplitsing sinds laatste volledige lading"</string>
@@ -2064,7 +2065,7 @@
<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-apps weergeven"</string>
+ <string name="menu_show_system" msgid="8864603400415567635">"Systeem weergeven"</string>
<string name="menu_hide_system" msgid="4106826741703745733">"Systeem verbergen"</string>
<string name="menu_show_percentage" msgid="4717204046118199806">"Percentages weergeven"</string>
<string name="menu_use_uss" msgid="467765290771543089">"USS gebruiken"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Meldingen"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Geavanceerd"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Werkmeldingen"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Pictogrambadges toestaan"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Knipperlicht"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Op het vergrendelingsscherm"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Content van alle meldingen weergeven"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorieën verwijderd</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categorie verwijderd</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Meldingsbadges"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Aan"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Uit"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Alles blokkeren"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Deze meldingen nooit weergeven"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Meldingen weergeven"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Nooit meldingen weergeven in het meldingenpaneel of op randapparaten"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Pictogrambadge toestaan"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'Niet storen\' overschrijven"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Deze meldingen nog steeds laten onderbreken wanneer \'Niet storen\' is ingesteld op \'Alleen prioriteit\'"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Op het vergrendelingsscherm"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Batterijoptimalisatie"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Gebruiksmeldingen"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Alle apps weergeven"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Extra apps verbergen"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Volledig apparaatgebruik weergeven"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"App-gebruik weergeven"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Niet geoptimaliseerd"</string>
<string name="high_power_on" msgid="6216293998227583810">"Niet geoptimaliseerd"</string>
<string name="high_power_off" msgid="3393904131961263278">"Accuverbruik optimaliseren"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Games"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Andere apps"</string>
<string name="storage_files" msgid="8581083146777364063">"Bestanden"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Opslag op tablet"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefoonopslag"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"gebruikt van <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"gebr."</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 8dd5f70..35f72ea 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਵਰਤਣੀ ਹੈ?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਇਹ ਕਰਨ ਦੀ ਲੋੜ ਹੈ:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"ਕਿਉਂਕਿ ਇੱਕ ਐਪ ਇੱਕ ਅਨੁਮਤੀ ਬੇਨਤੀ ਨੂੰ ਅਸਪਸ਼ਟ ਬਣਾ ਰਿਹਾ ਹੈ, ਸੈਟਿੰਗਾਂ ਤੁਹਾਡੇ ਜਵਾਬ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ।"</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"ਕਿਉਂਕਿ ਕੋਈ ਹੋਰ ਐਪ ਇਹਨਾਂ ਵਿਕਲਪਾਂ ਦੇ ਉੱਤੇ ਪ੍ਰਦਰਸ਼ਿਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ, ਇਸ ਲਈ ਸੈਟਿੰਗਾਂ ਤੁਹਾਡੀ ਕਾਰਵਾਈ \'ਤੇ ਪ੍ਰਤਿਕਿਰਿਆ ਨਹੀਂ ਦੇ ਸਕਦੀਆਂ ਹਨ।"</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"ਜੇਕਰ ਤੁਸੀਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਡੈਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਲੌਕ ਨਹੀਂ ਵਰਤੇਗੀ।"</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"ਕਿਉਂਕਿ ਤੁਸੀਂ ਇੱਕ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾ ਚਾਲੂ ਕੀਤੀ ਹੈ, ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਡੈਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਨੂੰ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡਾ ਸਕ੍ਰੀਨ ਅਨਲੌਕ ਨਹੀਂ ਵਰਤੇਗੀ।"</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡੈਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ਪਹਿਲਾਂ"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਐਪ ਵਰਤੋਂ (<xliff:g id="TIME">^1</xliff:g> ਪਹਿਲਾਂ)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਐਪ ਵਰਤੋਂ (<xliff:g id="TIME">^1</xliff:g> ਪਹਿਲਾਂ)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਸਕ੍ਰੀਨ ਕਿੰਨੇ ਸਮੇਂ ਤੱਕ ਚਾਲੂ ਰਹੀ"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਡੀਵਾਈਸ ਵਰਤੋਂ"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"ਅਨਪਲਗ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"ਓਵਰ-ਕਾਉਂਟਿਡ ਪਾਵਰ ਵਰਤੋਂ"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ਲਈ ਵਰਤਿਆ ਗਿਆ"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"ਸਕ੍ਰੀਨ ਵਰਤਣ ਦਾ ਸਮਾਂ <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ਵੱਲੋਂ <xliff:g id="PERCENT">%1$s</xliff:g> ਵਰਤੀ ਗਈ"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"ਸਮੁੱਚੀ ਬੈਟਰੀ ਦਾ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਦੇ ਵੇਰਵੇ"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"ਸੂਚਨਾਵਾਂ"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"ਉੱਨਤ"</string>
<string name="profile_section_header" msgid="2320848161066912001">"ਕੰਮ ਸਬੰਧੀ ਸੂਚਨਾਵਾਂ"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"ਪ੍ਰਤੀਕ ਬੈਜਾਂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"ਲਾਈਟ ਨੂੰ ਟਿਮ-ਟਿਮਾਓ"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ਸਾਰੀ ਸੂਚਨਾ ਸਮੱਗਰੀ ਦਿਖਾਓ"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਸ਼੍ਰੇਣੀ ਨੂੰ ਮਿਟਾਇਆ ਗਿਆ</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਸ਼੍ਰੇਣੀਆਂ ਨੂੰ ਮਿਟਾਇਆ ਗਿਆ</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"ਸੂਚਨਾ ਬੈਜ"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"ਚਾਲੂ"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"ਬੰਦ"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"ਸਾਰੇ ਬਲੌਕ ਕਰੋ"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਕਦੇ ਨਾ ਵਿਖਾਓ"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"ਸੂਚਨਾਵਾਂ ਵਿਖਾਓ"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"ਸੂਚਨਾਵਾਂ ਕਦੇ ਵੀ ਪਰਛਾਵੇਂ ਵਿੱਚ ਜਾਂ ਪੈਰੀਫਿਰਲ ਡੀਵਾਈਸਾਂ \'ਤੇ ਨਾ ਵਿਖਾਓ"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"ਪ੍ਰਤੀਕ ਬੈਜ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਓਵਰਰਾਈਡ ਕਰੋ"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਰੋਕੇ ਰਹਿਣਾ ਜਾਰੀ ਰਹਿਣ ਦਿਓ ਜਦੋਂ ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਸਿਰਫ਼ ਤਰਜੀਹ \'ਤੇ ਸੈੱਟ ਕੀਤਾ ਹੋਵੇ।"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"ਬੈਟਰੀ ਸੁਯੋਗਤਾ"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"ਵਰਤੋਂ ਬਾਰੇ ਸੁਚੇਤਨਾਵਾਂ"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"ਸਭ ਐਪਾਂ ਵਿਖਾਓ"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"ਵਾਧੂ ਐਪਾਂ ਲੁਕਾਓ"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"ਡੀਵਾਈਸ ਦੀ ਪੂਰੀ ਵਰਤੋਂ ਦਿਖਾਓ"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"ਐਪ ਵਰਤੋਂ ਦਿਖਾਓ"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"ਸੁਯੋਗ ਨਹੀਂ ਬਣਾਇਆ ਗਿਆ"</string>
<string name="high_power_on" msgid="6216293998227583810">"ਸੁਯੋਗ ਨਹੀਂ ਬਣਾਇਆ ਗਿਆ"</string>
<string name="high_power_off" msgid="3393904131961263278">"ਬੈਟਰੀ ਦੇ ਉਪਯੋਗ ਨੂੰ ਅਨੁਕੂਲਿਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"ਗੇਮਾਂ"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"ਹੋਰ ਐਪਾਂ"</string>
<string name="storage_files" msgid="8581083146777364063">"ਫ਼ਾਈਲਾਂ"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ਟੈਬਲੈੱਟ ਸਟੋਰੇਜ"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ਫ਼ੋਨ ਸਟੋਰੇਜ"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> ਵਿੱਚੋਂ ਵਰਤਿਆ"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"ਵਰਤੀ ਗਈ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1673bad..0a806e1 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1894,7 +1894,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Włączyć <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"Wymagania <xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Aplikacja Ustawienia nie może zweryfikować Twojej odpowiedzi, ponieważ inna aplikacja zasłania prośbę o udzielenie uprawnień."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Ustawienia nie reagują na działania, ponieważ inna aplikacja jest wyświetlana nad tymi opcjami."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Jeśli włączysz usługę <xliff:g id="SERVICE">%1$s</xliff:g>, Twoje urządzenie nie będzie korzystać z blokady ekranu, by usprawnić szyfrowanie danych."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Włączyłeś usługę ułatwień dostępu, więc Twoje urządzenie nie będzie korzystać z blokady ekranu, by usprawnić szyfrowanie danych."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Ponieważ włączenie <xliff:g id="SERVICE">%1$s</xliff:g> wpływa na szyfrowanie danych, musisz potwierdzić swój wzór."</string>
@@ -1956,6 +1955,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Skanowanie sieci komórkowej"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> temu"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Wykorzystanie od pełnego naładowania (<xliff:g id="TIME">^1</xliff:g> temu)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Zużycie przez urządzenie od pełnego naładowania (<xliff:g id="TIME">^1</xliff:g> temu)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Czas włączenia ekranu od pełnego naładowania"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Wykorzystanie przez urządzenie od ostatniego naładowania"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Użycie baterii od odłączenia"</string>
@@ -2047,6 +2047,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Zużycie energii obliczone z nadmiarem"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Korzystanie przez <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Wykorzystanie przez ekran (<xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> zużyte przez: <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> całkowitego zużycia baterii"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Zestawienie od ostatniego pełnego naładowania"</string>
@@ -2105,7 +2106,7 @@
<string name="menu_duration_3h" msgid="4714866438374738385">"3 godzin"</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">"24 godziny"</string>
+ <string name="menu_duration_1d" msgid="3393631127622285458">"24 godzin"</string>
<string name="menu_show_system" msgid="8864603400415567635">"Pokaż systemowe"</string>
<string name="menu_hide_system" msgid="4106826741703745733">"Ukryj systemowe"</string>
<string name="menu_show_percentage" msgid="4717204046118199806">"Pokaż procent"</string>
@@ -2831,7 +2832,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Powiadomienia"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Zaawansowane"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Powiadomienia związane z pracą"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Zezwól na ikony z plakietkami"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Migająca dioda"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na ekranie blokady"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokazuj wszystkie powiadomienia"</string>
@@ -2912,14 +2914,16 @@
<item quantity="other">Usunięto <xliff:g id="COUNT_1">%d</xliff:g> kategorii</item>
<item quantity="one">Usunięto <xliff:g id="COUNT_0">%d</xliff:g> kategorię</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Plakietki powiadomień"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Wł."</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Wył."</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blokuj wszystkie"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Nigdy nie pokazuj tych powiadomień"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Pokazuj powiadomienia"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Nigdy nie pokazuj powiadomień w obszarze powiadomień ani na urządzeniach peryferyjnych"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Zezwól na plakietkę z ikoną"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Zastąp Nie przeszkadzać"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Zezwól na działanie tych powiadomień, gdy Nie przeszkadzać ma ustawienie Tylko priorytetowe"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na ekranie blokady"</string>
@@ -3164,8 +3168,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optymalizacja baterii"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Alerty o transmisji danych"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Pokaż wszystkie aplikacje"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Ukryj aplikacje dodatkowe"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Pokaż pełne zużycie przez urządzenie"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Pokaż zużycie przez aplikacje1"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Bez optymalizacji"</string>
<string name="high_power_on" msgid="6216293998227583810">"Bez optymalizacji"</string>
<string name="high_power_off" msgid="3393904131961263278">"Ma włączoną optymalizację baterii"</string>
@@ -3669,8 +3673,6 @@
<string name="storage_games" msgid="7703159201697117621">"Gry"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Inne aplikacje"</string>
<string name="storage_files" msgid="8581083146777364063">"Pliki"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Pamięć w tablecie"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Pamięć telefonu"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"wykorzystane z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"miejsca"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 0256a46..1ed281f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1375,7 +1375,7 @@
<string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
<string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Usar GPS, Wi‑Fi, Bluetooth ou redes móveis para determinar a localização"</string>
<string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Usar Wi-Fi, Bluetooth ou redes móveis para determinar a localização"</string>
- <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar local"</string>
+ <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar a localização"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Verificação"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Verificação de Wi-Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Melhore a localização permitindo que apps e serviços do sistema detectem redes Wi-Fi a qualquer momento."</string>
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Como um app está ocultando uma solicitação de permissão, as configurações não podem confirmar sua resposta."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Como outro app está sendo exibido sobre essas opções, as configurações não podem responder à sua ação."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se <xliff:g id="SERVICE">%1$s</xliff:g> for ativado, o dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Uma vez que o serviço de acessibilidade foi ativado, seu dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme seu padrão."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Uso do app desde a carga completa (há <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso do dispositivo desde a última carga completa (<xliff:g id="TIME">^1</xliff:g> atrás)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Por quanto tempo a tela ficou ativada desde a carga completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Usada por <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Uso da tela: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> de uso por <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhamento desde a última carga completa"</string>
@@ -2338,7 +2339,7 @@
<string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Isto preservará o uso de dados e da bateria, mas será necessário sincronizar manualmente cada conta para obter as informações mais recentes, e você não será informado de novas atualizações."</string>
<string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de redefinição do ciclo de uso"</string>
<string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mês:"</string>
- <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definidas"</string>
+ <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definir"</string>
<string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Definir aviso de uso de dados"</string>
<string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Definir limite do uso de dados"</string>
<string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitando uso de dados"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificações"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avançadas"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificações de trabalho"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Permitir selos de ícone"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Piscar a luz"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na tela de bloqueio"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o conteúdo de notificações"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categoria excluída</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias excluídas</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Selos de notificação"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Ativado"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Desativadas"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Nunca mostrar essas notificações"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificações"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Nunca mostrar notificações na aba ou em dispositivos periféricos"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Permitir selo de ícone"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Modificar \"Não perturbe\""</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na tela de bloqueio"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Otimização de bateria"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todos os apps"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar apps extras"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total no dispositivo"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Não otimizados"</string>
<string name="high_power_on" msgid="6216293998227583810">"Não otimizado"</string>
<string name="high_power_off" msgid="3393904131961263278">"Otimizando o uso de bateria"</string>
@@ -3334,7 +3338,7 @@
<string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Adicionar outra impr. digital"</string>
<string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Desbloqueie com um dedo diferente"</string>
<string name="battery_saver_on_summary" msgid="9072203872401530722">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+ <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativada / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Nunca ativar automaticamente"</string>
<string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Ativar automaticamente com %1$s de bateria"</string>
<string name="not_battery_optimizing" msgid="5362861851864837617">"Otimização de bateria desativada"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Jogos"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Outros apps"</string>
<string name="storage_files" msgid="8581083146777364063">"Arquivos"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Armazenamento do tablet"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Armazenamento"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Usados de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"usado"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index c0f29a3..664b09c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -25,8 +25,8 @@
<string name="dlg_switch" msgid="6243971420240639064">"Alternar"</string>
<string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
+ <item quantity="one">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
<item quantity="other">Está agora a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passos de se tornar um programador.</item>
- <item quantity="one">Está agora a <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> passo de se tornar um programador.</item>
</plurals>
<string name="show_dev_on" msgid="1110711554982716293">"Agora é um programador!"</string>
<string name="show_dev_already" msgid="2151632240145446227">"Não é necessário, já é um programador."</string>
@@ -242,8 +242,8 @@
<string name="locale_remove_menu" msgid="7651301406723638854">"Remover"</string>
<string name="add_a_language" msgid="2330538812283783022">"Adicionar um idioma"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
+ <item quantity="one">Remove selected languages?</item>
<item quantity="other">Pretende remover os idiomas selecionados?</item>
- <item quantity="one">Pretende remover o idioma selecionado?</item>
</plurals>
<string name="dlg_remove_locales_message" msgid="1361354927342876114">"O texto será apresentado noutro idioma."</string>
<string name="dlg_remove_locales_error_title" msgid="2653242337224911425">"Não é possível remover todos os idiomas"</string>
@@ -347,8 +347,8 @@
<string name="fingerprint_add_title" msgid="1926752654454033904">"Adicionar impressão digital"</string>
<string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueio de ecrã"</string>
<plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
+ <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints set up</item>
<item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> impressão digital configurada</item>
</plurals>
<string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
<string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloquear com impr. digital"</string>
@@ -538,28 +538,28 @@
<string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"Tem de incluir, pelo menos, um dígito"</string>
<string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"Tem de incluir, pelo menos, um símbolo"</string>
<plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
+ <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> letters</item>
<item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras</item>
- <item quantity="one">Tem de incluir, pelo menos, 1 letra</item>
</plurals>
<plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2626327674921055486">
+ <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> lowercase letters</item>
<item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras minúsculas</item>
- <item quantity="one">Tem de incluir, pelo menos, 1 letra minúscula</item>
</plurals>
<plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="7860796359913920356">
+ <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> uppercase letters</item>
<item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> letras maiúsculas</item>
- <item quantity="one">Tem de incluir, pelo menos, 1 letra maiúscula</item>
</plurals>
<plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="1967587658356336828">
+ <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> numerical digits</item>
<item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> dígitos numéricos</item>
- <item quantity="one">Tem de incluir, pelo menos, 1 dígito numérico</item>
</plurals>
<plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
+ <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> special symbols</item>
<item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> símbolos especiais</item>
- <item quantity="one">Tem de incluir, pelo menos, 1 símbolo especial</item>
</plurals>
<plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
+ <item quantity="one">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-letter characters</item>
<item quantity="other">Tem de incluir, pelo menos, <xliff:g id="COUNT">%d</xliff:g> carateres que não sejam letras</item>
- <item quantity="one">Tem de incluir, pelo menos, 1 caráter que não seja uma letra</item>
</plurals>
<string name="lockpassword_password_recently_used" msgid="942665351220525547">"O admin. do disp. não permite a utilização de uma palavra-passe recente"</string>
<string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Não é permitida uma sequência de dígitos ascendente, descendente ou repetida"</string>
@@ -571,15 +571,15 @@
<string name="manage_device_admin" msgid="537804979483211453">"Aplicações de administrador do dispositivo"</string>
<string name="number_of_device_admins_none" msgid="7185056721919496069">"Sem aplicações ativas"</string>
<plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
+ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> active apps</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações ativas</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicação ativa</item>
</plurals>
<string name="manage_trust_agents" msgid="4629279457536987768">"Agentes fidedignos"</string>
<string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Para utilizar, defina primeiro um bloqueio de ecrã"</string>
<string name="manage_trust_agents_summary" msgid="1475819820389620546">"Nenhum"</string>
<plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
+ <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> active trust agents</item>
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agentes fidedignos ativos</item>
- <item quantity="one">1 agente fidedigno ativo</item>
</plurals>
<string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
<string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ativar Bluetooth"</string>
@@ -805,8 +805,8 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
<string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Redes guardadas"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
+ <item quantity="one">%d networks</item>
<item quantity="other">%d redes</item>
- <item quantity="one">1 rede</item>
</plurals>
<string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Avançada"</string>
<string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar o Wi‑Fi"</string>
@@ -1056,8 +1056,8 @@
<string name="sim_preferred_message" msgid="8466930554330635780">"O <xliff:g id="NEW_SIM">%1$s</xliff:g> é o único cartão SIM no dispositivo. Pretende utilizar este cartão SIM para os dados móveis, as chamadas e as mensagens SMS?"</string>
<string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN do cartão SIM incorreto. Tem de contactar o seu operador para desbloquear o dispositivo."</string>
<plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
+ <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
<item quantity="other">Código PIN do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas.</item>
- <item quantity="one">Cód. PIN cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de contactar operador p/ desbloquear disp.</item>
</plurals>
<string name="pin_failed" msgid="1848423634948587645">"Falha ao introduzir o PIN do cartão SIM!"</string>
<string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado do tablet"</string>
@@ -1286,8 +1286,8 @@
<string name="reset_network_complete_toast" msgid="787829973559541880">"As definições de rede foram repostas"</string>
<string name="master_clear_title" msgid="5907939616087039756">"Repos. dados/fábrica"</string>
<plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
+ <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> accounts will be reset</item>
<item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> contas serão repostas</item>
- <item quantity="one">1 conta será reposta</item>
</plurals>
<string name="master_clear_summary" msgid="6902443944660426951">"A memória de armazenamento interno e todos os dados serão repostos"</string>
<string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
@@ -1504,8 +1504,8 @@
<string name="clear_cache_btn_text" msgid="5756314834291116325">"Limpar cache"</string>
<string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
<plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
+ <item quantity="one">%d items</item>
<item quantity="other">%d itens</item>
- <item quantity="one">1 item</item>
</plurals>
<string name="clear_uri_btn_text" msgid="8575655132961012158">"Limpar acesso"</string>
<string name="controls_label" msgid="7611113077086853799">"Controlos"</string>
@@ -1799,24 +1799,24 @@
<string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar nas Definições rápidas"</string>
<string name="daltonizer_type" msgid="1124178250809091080">"Modo de correção"</string>
<plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
+ <item quantity="one">Extremely short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
<item quantity="other">Atraso extremamente curto (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
- <item quantity="one">Atraso extremamente curto (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
</plurals>
<plurals name="accessibilty_autoclick_preference_subtitle_very_short_delay" formatted="false" msgid="5589565607652364932">
+ <item quantity="one">Very short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
<item quantity="other">Atraso muito curto (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
- <item quantity="one">Atraso muito curto (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
</plurals>
<plurals name="accessibilty_autoclick_preference_subtitle_short_delay" formatted="false" msgid="5887754135102768400">
+ <item quantity="one">Short delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
<item quantity="other">Atraso curto (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
- <item quantity="one">Atraso curto (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
</plurals>
<plurals name="accessibilty_autoclick_preference_subtitle_long_delay" formatted="false" msgid="6340683412750219405">
+ <item quantity="one">Long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
<item quantity="other">Atraso longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
- <item quantity="one">Atraso longo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
</plurals>
<plurals name="accessibilty_autoclick_preference_subtitle_very_long_delay" formatted="false" msgid="3503199424330634970">
+ <item quantity="one">Very long delay (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
<item quantity="other">Atraso muito longo (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
- <item quantity="one">Atraso muito longo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
</plurals>
<string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configurações"</string>
<string name="accessibility_feature_state_on" msgid="2864292320042673806">"Ativado"</string>
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Utilizar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> necessita de:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Uma vez que uma aplicação está a ocultar um pedido de autorização, as Definições não conseguem validar a sua resposta."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Uma vez que outra aplicação está a ser apresentada por cima destas opções, as Definições não podem responder à sua ação."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se ativar o <xliff:g id="SERVICE">%1$s</xliff:g>, o dispositivo não utilizará o bloqueio de ecrã para otimizar a encriptação de dados."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Uma vez que ativou um serviço de acessibilidade, o dispositivo não utilizará o bloqueio de ecrã para otimizar a encriptação de dados."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Uma vez que ligar <xliff:g id="SERVICE">%1$s</xliff:g> afeta a encriptação de dados, o utilizador tem de confirmar o seu padrão."</string>
@@ -1871,8 +1870,8 @@
<string name="print_settings" msgid="4742428530112487843">"Impressão"</string>
<string name="print_settings_summary_no_service" msgid="6354322414246865875">"Desativado"</string>
<plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
+ <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> serviços de impressão ativados</item>
- <item quantity="one">1 serviço de impressão ativado</item>
</plurals>
<string name="print_settings_title" msgid="3685449667822217816">"Serviços de impressão"</string>
<string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Procura de redes móveis"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Utilização de aplicações desde o carregamento completo (há <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilização do dispositivo desde o carregamento completo (há <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tempo durante o qual o ecrã tem estado ativado desde o carregamento completo"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Utilização do dispositivo desde o carregamento completo"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Bateria utilizada desde que foi desligado"</string>
@@ -1946,8 +1946,8 @@
<string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
<string name="power_cell" msgid="3392999761958982492">"Modo de espera da rede móvel"</string>
<string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
- <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactivo"</string>
- <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone inactivo"</string>
+ <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inativo"</string>
+ <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone inativo"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Diversos"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Contabilizada em excesso"</string>
<string name="power_apps" msgid="2043554781293951327">"Aplicações"</string>
@@ -1982,8 +1982,8 @@
<string name="battery_action_wifi" msgid="8181553479021841207">"Definições de Wi-Fi"</string>
<string name="battery_action_bluetooth" msgid="8374789049507723142">"Definições de Bluetooth"</string>
<string name="battery_desc_voice" msgid="8980322055722959211">"Bateria utilizada por chamadas de voz"</string>
- <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateria utilizada quando o tablet está inactivo"</string>
- <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Bateria utilizada quando o telefone está inactivo"</string>
+ <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateria utilizada quando o tablet está inativo"</string>
+ <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Bateria utilizada quando o telefone está inativo"</string>
<string name="battery_desc_radio" msgid="5479196477223185367">"Bateria utilizada pelo rádio do telefone"</string>
<string name="battery_sugg_radio" msgid="8211336978326295047">"Mudar para modo de avião para poupar energia em áreas sem cobertura de rede"</string>
<string name="battery_desc_flashlight" msgid="2908579430841025494">"Bateria utilizada pela lanterna"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilização de energia contabilizada em excesso"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Utilizada durante <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Utilização do ecrã: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizado pela aplicação <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhes desde o último carregamento completo"</string>
@@ -2458,21 +2459,21 @@
<string name="ssl_ca_cert_warning" msgid="2045866713601984673">"A rede pode ser monitorizada"</string>
<string name="done_button" msgid="1991471253042622230">"Concluído"</string>
<plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
+ <item quantity="one">Trust or remove certificates</item>
<item quantity="other">Confiar ou remover os certificados</item>
- <item quantity="one">Confiar ou remover o certificado</item>
</plurals>
<plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
- <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
- <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação no seu dispositivo que pode permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o administrador.</item>
+ <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
+ <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Sites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
</plurals>
<plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
- <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
- <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação para o seu perfil de trabalho que pode permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o administrador.</item>
+ <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
+ <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Sites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o administrador.</item>
</plurals>
- <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"A sua atividade de rede, incluindo emails, aplicações e Websites seguros, pode ser monitorizada por terceiros.\n\nIsto é possível através de uma credencial fidedigna instalada no seu dispositivo."</string>
+ <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"A sua atividade de rede, incluindo emails, aplicações e Sites seguros, pode ser monitorizada por terceiros.\n\nIsto é possível através de uma credencial fidedigna instalada no seu dispositivo."</string>
<plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
+ <item quantity="one">Check certificates</item>
<item quantity="other">Verificar certificados</item>
- <item quantity="one">Verificar certificado</item>
</plurals>
<string name="user_settings_title" msgid="6151874007858148344">"Utilizadores"</string>
<string name="user_list_title" msgid="7937158411137563543">"Utilizadores e perfis"</string>
@@ -2649,8 +2650,8 @@
<string name="sim_selection_required_pref" msgid="3446721423206414652">"A seleção é necessária"</string>
<string name="dashboard_title" msgid="5453710313046681820">"Definições"</string>
<plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
+ <item quantity="one">Show %d hidden items</item>
<item quantity="other">Mostrar %d itens ocultos</item>
- <item quantity="one">Mostrar %d item oculto</item>
</plurals>
<string name="network_dashboard_title" msgid="4771589228992391573">"Rede e Internet"</string>
<string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, dispositivo móvel, utilização de dados, zona Wi-Fi"</string>
@@ -2747,8 +2748,8 @@
<string name="boot_sounds_title" msgid="567029107382343709">"Ativar sons"</string>
<string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Nenhuma regra automática ativada"</string>
<plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
+ <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> automatic rules turned on</item>
<item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regras automáticas ativadas</item>
- <item quantity="one">1 regra automática ativada</item>
</plurals>
<string name="zen_mode_settings_title" msgid="842308776768942600">"Preferências de Não incomodar"</string>
<string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade permite apenas"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificações"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avançadas"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificações de trabalho"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Permitir emblemas de ícones"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Emitir luz intermitente"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"No ecrã de bloqueio"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todas as notificações"</string>
@@ -2810,8 +2812,8 @@
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"As aplicações não podem ler notificações"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
+ <item quantity="one">%d apps can read notifications</item>
<item quantity="other">%d aplicações conseguem ler notificações</item>
- <item quantity="one">%d aplicação consegue ler notificações</item>
</plurals>
<string name="no_notification_listeners" msgid="3487091564454192821">"Nenhuma aplicação instalada solicitou acesso a notificações"</string>
<string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Pretende permitir o acesso a notificações de <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -2845,21 +2847,23 @@
<string name="app_settings_link" msgid="8894946007543660906">"Definições adicionais na aplicação"</string>
<string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Ativadas para todas as aplicações"</string>
<plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
+ <item quantity="one">Turned off for <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
<item quantity="other">Desativado para <xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
- <item quantity="one">Desativado para <xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
</plurals>
<plurals name="deleted_channels" formatted="false" msgid="8028574302599397935">
+ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias eliminadas</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria eliminada</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Balões de notificações"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Ativadas"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Desativadas"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Nunca mostrar estas notificações"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificações"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Nunca mostrar notificações no painel ou nos dispositivos periféricos"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Permitir emblema de ícone"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Substituir o modo Não incomodar"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificações continuem a interrompê-lo quando o modo Não incomodar estiver definido como Apenas prioridade"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"No ecrã de bloqueio"</string>
@@ -2932,12 +2936,12 @@
<string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
<string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"Alterar para alarmes apenas, indefinidamente"</string>
<plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
+ <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
<item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> minutos, até às <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
- <item quantity="one">Alterar para alarmes apenas durante um minuto, até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
</plurals>
<plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
+ <item quantity="one">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
<item quantity="other">Alterar para alarmes apenas durante <xliff:g id="DURATION">%1$d</xliff:g> horas até às <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
- <item quantity="one">Alterar para alarmes apenas durante uma hora até às <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g></item>
</plurals>
<string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Alterar para alarmes apenas, até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="6172985102689237703">"Alterar para interromper sempre"</string>
@@ -3015,16 +3019,16 @@
<string name="notification_summary_level" msgid="2726571692704140826">"Nível %d"</string>
<string name="notification_summary_channel" msgid="5831124672372023524">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
<plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
+ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> permissions granted</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorizações concedidas</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> autorização concedida</item>
</plurals>
<plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
+ <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
<item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> de <xliff:g id="COUNT_3">%d</xliff:g> autorizações concedidas</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> autorização concedida</item>
</plurals>
<plurals name="runtime_permissions_additional_count" formatted="false" msgid="931276038884210752">
+ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> additional permissions</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> permissões adicionais</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> permissão adicional</item>
</plurals>
<string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nenhuma permissão concedida"</string>
<string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nenhuma permissão solicitada"</string>
@@ -3052,8 +3056,8 @@
<string name="domain_urls_summary_some" msgid="3950089361819428455">"Abrir <xliff:g id="DOMAIN">%s</xliff:g> e outros URLs"</string>
<string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"Nenhum aplicação abre links compatíveis"</string>
<plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
+ <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps opening supported links</item>
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações que abrem links compatíveis</item>
- <item quantity="one">Uma aplicação que abre links compatíveis</item>
</plurals>
<string name="app_link_open_always" msgid="2474058700623948148">"Abrir com esta aplicação"</string>
<string name="app_link_open_ask" msgid="7800878430190575991">"Perguntar sempre"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Otimização da bateria"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Alertas de utilização"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todas as aplicações"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar aplicações adicionais"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Mostrar utilização completa do dispositivo"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar utilização de aplic."</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Não otimizada"</string>
<string name="high_power_on" msgid="6216293998227583810">"Não otimizada"</string>
<string name="high_power_off" msgid="3393904131961263278">"Utilização otimizada da bateria"</string>
@@ -3155,8 +3159,8 @@
<string name="free_memory" msgid="4003936141603549746">"Disponível"</string>
<string name="memory_usage_apps" msgid="5650192998273294098">"Memória utilizada pelas aplicações"</string>
<plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
+ <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps used memory in the last <xliff:g id="DURATION_1">%2$s</xliff:g></item>
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicações utilizaram a memória nos(as) últimos(as) <xliff:g id="DURATION_1">%2$s</xliff:g></item>
- <item quantity="one">1 aplicação utilizou a memória nos(as) últimos(as) <xliff:g id="DURATION_0">%2$s</xliff:g></item>
</plurals>
<string name="running_frequency" msgid="6622624669948277693">"Frequência"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Utilização máxima"</string>
@@ -3229,8 +3233,8 @@
<string name="disconnected" msgid="4836600637485526329">"Sem ligação"</string>
<string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> dos dados utilizados"</string>
<plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
+ <item quantity="one">Off for <xliff:g id="COUNT">%d</xliff:g> apps</item>
<item quantity="other">Desativadas para <xliff:g id="COUNT">%d</xliff:g> aplicações</item>
- <item quantity="one">Desativadas para 1 aplicação</item>
</plurals>
<string name="notification_summary_none" msgid="4586376436702610">"Ativadas para todas as aplicações"</string>
<string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> aplicações instaladas"</string>
@@ -3302,8 +3306,8 @@
<string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mensalmente a partir do dia <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="network_restrictions" msgid="8234695294536675380">"Restrições de rede"</string>
<plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
+ <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrições</item>
- <item quantity="one">1 restrição</item>
</plurals>
<string name="operator_warning" msgid="1862988028996859195">"A contagem de dados do operador pode ser diferente da contagem do dispositivo"</string>
<string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> utilizado(s)"</string>
@@ -3315,8 +3319,8 @@
<string name="configure" msgid="1029654422228677273">"Configurar"</string>
<string name="data_usage_other_apps" msgid="3272872663517382050">"Outras aplicações incluídas na utilização"</string>
<plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
+ <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
<item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicações autorizadas a utilizar dados sem restrições quando a Poupança de dados está ativada</item>
- <item quantity="one">1 aplicação autorizada a utilizar dados sem restrições quando a Poupança de dados está ativada</item>
</plurals>
<string name="data_saver_title" msgid="398458827917495765">"Poupança de dados"</string>
<string name="unrestricted_data_saver" msgid="7019858887510062789">"Acesso a dados sem restrições"</string>
@@ -3373,8 +3377,8 @@
<string name="notification_log_details_ranking_none" msgid="599607025882587844">"O objeto de classificação não contém esta chave."</string>
<string name="special_access" msgid="3458780842491881155">"Acesso especial a aplicações"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
+ <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações podem utilizar dados sem restrições</item>
- <item quantity="one">1 aplicação pode utilizar dados sem restrições</item>
</plurals>
<string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Pretende mesmo limpar os dados do utilizador e converter para a encriptação de ficheiros?"</string>
<string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Limpar e converter"</string>
@@ -3423,16 +3427,16 @@
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pesquisa de contactos"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir pesquisa de contactos por parte da sua entidade para identificar autores das chamadas e contactos"</string>
<plurals name="hours" formatted="false" msgid="7020844602875333472">
+ <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> horas</item>
- <item quantity="one">1 hora</item>
</plurals>
<plurals name="minutes" formatted="false" msgid="4666832442068789413">
+ <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutos</item>
- <item quantity="one">1 minuto</item>
</plurals>
<plurals name="seconds" formatted="false" msgid="3876307354560025025">
+ <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
- <item quantity="one">1 segundo</item>
</plurals>
<string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo de espera de ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
<string name="bluetooth_talkback_computer" msgid="4875089335641234463">"Computador"</string>
@@ -3511,16 +3515,16 @@
<string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"Aplicações instaladas"</string>
<string name="enterprise_privacy_apps_count_estimation_info" msgid="7433213592572082606">"O número de aplicações é uma estimativa. Pode não incluir as aplicações instaladas fora da Play Store."</string>
<plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="3005116533873542976">
+ <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
<item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
- <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
</plurals>
<string name="enterprise_privacy_location_access" msgid="4158197200885270634">"Autorizações de acesso à localização"</string>
<string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"Autorizações do microfone"</string>
<string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"Autorizações da câmara"</string>
<string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"Aplicações predefinidas"</string>
<plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
+ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> apps</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicações</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicação</item>
</plurals>
<string name="enterprise_privacy_input_method" msgid="6531350246850814920">"Teclado predefinido"</string>
<string name="enterprise_privacy_input_method_name" msgid="4941106433683067953">"Definido como <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
@@ -3530,35 +3534,35 @@
<string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Proxy HTTP global definido"</string>
<string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Credenciais fidedignas"</string>
<plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
+ <item quantity="one">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
<item quantity="other">No mínimo, <xliff:g id="COUNT_1">%d</xliff:g> certificados da AC</item>
- <item quantity="one">No mínimo, <xliff:g id="COUNT_0">%d</xliff:g> certificado da AC</item>
</plurals>
<string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"O administrador pode bloquear o dispositivo e repor a palavra-passe"</string>
<string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"O administrador pode eliminar todos os dados do dispositivo"</string>
<string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"Tentativas de introdução da palavra-passe falhadas antes da eliminação de todos os dados do dispositivo"</string>
<string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"Tentativas de introdução da palavra-passe falhadas antes da eliminação de todos os dados do perfil de trabalho"</string>
<plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="5279099270351036696">
+ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentativas</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tentativa</item>
</plurals>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Este dispositivo é gerido pela sua entidade."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo é gerido por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
<string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saiba mais"</string>
<plurals name="default_camera_app_title" formatted="false" msgid="1134677050353971363">
+ <item quantity="one">Camera apps</item>
<item quantity="other">Aplicações de câmara</item>
- <item quantity="one">Aplicação de câmara</item>
</plurals>
<string name="default_calendar_app_title" msgid="3545972964391065220">"Aplicação de calendário"</string>
<string name="default_contacts_app_title" msgid="3497370557378660098">"Aplicação de contactos"</string>
<plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
+ <item quantity="one">Email client apps</item>
<item quantity="other">Aplicações de cliente de email</item>
- <item quantity="one">Aplicação de cliente de email</item>
</plurals>
<string name="default_map_app_title" msgid="7560143381633608567">"Aplicação de mapas"</string>
<plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
+ <item quantity="one">Phone apps</item>
<item quantity="other">Aplicações de telefone</item>
- <item quantity="one">Aplicação de telefone</item>
</plurals>
<string name="app_names_concatenation_template_2" msgid="4309216198909946380">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
<string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Jogos"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Outras aplicações"</string>
<string name="storage_files" msgid="8581083146777364063">"Ficheiros"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Armazenamento do tablet"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Armazenamento telemóvel"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Utilizados de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"utilizado"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0256a46..1ed281f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1375,7 +1375,7 @@
<string name="location_mode_screen_title" msgid="4528716772270246542">"Modo de localização"</string>
<string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Usar GPS, Wi‑Fi, Bluetooth ou redes móveis para determinar a localização"</string>
<string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Usar Wi-Fi, Bluetooth ou redes móveis para determinar a localização"</string>
- <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar local"</string>
+ <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usar GPS para determinar a localização"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"Verificação"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Verificação de Wi-Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Melhore a localização permitindo que apps e serviços do sistema detectem redes Wi-Fi a qualquer momento."</string>
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> precisa:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Como um app está ocultando uma solicitação de permissão, as configurações não podem confirmar sua resposta."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Como outro app está sendo exibido sobre essas opções, as configurações não podem responder à sua ação."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Se <xliff:g id="SERVICE">%1$s</xliff:g> for ativado, o dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Uma vez que o serviço de acessibilidade foi ativado, seu dispositivo não usará o bloqueio de tela para melhorar a criptografia de dados."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"A ativação do <xliff:g id="SERVICE">%1$s</xliff:g> afeta a criptografia de dados. Confirme seu padrão."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Uso do app desde a carga completa (há <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso do dispositivo desde a última carga completa (<xliff:g id="TIME">^1</xliff:g> atrás)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Por quanto tempo a tela ficou ativada desde a carga completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Usada por <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Uso da tela: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> de uso por <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhamento desde a última carga completa"</string>
@@ -2338,7 +2339,7 @@
<string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Isto preservará o uso de dados e da bateria, mas será necessário sincronizar manualmente cada conta para obter as informações mais recentes, e você não será informado de novas atualizações."</string>
<string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de redefinição do ciclo de uso"</string>
<string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mês:"</string>
- <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definidas"</string>
+ <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definir"</string>
<string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Definir aviso de uso de dados"</string>
<string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Definir limite do uso de dados"</string>
<string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitando uso de dados"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificações"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avançadas"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificações de trabalho"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Permitir selos de ícone"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Piscar a luz"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na tela de bloqueio"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o conteúdo de notificações"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> categoria excluída</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> categorias excluídas</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Selos de notificação"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Ativado"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Desativadas"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Bloquear tudo"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Nunca mostrar essas notificações"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificações"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Nunca mostrar notificações na aba ou em dispositivos periféricos"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Permitir selo de ícone"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Modificar \"Não perturbe\""</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na tela de bloqueio"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Otimização de bateria"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Mostrar todos os apps"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Ocultar apps extras"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total no dispositivo"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Não otimizados"</string>
<string name="high_power_on" msgid="6216293998227583810">"Não otimizado"</string>
<string name="high_power_off" msgid="3393904131961263278">"Otimizando o uso de bateria"</string>
@@ -3334,7 +3338,7 @@
<string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Adicionar outra impr. digital"</string>
<string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Desbloqueie com um dedo diferente"</string>
<string name="battery_saver_on_summary" msgid="9072203872401530722">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+ <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativada / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Nunca ativar automaticamente"</string>
<string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Ativar automaticamente com %1$s de bateria"</string>
<string name="not_battery_optimizing" msgid="5362861851864837617">"Otimização de bateria desativada"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Jogos"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Outros apps"</string>
<string name="storage_files" msgid="8581083146777364063">"Arquivos"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Armazenamento do tablet"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Armazenamento"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Usados de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"usado"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bd8c960..55f0c34 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1874,7 +1874,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Utilizați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> are funcțiile:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Deoarece o aplicație acoperă o solicitare de permisiune, Setările nu vă pot verifica răspunsul."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Deoarece o altă aplicație se afișează deasupra acestor opțiuni, Setările nu pot răspunde la acțiunea dvs."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Dacă activați <xliff:g id="SERVICE">%1$s</xliff:g>, dispozitivul nu va utiliza blocarea ecranului pentru a îmbunătăți criptarea datelor."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Pentru că ați activat un serviciu de accesibilitate, dispozitivul nu va utiliza blocarea ecranului pentru a îmbunătăți criptarea datelor."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Deoarece activarea serviciului <xliff:g id="SERVICE">%1$s</xliff:g> afectează criptarea datelor, trebuie să confirmați modelul."</string>
@@ -1935,6 +1934,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Scanarea rețelei mobile"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"în urmă cu <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Utilizarea de către aplicații de la ultima încărcare (în urmă cu <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Utilizarea dispozitivului de la ultima încărcare completă (acum <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Perioada de timp de la încărcarea completă cât a fost pornit ecranul"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Utilizarea dispozitivului de la încărcarea completă"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Utilizarea bateriei de la deconectare"</string>
@@ -2026,6 +2026,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumul supraevaluat al bateriei"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Utilizată <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Utilizarea ecranului: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> folosită de <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> din bateria încărcată complet"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detaliere de la ultima încărcare completă"</string>
@@ -2804,7 +2805,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Notificări"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avansate"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Notificări profil de serviciu"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Permiteți insigne pictogramă"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Lumină intermitentă"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Pe ecranul de blocare"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afișează integral conținutul notificărilor"</string>
@@ -2882,14 +2884,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de categorii șterse</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categorie ștearsă</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Insigne pentru notificare"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Activat"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Dezactivat"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blocați-le pe toate"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Aceste notificări nu se afișează niciodată"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Afișați notificările"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Nu afișați niciodată notificările în umbră sau pe dispozitive periferice"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Permiteți insigne pictogramă"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignoră Nu deranja"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permiteți acestor notificări să vă întrerupă când modul Nu deranja este setat la Numai cu prioritate"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pe ecranul de blocare"</string>
@@ -3128,8 +3132,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimizarea bateriei"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Alerte privind utilizarea"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Afișați toate aplicațiile"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Ascundeți aplic. suplimentare"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Afișați utilizarea completă a dispozitivului"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Afișați utilizarea aplicațiilor"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimizate"</string>
<string name="high_power_on" msgid="6216293998227583810">"Neoptimizată"</string>
<string name="high_power_off" msgid="3393904131961263278">"Se optimizează utilizarea bateriei"</string>
@@ -3618,8 +3622,6 @@
<string name="storage_games" msgid="7703159201697117621">"Jocuri"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Alte aplicații"</string>
<string name="storage_files" msgid="8581083146777364063">"Fișiere"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Spațiu de stocare pe tabletă"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Stocare pe telefon"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Folosit din <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"folosit"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4d833ef..c337372 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1310,7 +1310,7 @@
<string name="reset_network_confirm_title" msgid="1759888886976962773">"Сбросить настройки?"</string>
<string name="network_reset_not_available" msgid="7188610385577164676">"Этот пользователь не может сбрасывать настройки сети"</string>
<string name="reset_network_complete_toast" msgid="787829973559541880">"Сетевые настройки сброшены"</string>
- <string name="master_clear_title" msgid="5907939616087039756">"Сбросить все данные"</string>
+ <string name="master_clear_title" msgid="5907939616087039756">"Сброс к заводским настройкам"</string>
<plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
<item quantity="one">Будет сброшен <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> аккаунт</item>
<item quantity="few">Будет сброшено <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> аккаунта</item>
@@ -1894,7 +1894,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Включить <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> будет:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Невозможно принять ваше согласие, поскольку запрос скрыт другим приложением."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Приложение \"Настройки\" не может ответить на ваше действие, поскольку его закрывает другое приложение."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Если включить службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\", блокировка экрана будет отключена и надежность защиты зашифрованных данных снизится."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Поскольку включена служба специальных возможностей, блокировка экрана будет отключена и надежность защиты зашифрованных данных может быть снижена."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Включение сервиса <xliff:g id="SERVICE">%1$s</xliff:g> затронет шифрование данных, поэтому необходимо ввести графический ключ."</string>
@@ -1956,6 +1955,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Сканирование мобильной сети"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> назад"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Использование приложений с момента полной зарядки (<xliff:g id="TIME">^1</xliff:g> назад)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Использование устройства с момента полной зарядки (прошло: <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Время работы экрана с момента полной зарядки"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Использование устройства с момента полной зарядки"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Расход заряда батареи с момента отключения от сети питания"</string>
@@ -2047,6 +2047,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Преувеличенное энергопотребление"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА·ч"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Время использования: <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Использование экрана: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> – <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> заряда батареи"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Использование с момента полной зарядки"</string>
@@ -2831,7 +2832,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Уведомления"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Расширенные настройки"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Рабочие уведомления"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Показывать наклейки на значках"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Световая индикация"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"На заблокированном экране"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показывать уведомления полностью"</string>
@@ -2912,14 +2914,16 @@
<item quantity="many">Удалено <xliff:g id="COUNT_1">%d</xliff:g> категорий</item>
<item quantity="other">Удалено <xliff:g id="COUNT_1">%d</xliff:g> категории</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Значки уведомлений"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Вкл."</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Откл."</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Блокировать все"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Не показывать эти уведомления"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Включить уведомления"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Не показывать уведомления на фоне или на периферийных устройствах"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Показывать наклейку на значке"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Переопределить \"Не беспокоить\""</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Разрешить эти уведомления, когда в режиме \"Не беспокоить\" выбрано \"Только важные\""</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На заблокированном экране"</string>
@@ -3164,8 +3168,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Экономия заряда батареи"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Предупреждения"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Показать все приложения"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Скрыть доп. приложения"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Вся информация об использовании"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Использование приложений"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Не экономят заряд"</string>
<string name="high_power_on" msgid="6216293998227583810">"Не экономит заряд"</string>
<string name="high_power_off" msgid="3393904131961263278">"Экономия заряда включена"</string>
@@ -3669,8 +3673,6 @@
<string name="storage_games" msgid="7703159201697117621">"Игры"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Другие приложения"</string>
<string name="storage_files" msgid="8581083146777364063">"Файлы"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Память планшета"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Хранилище телефона"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"занято из <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"занято"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 779cf4a..790062c 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> භාවිත කරන්න ද?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> හට අවශ්යයි:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"යෙදුම අවසර ඉල්ලීමක් කරන නිසා, සැකසීම් හට ඔබගේ ප්රතිචාරය සත්යාපනය කළ නොහැක."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"වෙනත් යෙදුමක් මෙම විකල්පවල ඉහළින්ම සංදර්ශනය වන නිසා, සැකසීම්වලට ඔබේ ක්රියාවට ප්රතිචාර දැක්විය නොහැකිය."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"ඔබ <xliff:g id="SERVICE">%1$s</xliff:g> සක්රිය කළේ නම්, දත්ත සංකේතනය වැඩි කිරීමට ඔබගේ උපාංගයට අගුළු තීරයක් භාවිතා කිරීමට අවශ්ය නැත."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"ඔබ ප්රවේශතා සේවාව සක්රිය කළ නිසා, දත්ත සංකේතනය වැඩි කිරීමට ඔබගේ උපාංගයට අගුළු තීරයක් භාවිතා කිරීමට අවශ්ය නැත."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> බලපාන දත්ත සංකේතනය ක්රියාත්මක කරන නිසා, ඔබගේ රටාව ඔබට සහතික කිරීමට අවශ්යය."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"ජංගම ජාල පරිලෝකනය කරමින්"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>කට පෙර"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"පූර්ණ ආරෝපණයේ සිට යෙදුම භාවිතය (<xliff:g id="TIME">^1</xliff:g> පෙර)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"පූර්ණ ආරෝපණයේ සිට උපාංග භාවිතය (<xliff:g id="TIME">^1</xliff:g> පෙර)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"පූර්ණ ආරෝපණය සිට තිරය සක්රියව තිබූ වේලාව"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"පූර්ණ ආරෝපණයෙන් පසුව උපාංග භාවිතය"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"පේනුවෙන් ඉවත් කළ පසු බැටරි භාවිතය"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"වැඩියෙන් ගණනය කළ බල භාවිතය"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>ක් භාවිත කරන ලදී"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"තිර භාවිතය <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> වෙතින් <xliff:g id="PERCENT">%1$s</xliff:g>ක් භාවිතා කර ඇත"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"සමස්ත බැටරියෙන් <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"අවසන් පූර්ණ ආරෝපණයෙන් පසුව ප්රභේදනය"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"දැනුම්දීම්"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"උසස්"</string>
<string name="profile_section_header" msgid="2320848161066912001">"වැඩ දැනුම්දීම්"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"නිරූපක ලාංඡනයට ඉඩ දෙන්න"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"නිවී නිවී දැල්වෙන එළිය"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"අගුලු තිරය මත"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"සියලුම දැනුම්දීමේ අන්තර්ගත පෙන්වන්න"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one">ප්රවර්ග <xliff:g id="COUNT_1">%d</xliff:g>ක් මකා දමන ලදි</item>
<item quantity="other">ප්රවර්ග <xliff:g id="COUNT_1">%d</xliff:g>ක් මකා දමන ලදි</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"දැනුම්දීම් බැජ්"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"ක්රියාත්මකයි"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"ක්රියාවිරහිතයි"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"සියල්ල අවහිර කරන්න"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"මෙම දැනුම්දීම් කිසිදා නොපෙන්වන්න"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"දැනුම්දීම් පෙන්වන්න"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"සෙවන තුළ හෝ පර්යන්ත උපාංග මත දැනුම්දීම් කිසිදා නොපෙන්වන්න"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"නිරූපක ලාංඡනයට ඉඩ දෙන්න"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"බාධා නොකරන්න ඉක්මවන්න"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"බාධා නොකරන්න, ප්රමුඛතා පමණි වෙත සකසා ඇති විට මෙම දැනුම්දීම්වලට බාධා කිරීමට දිගටම ඉඩ දෙන්න"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"අගුලු තිරය මත"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"බැටරි ප්රශස්තකරණය"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"භාවිත ඇඟවීම්"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"සියලුම යෙදුම් පෙන්වන්න"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"අමතර යෙදුම් සඟවන්න"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"පූර්ණ උපාංග භාවිතය පෙන්වන්න"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"යෙදුම් භාවිතය පෙන්වන්න"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"ප්රශස්තකරණය වී නොමැත"</string>
<string name="high_power_on" msgid="6216293998227583810">"ප්රශස්තකරණය වී නොමැත"</string>
<string name="high_power_off" msgid="3393904131961263278">"බැටරි භාවිතය ප්රශස්තකරණය"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"ක්රීඩා"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"වෙනත් යෙදුම්"</string>
<string name="storage_files" msgid="8581083146777364063">"ගොනු"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ටැබ්ලට ආචයනය"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"දුරකථන ගබඞාව"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g>න් භාවිත කළ"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"භාවිතා කළ"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5a70258..a6d637f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1894,7 +1894,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Používať službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> potrebuje:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Nastavenia nemôžu overiť vašu odpoveď, pretože určitá aplikácia blokuje žiadosť o povolenie."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Nastavenia nemôžu reagovať na vašu akciu, pretože sa nad týmito možnosťami zobrazuje iná aplikácia."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ak zapnete službu <xliff:g id="SERVICE">%1$s</xliff:g>, vaše zariadenie nepoužije zámku obrazovky na zvýšenie miery šifrovania údajov."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Keďže ste zapli služby dostupnosti, vaše zariadenie nepoužije zámku obrazovky na zvýšenie miery šifrovania údajov."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Keďže zapnutie služby <xliff:g id="SERVICE">%1$s</xliff:g> ovplyvňuje šifrovanie údajov, musíte potvrdiť svoj vzor."</string>
@@ -1956,6 +1955,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Vyhľadávanie mobilnej siete"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"pred <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Spotreba aplikácií od úplného nabitia (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Využitie v zariadení od úplného nabitia (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Ako dlho bola zapnutá obrazovka od úplného dobitia"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Využitie zariadenia od úplného dobitia"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Využitie batérie od odpojenia"</string>
@@ -2047,6 +2047,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadsadená spotreba energie"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Používané <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Využitie obrazovky <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> využila aplikácia <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> celkovej výdrže batérie"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Prehľad od posledného úplného nabitia"</string>
@@ -2831,7 +2832,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Upozornenia"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Rozšírené"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Pracovné upozornenia"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Povoliť odznaky na ikonách"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Blikanie"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na uzamknutej obrazovke"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobrazovať všetok obsah upozornení"</string>
@@ -2883,7 +2885,7 @@
<string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Znížiť rozmazanie (odporúčané)"</string>
<string name="display_vr_pref_off" msgid="2190091757123260989">"Znížiť blikanie"</string>
<string name="picture_in_picture_title" msgid="5824849294270017113">"Obraz v obraze"</string>
- <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Žiadna z nainštalovaných aplikácií nepodporuje režim Obraz v obraze"</string>
+ <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Žiadna z nainštalovaných aplikácií nepodporuje obraz v obraze"</string>
<string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip, obraz v"</string>
<string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Obraz v obraze"</string>
<string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Povoliť obraz v obraze"</string>
@@ -2912,14 +2914,16 @@
<item quantity="other">Bolo odstránených <xliff:g id="COUNT_1">%d</xliff:g> kategórií</item>
<item quantity="one">Bola odstránená <xliff:g id="COUNT_0">%d</xliff:g> kategória</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Odznaky upozornení"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Zapnuté"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Vypnuté"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blokovať všetko"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Tieto upozornenia nikdy nezobrazovať"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Zobrazovať upozornenia"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Nikdy nezobrazovať upozornenia na paneli ani v periférnych zariadeniach"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Povoliť odznak na ikone"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Prepísať možnosť Nerušiť"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Umožniť týmto upozorneniam vyrušiť ma, ak je možnosť Nerušiť nastavená na možnosť Iba prioritné"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na uzamknutej obrazovke"</string>
@@ -3164,8 +3168,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimalizácia batérie"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Upozornenia o spotrebe"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Zobraziť všetky aplikácie"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Skryť ďalšie aplikácie"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Zobraziť úplné využitie v zariadení"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Zobraziť využitie aplikácií"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimalizované"</string>
<string name="high_power_on" msgid="6216293998227583810">"Neoptimalizované"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimalizuje používanie batérie"</string>
@@ -3669,8 +3673,6 @@
<string name="storage_games" msgid="7703159201697117621">"Hry"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Ďalšie aplikácie"</string>
<string name="storage_files" msgid="8581083146777364063">"Súbory"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Úložisko tabletu"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Úložisko telefónu"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Využité z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"využité"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index fa9bac8..7cd178d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1894,7 +1894,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Želite uporabiti storitev <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> mora:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Ker aplikacija zakriva zahtevo za dovoljenje, z nastavitvami ni mogoče preveriti vašega odziva."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Ker te možnosti prekriva druga aplikacija, se aplikacija Nastavitve ne more odzvati na vaše dejanje."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Če vklopite storitev <xliff:g id="SERVICE">%1$s</xliff:g>, vaša naprava ne bo uporabljala zaklepanja zaslona za izboljšanje šifriranja podatkov."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Vaša naprava ne bo uporabljala zaklepanja zaslona za izboljšanje šifriranja podatkov, ker ste vklopili storitev za ljudi s posebnimi potrebami."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Ker vklop storitve <xliff:g id="SERVICE">%1$s</xliff:g> vpliva na šifriranje podatkov, morate potrditi vzorec."</string>
@@ -1956,6 +1955,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Pregledovanje mobilnih omrežij"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"pred <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Poraba aplik. od napol. akumul. (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uporaba naprave od polne napolnjenosti akumulatorja (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Trajanje vklopljenosti zaslona od polne napolnjenosti akumulatorja"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Poraba naprave od polne napolnjenosti akumulatorja"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Uporaba akumulatorja po odklopu"</string>
@@ -2047,6 +2047,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Preveč šteta uporaba energije"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Trajanje uporabe: <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Uporaba zaslona: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> uporablja <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> celotne napolnjenosti akumulatorja"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Razčlenitev od zadnje napol. akumulatorja"</string>
@@ -2831,7 +2832,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Obvestila"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Dodatno"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Obvestila za delovni profil"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Omogoči značko na ikonah"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Utripajoča lučka"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaklenjenem zaslonu"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokaži vso vsebino obvestil"</string>
@@ -2912,14 +2914,16 @@
<item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorije so izbrisane</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorij je izbrisanih</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Obvestilne značke"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Vklopljeno"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Izklopljeno"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj vse"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Nikoli ne prikaži teh obvestil"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Pokaži obvestila"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Nikoli ne pokaži obvestil na zaslonu z obvestili ali v zunanjih napravah."</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Omogoči značko na ikoni"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Preglasitev načina »Ne moti«"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Naj se ta obvestila prikazujejo tudi, ko je način »Ne moti« nastavljen na »Samo prednostno«"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaklenjenem zaslonu"</string>
@@ -3100,7 +3104,7 @@
<string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Ni zahtevanih dovoljenj"</string>
<string name="filter_all_apps" msgid="1988403195820688644">"Vse aplikacije"</string>
<string name="filter_enabled_apps" msgid="5395727306799456250">"Nameščene aplikacije"</string>
- <string name="filter_instant_apps" msgid="574277769963965565">"Aplikacije brez nameščanja"</string>
+ <string name="filter_instant_apps" msgid="574277769963965565">"Nenamestljive aplikacije"</string>
<string name="filter_personal_apps" msgid="3277727374174355971">"Osebno"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Služba"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacije: vse"</string>
@@ -3164,8 +3168,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimizacija akumulatorja"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Opozorila o porabi"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Pokaži vse aplikacije"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Skrij dodatne aplikacije"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Prikaz vseh podatkov o uporabi naprave"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Prikaz uporabe aplikacij"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Ni optimizirano"</string>
<string name="high_power_on" msgid="6216293998227583810">"Ni optimizirano"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimizacija uporabe akumulatorja"</string>
@@ -3569,10 +3573,10 @@
<string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Povežite se z internetom ali se obrnite na operaterja"</string>
<string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Ni na voljo v napravah, zaklenjenih na operaterja"</string>
<string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"Skupaj sproščeno: <xliff:g id="SIZE">%1$s</xliff:g>\n\nNazadnje zagnano: <xliff:g id="DATE">%2$s</xliff:g>"</string>
- <string name="web_action_enable_title" msgid="4051513950976670853">"Aplikacije brez nameščanja"</string>
+ <string name="web_action_enable_title" msgid="4051513950976670853">"Nenamestljive aplikacije"</string>
<string name="web_action_enable_summary" msgid="3108127559723396382">"Odpri povezave v aplikacijah, tudi če niso nameščene"</string>
- <string name="web_action_section_title" msgid="7364647086538399136">"Aplikacije brez nameščanja"</string>
- <string name="instant_apps_account" msgid="1433620209791992528">"Račun za aplikacije brez nameščanja"</string>
+ <string name="web_action_section_title" msgid="7364647086538399136">"Nenamestljive aplikacije"</string>
+ <string name="instant_apps_account" msgid="1433620209791992528">"Račun za nenamestljive aplikacije"</string>
<string name="domain_url_section_title" msgid="7046835219056428883">"Nameščene aplikacije"</string>
<string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Shrambo zdaj upravlja upravitelj shrambe"</string>
<string name="account_for_section_header" msgid="5356566418548737121">"Računi uporabnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3669,13 +3673,11 @@
<string name="storage_games" msgid="7703159201697117621">"Igre"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
<string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Shramba tabl. računalnika"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Pomnilnik telefona"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Uporabljeno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"uporab."</string>
<string name="clear_instant_app_data" msgid="2004222610585890909">"Počisti aplikacijo"</string>
- <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Ali želite odstraniti to aplikacijo brez nameščanja?"</string>
+ <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Ali želite odstraniti to nenamestljivo aplikacijo?"</string>
<string name="game_storage_settings" msgid="3410689937046696557">"Igre"</string>
<string name="audio_files_title" msgid="4777048870657911307">"Zvočne datoteke"</string>
<string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(odstranjeno za uporabnika <xliff:g id="USER">%s</xliff:g>)"</string>
@@ -3688,7 +3690,7 @@
<string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj shrambe: <xliff:g id="STATUS">^1</xliff:g>"</string>
<string name="storage_manager_indicator_off" msgid="7488057587180724388">"Izklopljeno"</string>
<string name="storage_manager_indicator_on" msgid="8625551710194584733">"Vklopljeno"</string>
- <string name="install_type_instant" msgid="3174425974536078647">"Aplikacija brez nameščanja"</string>
+ <string name="install_type_instant" msgid="3174425974536078647">"Nenamestljiva aplikacija"</string>
<string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Želite izklopiti upravitelja shrambe?"</string>
<string name="storage_movies_tv" msgid="5498394447562086890">"Aplikacije za filme in TV"</string>
<string name="app_info_storage_title" msgid="5554719444625611987">"Uporabljen prostor"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index b02f64a..795ad51 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Të përdoret \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"\"<xliff:g id="SERVICE">%1$s</xliff:g>\" ka nevojë të:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Duke qenë se një aplikacion po bllokon një kërkesë për leje, \"Cilësimet\" nuk mund të verifikojnë përgjigjen tënde."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Cilësimet nuk mund t\'i përgjigjen veprimit tënd pasi një aplikacion tjetër po shfaqet mbi këto opsione."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Nëse aktivizon <xliff:g id="SERVICE">%1$s</xliff:g>, pajisja nuk do të përdorë kyçjen e ekranit për të rritur enkriptimin e të dhënave."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Për shkak se ke aktivizuar shërbimin e qasshmërisë, pajisja jote nuk do të përdorë kyçen e ekranit për përmirësimin e enkriptimit të të dhënave."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Meqenëse aktivizimi i <xliff:g id="SERVICE">%1$s</xliff:g> ndikon në enkriptimin e të dhënave, duhet të konfirmosh motivin tënd."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Skanimi i rrjetit celular"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> më parë"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Përdorimi i apl. që nga ngarkimi i plotë (<xliff:g id="TIME">^1</xliff:g> më parë)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Përdorimi i pajisjes që nga ngarkimi i plotë (<xliff:g id="TIME">^1</xliff:g> më parë)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Sasia e kohës për të cilën ekrani ka qenë aktiv që nga ngarkimi i plotë"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Përdorimi i pajisjes që nga ngarkimi i plotë"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Përdorimi i baterisë që nga heqja nga ngarkimi"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Përdorimi i energjisë i numëruar më shumë sa duhet"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Përdorur për <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Përdorimi i ekranit <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> përdorur nga <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> nga e gjithë bateria"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Analiza që nga ngarkimi i fundit i plotë"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Njoftime"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Të përparuara"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Njoftimet e punës"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Lejo simbolet e ikonave"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Drita me pulsim"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Në ekranin e kyçjes"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Shfaq të gjithë përmbajtjen e njoftimit"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategori u fshinë</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori u fshi</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Simbolet dalluese të njoftimeve"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Aktive"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Joaktive"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Bllokoji të gjitha"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Mos i shfaq asnjëherë këto njoftime"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Shfaq njoftimet"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Mos shfaq asnjëherë njoftime në hije ose në pajisje periferike"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Simboli dallues i ikonës së lejimit"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anulo \"Mos shqetëso\""</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lejo që këto njoftime të vazhdojnë të ndërpresin kur \"Mos shqetëso\" është vendosur në \"Vetëm prioritare\""</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Në ekranin e kyçjes"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Optimizimi i baterisë"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Sinjalizimet për përdorimin"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Shfaq të gjitha aplikacionet"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Fshih aplikacionet shtesë"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Shfaq përdorimin e plotë të pajisjes"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Shfaq përdorimin e aplikacionit"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Jo të optimizuara"</string>
<string name="high_power_on" msgid="6216293998227583810">"Nuk është i optimizuar"</string>
<string name="high_power_off" msgid="3393904131961263278">"Optimizojnë përdorimin e baterisë"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Lojëra"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Aplikacionet e tjera"</string>
<string name="storage_files" msgid="8581083146777364063">"Skedarët"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Hapësira ruajtëse e tabletit"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Hapësira ruajtëse e telefonit"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Përdorur nga <xliff:g id="TOTAL">%1$s</xliff:g> gjithsej"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"e përdorur"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 8519b16..261ab5e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1874,7 +1874,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Желите ли да користите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> треба:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Пошто апликација скрива захтев за дозволу, Подешавања не могу да верификују одговор."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Подешавања не могу да одговоре на радњу јер се нека друга апликација приказује преко ових опција."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ако укључите <xliff:g id="SERVICE">%1$s</xliff:g>, уређај неће користити закључавање екрана да би побољшао шифровање података."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Пошто сте укључили услугу приступачности, уређај неће користити закључавање екрана да би побољшао шифровање података."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Пошто укључивање услуге <xliff:g id="SERVICE">%1$s</xliff:g> утиче на шифровање података, треба да потврдите шаблон."</string>
@@ -1935,6 +1934,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилних мрежа"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"пре <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Коришћење апликације од потпуног пуњења (пре <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Коришћење уређаја од потпуног пуњења (пре <xliff:g id="TIME">^1</xliff:g>)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Количина времена током којег је екран био укључен од потпуног пуњења"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Коришћење уређаја од потпуног пуњења"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Коришћење батерије након искључивања"</string>
@@ -2026,6 +2026,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Прекомерно израчуната потрошња енергије"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Користи се <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Коришћење екрана: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> користи <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> укупног капацитета батерије"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Преглед од последњег потпуног пуњења"</string>
@@ -2804,7 +2805,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Обавештења"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Напредна"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Обавештења за Work"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Дозволи значке на иконама"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Укључи треперење лампице"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"На закључаном екрану"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Прикажи сав садржај обавештења"</string>
@@ -2882,14 +2884,16 @@
<item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> категорије су избрисане</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> категорија је избрисано</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Значке обавештења"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Укључено"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Искључено"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Блокирај све"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Никада не приказуј ова обавештења"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Приказуј обавештења"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Обавештења се никада не приказују на траци или периферијским уређајима"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Дозволи значку на икони"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Замени режим Не узнемиравај"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Омогућава да ова обавештења наставе да се приказују када је режим Не узнемиравај подешен на опцију Само приоритетни прекиди"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На закључаном екрану"</string>
@@ -3128,8 +3132,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Оптимизација батерије"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Обавештења о коришћењу"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Прикажи све апликације"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Сакриј додатне апликације"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Прикажи комплетно коришћење уређаја"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Прикажи коришћење апликације"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Без оптимизације"</string>
<string name="high_power_on" msgid="6216293998227583810">"Без оптимизације"</string>
<string name="high_power_off" msgid="3393904131961263278">"Оптимизација коришћења батерије"</string>
@@ -3618,8 +3622,6 @@
<string name="storage_games" msgid="7703159201697117621">"Игре"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Друге апликације"</string>
<string name="storage_files" msgid="8581083146777364063">"Датотеке"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Меморија таблета"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Меморија телефона"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Искоришћено од укупно <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"у упот."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 38ac080..65b8646 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Vill du använda <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> behöver:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Svaret kan inte verifieras av Inställningar, eftersom en app skymmer en begäran om behörighet."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Det går inte att använda Inställningar eftersom en annan app visas ovanpå alternativen."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Om du aktiverar <xliff:g id="SERVICE">%1$s</xliff:g> används inte skärmlåset för att förbättra datakryptering på enheten."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Eftersom du har aktiverat en tillgänglighetstjänst används inte skärmlåset för att förbättra datakryptering på enheten."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Eftersom datakrypteringen påverkas om du aktiverar <xliff:g id="SERVICE">%1$s</xliff:g> måste du bekräfta ditt grafiska lösenord."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Genomsökning av mobilnätverk"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> sedan"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Appanvändning sedan fulladdning (<xliff:g id="TIME">^1</xliff:g> sedan)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Enhetsanvändning sedan fulladdning (<xliff:g id="TIME">^1</xliff:g> sedan)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Den totala tidsperiod skärmen har varit på sedan den senaste fulladdningen"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Enhetsanvändning sedan batteriet var fulladdat"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Batteriförbrukning sedan bortkoppling"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"För högt räknad strömförbrukning"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Har använts i <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Skärmanvändning <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> har använts av <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> av den totala batterianvändningen"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Fördelning sedan senaste fulladdningen"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Meddelanden"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Avancerat"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Jobbaviseringar"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Tillåt ikonmärken"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Blinkande ljus"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"På låsskärmen"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Visa allt aviseringsinnehåll"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorier har raderats</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori har raderats</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Aviseringsmärken"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Aktiverat"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Av"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Blockera alla"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Visa aldrig de här aviseringarna"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Visa aviseringar"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Visa aldrig aviseringar i panelen eller på perifera enheter"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Tillåt ikonmärke"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Åsidosätt Stör ej"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Fortsätt att få dessa aviseringar när Endast prioriterade har angetts för Stör ej"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"På låsskärmen"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Batterioptimering"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Aviseringar om användning"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Visa alla appar"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Dölj extra appar"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Visa fullständig enhetsanvändning"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Visa appanvändning"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Inte optimerade"</string>
<string name="high_power_on" msgid="6216293998227583810">"Inte optimerad"</string>
<string name="high_power_off" msgid="3393904131961263278">"Använder optimerad batteriförbrukning"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Spel"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Andra appar"</string>
<string name="storage_files" msgid="8581083146777364063">"Filer"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Surfplattans lagringsutrymme"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Mobilens lagringsutrymme"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"av <xliff:g id="TOTAL">%1$s</xliff:g> används"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"används"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 633ac45..b9c958d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1688,7 +1688,7 @@
<string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Kisaidizi cha njia za mkato"</string>
<string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Onyesha njia za mkato zilizoko"</string>
<string name="default_keyboard_layout" msgid="4172606673510531271">"Chaguo-msingi"</string>
- <string name="pointer_speed" msgid="1221342330217861616">"Kasi ya pointa"</string>
+ <string name="pointer_speed" msgid="1221342330217861616">"Kasi ya kiashiria"</string>
<string name="game_controller_settings_category" msgid="8794508575329923718">"Kidhibiti cha Mchezo"</string>
<string name="vibrate_input_devices" msgid="2599591466928793082">"Tumia kitetemeshaji"</string>
<string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Elekeza upya kitetemeshaji kwa kidhibiti cha mchezo wakati umeunganishwa."</string>
@@ -1791,7 +1791,7 @@
<string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Muda wa kugusa na kushikilia"</string>
<string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Ugeuzaji rangi"</string>
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Huenda ikaathiri utendaji"</string>
- <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Bofya kishale kikiacha kusonga"</string>
+ <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Bofya kiashiria kikiacha kusonga"</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Muda wa kusubiri kabla ya kubofya"</string>
<string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
<string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"IMEWASHWA"</string>
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Ungependa kutumia <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> inahitaji:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Kwa sababu programu yako inazuia ombi la ruhusa, Mipangilio haiwezi kuthibitisha majibu yako."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Kwa sababu programu nyingine inaonyeshwa juu ya chaguo hizi, Mipangilio haiwezi kutumia hatua uliyochukua."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ukiwasha <xliff:g id="SERVICE">%1$s</xliff:g>, kifaa chako hakitatumia kufunga skrini yako ili kuboresha usimbaji wa data kwa njia fiche."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Kwa sababu umewasha huduma ya ufikiaji, kifaa chako hakitatumia kufunga skrini yako ili kuboresha usimbaji wa data kwa njia fiche."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Kwa sababu kuwasha <xliff:g id="SERVICE">%1$s</xliff:g> huathiri usimbaji wa data kwa njia fiche, unahitaji kuthibitisha mchoro wako."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Kutafuta mitandao ya simu"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> zilizopita"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Matumizi ya programu tangu ilipojaa chaji (<xliff:g id="TIME">^1</xliff:g> zilizopita)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Matumizi ya kifaa tangu kilipojaa chaji (<xliff:g id="TIME">^1</xliff:g> zilizopita)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Muda ambao skrini imekuwa ikiwaka tangu chaji ilipojaa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Matumizi ya kifaa tangu ilipojaa chaji"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Utumizi wa betri tangu kuchopolewa"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Hesabu ya matumizi ya nishati iliyopitiliza"</string>
<string name="mah" msgid="95245196971239711">"mAh <xliff:g id="NUMBER">%d</xliff:g>"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Imetumika kwa <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Matumizi ya skrini <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> imetumiwa na <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"Imetumia <xliff:g id="PERCENT">%1$s</xliff:g> ya chaji ya betri"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Uchanganuzi tangu mara ya mwisho ilipojaa chaji"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Arifa"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Mipangilio ya kina"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Arifa za kazini"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Ruhusu beji za aikoni"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Mwangaza umemeteke"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Skrini inapofungwa"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Onyesha arifa za maudhui yote"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other">Imefuta aina <xliff:g id="COUNT_1">%d</xliff:g></item>
<item quantity="one">Imefuta aina <xliff:g id="COUNT_0">%d</xliff:g></item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Beji za arifa"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Zimewashwa"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Zimezimwa"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Zuia zote"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Usionyeshe arifa hizi kamwe"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Onyesha arifa"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Usiwahi kuonyesha arifa kwenye vifaa vya kando au katika kivuli"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Ruhusu beji ya aikoni"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Batilisha hali ya \'Usinisumbue\'"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Ruhusu arifa hizi ziendelee kukatiza wakati hali ya Usinisumbue imewekwa katika Kipaumbele Pekee"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Skrini inapofungwa"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Kuboresha matumizi ya betri"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Arifa za matumizi"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Onyesha programu zote"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Ficha programu za ziada"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Onyesha matumizi ya kifaa tangu kilipojaa chaji"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Onyesha matumizi ya programu"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Haijaboreshwa"</string>
<string name="high_power_on" msgid="6216293998227583810">"Haijaboreshwa"</string>
<string name="high_power_off" msgid="3393904131961263278">"Kuboresha matumizi ya betri"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Michezo"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Programu zingine"</string>
<string name="storage_files" msgid="8581083146777364063">"Faili"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Hifadhi ya kompyuta kibao"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Hifadhi ya simu"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"kati ya <xliff:g id="TOTAL">%1$s</xliff:g> zimetumika"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"imetumika"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 4beb770..b62c408 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவையை பயன்படுத்தவா?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> செய்வது:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"அனுமதிக் கோரிக்கையைப் பயன்பாடு மறைப்பதால், அமைப்புகளால் உங்கள் பதிலைச் சரிபார்க்க முடியாது."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"இந்த விருப்பங்களின் மேலே மற்றொரு பயன்பாடு தோன்றுவதால், உங்கள் செயலுக்கு ஏற்ப அமைப்புகளால் செயல்பட முடியவில்லை."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g>ஐ இயக்கினால், தரவு மறையாக்கத்தை மேம்படுத்த சாதனம் திரைப் பூட்டைப் பயன்படுத்தாது."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"அணுகல்தன்மை சேவையை இயக்கியுள்ளதால், தரவு மறையாக்கத்தை மேம்படுத்த சாதனம் திரைப் பூட்டைப் பயன்படுத்தாது."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> சேவையை இயக்குவது தரவுக் குறியாக்கத்தைப் பாதிக்கும் என்பதால், வடிவத்தை நீங்கள் உறுதிப்படுத்த வேண்டும்."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"மொபைல் நெட்வொர்க்கை ஸ்கேன் செய்தல்"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> முன்பு"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"முழு சார்ஜ் ஆனதிலிருந்து பயன்பாட்டின் உபயோகம் (<xliff:g id="TIME">^1</xliff:g> முன்பு)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"முழு சார்ஜ் ஆனதிலிருந்து சாதனத்தின் உபயோகம் (<xliff:g id="TIME">^1</xliff:g> முன்பு)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"முழு சார்ஜ் ஆனதிலிருந்து, திரை இயக்கத்தில் இருந்த நேரம்"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"முழு சார்ஜ் ஆனதிலிருந்து சாதன உபயோகம்"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"செருகல் நீக்கப்பட்டதிலிருந்து பேட்டரியின் பயன்பாடு"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"ஆற்றல் பயன்பாடு அதிகமாகப் பயன்படுத்தப்பட்டது"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>க்குப் பயன்படுத்தியது"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"திரை உபயோகம்: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> பயன்படுத்துவது: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"ஒட்டுமொத்த பேட்டரியில் <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"கடைசியாக முழுவதும் சார்ஜ் ஆனதிலிருந்து பிரேக் டவுன்"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"அறிவிப்புகள்"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"மேம்பட்டவை"</string>
<string name="profile_section_header" msgid="2320848161066912001">"பணி அறிவிப்புகள்"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"ஐகான் பேட்ஜ்களை அனுமதி"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"ஒளியைச் சிமிட்டு"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"பூட்டுத் திரையில்"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"எல்லா அறிவிப்பு விவரத்தையும் காட்டு"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> வகைகள் நீக்கப்பட்டன</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> வகை நீக்கப்பட்டது</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"அறிவிப்பு பேட்ஜ்கள்"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"இயக்கப்பட்டுள்ளது"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"முடக்கப்பட்டுள்ளது"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"எல்லாம் தடு"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"இந்த அறிவிப்புகளை ஒருபோதும் காட்டாது"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"அறிவிப்புகளைக் காட்டு"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"ஷேட்டில் அல்லது துணைச் சாதனங்களில் அறிவிப்புகளை ஒருபோதும் காட்டாது"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"ஐகான் பேட்ஜை அனுமதிக்கவும்"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"தொந்தரவு செய்ய வேண்டாம் அமைப்பை மாற்றவும்"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"தொந்தரவு செய்ய வேண்டாம் என்பது முன்னுரிமை மட்டும் என்பதாக அமைக்கப்படும் போது இந்த அறிவிப்புகளைத் தொடர்ந்து குறுக்கிட அனுமதிக்கவும்"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"பூட்டுத் திரையில்"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"பேட்டரி மேம்படுத்தல்"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"உபயோகம் குறித்த எச்சரிக்கைகள்"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"எல்லா பயன்பாடுகளையும் காட்டு"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"கூடுதல் பயன்பாடுகளை மறை"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"சாதனத்தின் முழு உபயோகத்தைக் காட்டு"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"பயன்பாட்டின் உபயோகத்தை காட்டு"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"மேம்படுத்தப்படாதவை"</string>
<string name="high_power_on" msgid="6216293998227583810">"மேம்படுத்தப்படாதது"</string>
<string name="high_power_off" msgid="3393904131961263278">"பேட்டரி உபயோகத்தை மேம்படுத்தும்"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"கேம்கள்"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"பிற பயன்பாடுகள்"</string>
<string name="storage_files" msgid="8581083146777364063">"கோப்புகள்"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"டேப்லெட் சேமிப்பகம்"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"மொபைல் சேமிப்பகம்"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> இல் பயன்படுத்தியது:"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"உபயோகம்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index ad2adc2..2b11ad0 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఉపయోగించాలా?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ఇవి చేయాల్సి ఉంటుంది:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"అనుమతి అభ్యర్థనకు ఒక అనువర్తనం అడ్డు తగులుతున్నందున సెట్టింగ్లు మీ ప్రతిస్పందనను ధృవీకరించలేకపోయాయి."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"ఈ ఎంపికల పైన మరొక యాప్ ప్రదర్శించబడుతున్నందున, సెట్టింగ్లు మీ చర్యకు ప్రతిస్పందించడం లేదు."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"మీరు <xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్ చేస్తే, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్ను ఉపయోగించదు."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"మీరు ప్రాప్యత సేవను ఆన్ చేసినందున, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్ను ఉపయోగించదు."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్ చేయడం వలన డేటా గుప్తీకరణ ప్రభావితమవుతుంది, కనుక మీరు మీ నమూనాను నిర్ధారించడం అవసరం."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"మొబైల్ నెట్వర్క్ స్కానింగ్"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> క్రితం"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"పూర్తిగా ఛార్జ్ చేసిన (<xliff:g id="TIME">^1</xliff:g> క్రితం) తర్వాత అనువర్తన వినియోగం"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"పూర్తిగా ఛార్జ్ చేసిన (<xliff:g id="TIME">^1</xliff:g> క్రితం) తర్వాత పరికర వినియోగం"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి స్క్రీన్ ఆన్లో ఉన్న మొత్తం సమయం"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి పరికర వినియోగం"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"అన్ప్లగ్ చేసినప్పటి నుండి బ్యాటరీ వినియోగం"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"అధిక గణన విద్యుత్ శక్తి వినియోగం"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> పాటు ఉపయోగించబడింది"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"స్క్రీన్ వాడుక <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> ఉపయోగించింది"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"మొత్తం బ్యాటరీలో <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"చివరిసారి పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి వినియోగ వివరాలు"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"నోటిఫికేషన్లు"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"అధునాతనం"</string>
<string name="profile_section_header" msgid="2320848161066912001">"కార్యాలయ నోటిఫికేషన్లు"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"చిహ్నం బ్యాడ్జ్లను అనుమతించండి"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"కాంతి మిణుకుమిణుకు అనేలా ఉంచు"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"లాక్ స్క్రీన్పై"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"మొత్తం నోటిఫికేషన్ కంటెంట్ను చూపు"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> వర్గాలు తొలగించబడ్డాయి</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> వర్గం తొలగించబడింది</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"నోటిఫికేషన్ బ్యాడ్జ్లు"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"ఆన్"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"ఆఫ్"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"అన్నింటినీ బ్లాక్ చేయండి"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"ఈ నోటిఫికేషన్లను ఎప్పుడూ చూపవద్దు"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"నోటిఫికేషన్లను చూపు"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"నోటిఫికేషన్లను ఎన్నడూ షేడ్లో లేదా అనుబంధ పరికరాల్లో చూపవద్దు"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"చిహ్నం బ్యాడ్జ్ను అనుమతించండి"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"అంతరాయం వద్దుని భర్తీ చేయి"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"అంతరాయం కలిగించవద్దు లక్షణాన్ని ప్రాధాన్యత మాత్రమేకి సెట్ చేసినప్పుడు, అంతరాయం కలిగించడం కొనసాగించడానికి ఈ నోటిఫికేషన్లను అనుమతిస్తుంది"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"లాక్ స్క్రీన్పై"</string>
@@ -3094,8 +3098,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"బ్యాటరీ అనుకూలీకరణ"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"వినియోగ హెచ్చరికలు"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"అనువర్తనాలన్నీ చూపు"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"అదనపు అనువర్తనాలను దాచు"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"పూర్తి పరికర వినియోగాన్నిచూపండి"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"అనువర్తన వినియోగాన్ని చూపండి"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"అనుకూలీకరించనివి"</string>
<string name="high_power_on" msgid="6216293998227583810">"అనుకూలీకరించబడలేదు"</string>
<string name="high_power_off" msgid="3393904131961263278">"బ్యాటరీ వినియోగాన్ని అనుకూలీకరిస్తోంది"</string>
@@ -3569,8 +3573,6 @@
<string name="storage_games" msgid="7703159201697117621">"గేమ్లు"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"ఇతర అనువర్తనాలు"</string>
<string name="storage_files" msgid="8581083146777364063">"ఫైల్లు"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"టాబ్లెట్ నిల్వ"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ఫోన్ నిల్వ"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g>లో ఉపయోగించబడింది"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"ఉపయోగించబడింది"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f598aa9..2de8d9d 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -360,12 +360,12 @@
<string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"ต่อไป"</string>
<string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"ข้าม"</string>
<string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"เพิ่มลายนิ้วมือ"</string>
- <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานแท็บเล็ตนี้ได้หากแท็บเล็ตสูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
- <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานอุปกรณ์เครื่องนี้ได้หากอุปกรณ์สูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
- <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานโทรศัพท์เครื่องนี้ได้หากโทรศัพท์สูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
- <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้แท็บเล็ตนี้ได้หากแท็บเล็ตสูญหายหรือถูกขโมย"</string>
- <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้อุปกรณ์นี้ได้หากอุปกรณ์สูญหายหรือถูกขโมย"</string>
- <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"จะไม่มีการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้โทรศัพท์นี้ได้หากโทรศัพท์สูญหายหรือถูกขโมย"</string>
+ <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานแท็บเล็ตนี้ได้หากแท็บเล็ตสูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
+ <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานอุปกรณ์เครื่องนี้ได้หากอุปกรณ์สูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
+ <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้ผู้อื่นใช้งานโทรศัพท์เครื่องนี้ได้หากโทรศัพท์สูญหาย ถูกขโมย หรือถูกล้างข้อมูล"</string>
+ <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้แท็บเล็ตนี้ได้หากแท็บเล็ตสูญหายหรือถูกขโมย"</string>
+ <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้อุปกรณ์นี้ได้หากอุปกรณ์สูญหายหรือถูกขโมย"</string>
+ <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"จะไม่มีการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ คุณจะไม่สามารถป้องกันไม่ให้คนอื่นใช้โทรศัพท์นี้ได้หากโทรศัพท์สูญหายหรือถูกขโมย"</string>
<string name="skip_anyway_button_label" msgid="2323522873558834513">"ข้ามไปก่อน"</string>
<string name="go_back_button_label" msgid="4745265266186209467">"ย้อนกลับ"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"ค้นหาเซ็นเซอร์"</string>
@@ -383,7 +383,7 @@
<string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"เพียงแค่แตะเซ็นเซอร์ลายนิ้วมือเพื่อปลุกและปลดล็อกอุปกรณ์"</string>
<string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"เมื่อเห็นไอคอนนี้ คุณยังให้สิทธิ์การซื้อหรือลงชื่อเข้าใช้แอปได้อีกด้วย"</string>
<string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ข้ามการตั้งค่าลายนิ้วมือไหม"</string>
- <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"คุณได้เลือกที่จะใช้ลายนิ้วมือเป็นวิธีการหนึ่งในการปลดล็อกโทรศัพท์ หากคุณข้ามในตอนนี้ คุณจะต้องตั้งค่าคุณลักษณะนี้ในภายหลัง การตั้งค่าจะใช้เวลาราว 1 นาทีเท่านั้น"</string>
+ <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"คุณได้เลือกที่จะใช้ลายนิ้วมือเป็นวิธีการหนึ่งในการปลดล็อกโทรศัพท์ หากคุณข้ามในตอนนี้ คุณจะต้องตั้งค่าฟีเจอร์นี้ในภายหลัง การตั้งค่าจะใช้เวลาราว 1 นาทีเท่านั้น"</string>
<string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ตั้งค่าการล็อกหน้าจอ"</string>
<string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"เสร็จสิ้น"</string>
<string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"อ๊ะ นั่นไม่ใช่เซ็นเซอร์"</string>
@@ -445,9 +445,9 @@
<string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ปกป้องอุปกรณ์ของคุณ"</string>
<string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ปกป้องโทรศัพท์ของคุณ"</string>
<string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"หากต้องการเพิ่มความปลอดภัย ให้ตั้งค่าการล็อกหน้าจอสำรอง"</string>
- <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตเครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
- <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ป้องกันไม่ให้ผู้ใช้อื่นใช้อุปกรณ์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
- <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานคุณลักษณะการปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
+ <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตเครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
+ <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"ป้องกันไม่ให้ผู้ใช้อื่นใช้อุปกรณ์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
+ <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"ป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
<string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"เลือกวิธีสำรองในการล็อกหน้าจอ"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ล็อกหน้าจอ"</string>
<string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/ทันทีหลังจากเข้าสู่โหมดสลีป"</string>
@@ -483,36 +483,36 @@
<string name="unlock_disable_lock_title" msgid="1427036227416979120">"ปิดการล็อกหน้าจอ"</string>
<string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"นำการปกป้องอุปกรณ์ออกใช่ไหม"</string>
<string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"ต้องการนำการปกป้องโปรไฟล์ออกใช่ไหม"</string>
- <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ"</string>
- <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ<xliff:g id="EMPTY_LINE">
+ <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ"</string>
+ <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ<xliff:g id="EMPTY_LINE">
</xliff:g>และระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้และคุณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว\""</string>
- <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่มี PIN"</string>
- <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่มี PIN<xliff:g id="EMPTY_LINE">
+ <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มี PIN"</string>
+ <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มี PIN<xliff:g id="EMPTY_LINE">
</xliff:g>และระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้และคณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว\""</string>
- <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีรหัสผ่าน"</string>
- <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีรหัสผ่าน<xliff:g id="EMPTY_LINE">
+ <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีรหัสผ่าน"</string>
+ <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีรหัสผ่าน<xliff:g id="EMPTY_LINE">
</xliff:g>และระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้และคุณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว\""</string>
- <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีการล็อกหน้าจอ"</string>
- <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"คุณลักษณะการปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีการล็อกหน้าจอ<xliff:g id="EMPTY_LINE">
+ <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีการล็อกหน้าจอ"</string>
+ <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"ฟีเจอร์การปกป้องอุปกรณ์จะไม่ทำงานหากไม่มีการล็อกหน้าจอ<xliff:g id="EMPTY_LINE">
</xliff:g>และระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากอุปกรณ์นี้และคุณจะไม่สามารถปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือดังกล่าว\""</string>
- <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานหากไม่มี PIN"</string>
- <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ<xliff:g id="EMPTY_LINE">
+ <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มี PIN"</string>
+ <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่ป้อนรูปแบบของคุณ<xliff:g id="EMPTY_LINE">
</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์นี้ด้วย ซึ่งทำให้คุณปลดล็อกโปรไฟล์ ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือนั้นไม่ได้\""</string>
- <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานหากไม่มี PIN"</string>
- <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานถ้าไม่มี PIN<xliff:g id="EMPTY_LINE">
+ <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มี PIN"</string>
+ <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานถ้าไม่มี PIN<xliff:g id="EMPTY_LINE">
</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์นี้ด้วย ซึ่งทำให้คุณปลดล็อกโปรไฟล์ ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือนั้นไม่ได้\""</string>
- <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีรหัสผ่าน"</string>
- <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานถ้าไม่มีรหัสผ่าน<xliff:g id="EMPTY_LINE">
+ <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีรหัสผ่าน"</string>
+ <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานถ้าไม่มีรหัสผ่าน<xliff:g id="EMPTY_LINE">
</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์นี้ด้วย ซึ่งทำให้คุณปลดล็อกโปรไฟล์ ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือนั้นไม่ได้\""</string>
- <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีล็อกหน้าจอ"</string>
- <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"คุณลักษณะการปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีล็อกหน้าจอ<xliff:g id="EMPTY_LINE">
+ <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีล็อกหน้าจอ"</string>
+ <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"ฟีเจอร์การปกป้องโปรไฟล์จะไม่ทำงานหากไม่มีล็อกหน้าจอ<xliff:g id="EMPTY_LINE">
</xliff:g>ระบบจะนำลายนิ้วมือที่บันทึกไว้ออกจากโปรไฟล์ด้วย ซึ่งทำให้คุณปลดล็อกโปรไฟล์ ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอปโดยใช้ลายนิ้วมือนั้นไม่ได้\""</string>
<string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"ใช่ นำออกเลย"</string>
@@ -625,7 +625,7 @@
<string name="bluetooth_menu_advanced" msgid="8572178316357220524">"ขั้นสูง"</string>
<string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"บลูทูธขั้นสูง"</string>
<string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"เมื่อเปิดบลูทูธ อุปกรณ์ของคุณจะสื่อสารกับอุปกรณ์บลูทูธที่อยู่ใกล้ๆ ได้"</string>
- <string name="ble_scan_notify_text" msgid="1295915006005700650">"แอปและบริการของระบบจะยังสามารถตรวจหาอุปกรณ์บลูทูธได้อยู่เพื่อปรับปรุงความแม่นยำของตำแหน่ง คุณสามารถเปลี่ยนแปลงคุณลักษณะนี้ได้ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
+ <string name="ble_scan_notify_text" msgid="1295915006005700650">"แอปและบริการของระบบจะยังสามารถตรวจหาอุปกรณ์บลูทูธได้อยู่เพื่อปรับปรุงความแม่นยำของตำแหน่ง คุณสามารถเปลี่ยนแปลงฟีเจอร์นี้ได้ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
<string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"เชื่อมต่อกับ…"</string>
<string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกตัดการเชื่อมต่อจากเสียงของสื่อ"</string>
<string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกตัดการเชื่อมต่อจากเสียงแฮนด์ฟรี"</string>
@@ -673,7 +673,7 @@
<string name="android_beam_off_summary" msgid="4663095428454779138">"ปิด"</string>
<string name="android_beam_disabled_summary" msgid="1737782116894793393">"ใช้งานไม่ได้เนื่องจากปิด NFC อยู่"</string>
<string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
- <string name="android_beam_explained" msgid="1810540319385192758">"เมื่อเปิดคุณลักษณะนี้ไว้ คุณสามารถบีมเนื้อหาแอปไปยังอุปกรณ์อีกเครื่องหนึ่งที่ใช้ NFC ได้โดยถืออุปกรณ์ไว้ใกล้กัน ตัวอย่างเช่น คุณสามารถบีมหน้าเว็บ วิดีโอ YouTube รายชื่อติดต่อ และอื่นๆ \n\nเพียงนำอุปกรณ์มาชนกัน (โดยทั่วไปจะหันหลังชนกัน) แล้วแตะหน้าจอ แอปจะกำหนดเนื้อหาที่จะบีม"</string>
+ <string name="android_beam_explained" msgid="1810540319385192758">"เมื่อเปิดฟีเจอร์นี้ไว้ คุณสามารถบีมเนื้อหาแอปไปยังอุปกรณ์อีกเครื่องหนึ่งที่ใช้ NFC ได้โดยถืออุปกรณ์ไว้ใกล้กัน ตัวอย่างเช่น คุณสามารถบีมหน้าเว็บ วิดีโอ YouTube รายชื่อติดต่อ และอื่นๆ \n\nเพียงนำอุปกรณ์มาชนกัน (โดยทั่วไปจะหันหลังชนกัน) แล้วแตะหน้าจอ แอปจะกำหนดเนื้อหาที่จะบีม"</string>
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"WiFi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"เปิด WiFi"</string>
<string name="wifi_settings" msgid="29722149822540994">"WiFi"</string>
@@ -697,7 +697,7 @@
<string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"เชื่อมต่อเครือข่ายแบบเปิด"</string>
<string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"เชื่อมต่อเครือข่ายสาธารณะคุณภาพสูงโดยอัตโนมัติ"</string>
<string name="wifi_install_credentials" msgid="3551143317298272860">"ติดตั้งใบรับรอง"</string>
- <string name="wifi_scan_notify_text" msgid="5593805423071186757">"หากต้องการปรับปรุงความแม่นยำของตำแหน่ง แอปและบริการของระบบจะยังคงสามารถสแกนหาเครือข่าย Wi-Fi ได้ คุณสามารถเปลี่ยนแปลงคุณลักษณะนี้ได้ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
+ <string name="wifi_scan_notify_text" msgid="5593805423071186757">"หากต้องการปรับปรุงความแม่นยำของตำแหน่ง แอปและบริการของระบบจะยังคงสามารถสแกนหาเครือข่าย Wi-Fi ได้ คุณสามารถเปลี่ยนแปลงฟีเจอร์นี้ได้ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>"</string>
<string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"เปิดการสแกน Wi-Fi ใน<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>การตั้งค่าการสแกน<xliff:g id="LINK_END_1">LINK_END</xliff:g>เพื่อปรับปรุงความแม่นยำของตำแหน่ง"</string>
<string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"ไม่ต้องแสดงข้อความนี้อีก"</string>
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"เปิด WiFi ขณะอยู่ในโหมดสลีป"</string>
@@ -894,7 +894,7 @@
<item msgid="2339246858001475047">"2"</item>
<item msgid="6200207341126893791">"1"</item>
</string-array>
- <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"เมื่อเปิดการโทรผ่าน Wi-Fi โทรศัพท์จะสามารถวางเส้นทางสายเรียกผ่านเครือข่าย Wi-Fi หรือเครือข่ายของผู้ให้บริการของคุณได้ ทั้งนี้ขึ้นอยู่กับค่ากำหนดของคุณและสัญญาณฝั่งที่แรงกว่า โปรดสอบถามค่าธรรมเนียมและรายละเอียดอื่นๆ กับผู้ให้บริการก่อนที่จะเปิดคุณลักษณะนี้"</string>
+ <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"เมื่อเปิดการโทรผ่าน Wi-Fi โทรศัพท์จะสามารถวางเส้นทางสายเรียกผ่านเครือข่าย Wi-Fi หรือเครือข่ายของผู้ให้บริการของคุณได้ ทั้งนี้ขึ้นอยู่กับค่ากำหนดของคุณและสัญญาณฝั่งที่แรงกว่า โปรดสอบถามค่าธรรมเนียมและรายละเอียดอื่นๆ กับผู้ให้บริการก่อนที่จะเปิดฟีเจอร์นี้"</string>
<string name="emergency_address_title" msgid="3571902448699714454">"อัปเดตที่อยู่ฉุกเฉิน"</string>
<string name="emergency_address_summary" msgid="306028701568728126">"ที่อยู่ที่บริการฉุกเฉินจะใช้เป็นตำแหน่งของคุณถ้าคุณโทรหมายเลข 911 ด้วย Wi-Fi"</string>
<string name="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
@@ -976,7 +976,7 @@
<string name="auto_brightness_subtitle" msgid="6454652530864093466">"ระดับความสว่างที่ต้องการ"</string>
<string name="auto_brightness_off_summary" msgid="7629228736838155268">"ไม่ต้องปรับสำหรับแสงที่มี"</string>
<string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"การใช้งานแบตเตอรี่เพิ่มขึ้น"</string>
- <string name="auto_brightness_disclaimer" msgid="871436423746343406">"เพิ่มประสิทธิภาพระดับความสว่างสำหรับแสงที่มี เมื่อเปิดคุณลักษณะนี้ คุณจะยังปรับความสว่างชั่วคราวได้"</string>
+ <string name="auto_brightness_disclaimer" msgid="871436423746343406">"เพิ่มประสิทธิภาพระดับความสว่างสำหรับแสงที่มี เมื่อเปิดฟีเจอร์นี้ คุณจะยังปรับความสว่างชั่วคราวได้"</string>
<string name="night_display_title" msgid="2626451512200357686">"แสงตอนกลางคืน"</string>
<string name="night_display_text" msgid="1837277457033025056">"แสงตอนกลางคืนแต้มสีเหลืองอำพันบนหน้าจอ ซึ่งจะทำให้ดูหรืออ่านหน้าจอในแสงสลัวได้ง่ายขึ้น และอาจช่วยให้คุณนอนหลับได้ง่ายขึ้นด้วย"</string>
<string name="night_display_category_schedule" msgid="2044072617637348966">"กำหนดการ"</string>
@@ -1657,8 +1657,8 @@
<string name="process_service_in_use_description" msgid="8993335064403217080">"บริการ <xliff:g id="COMP_NAME">%1$s</xliff:g> ถูกใช้งานอยู่"</string>
<string name="process_provider_in_use_description" msgid="5586603325677678940">"ตัวให้บริการ <xliff:g id="COMP_NAME">%1$s</xliff:g> ถูกใช้งานอยู่"</string>
<string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"หยุดบริการของระบบหรือไม่"</string>
- <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"หากคุณหยุดบริการนี้ คุณลักษณะบางอย่างของแท็บเล็ตอาจทำงานได้ไม่ถูกต้องจนกว่าคุณจะปิดเครื่องแล้วเปิดใหม่อีกครั้ง"</string>
- <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"หากคุณหยุดบริการนี้ คุณลักษณะบางอย่างของโทรศัพท์อาจทำงานได้ไม่ถูกต้องจนกว่าคุณปิดจะเครื่องแล้วเปิดใหม่อีกครั้ง"</string>
+ <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"หากคุณหยุดบริการนี้ ฟีเจอร์บางอย่างของแท็บเล็ตอาจทำงานได้ไม่ถูกต้องจนกว่าคุณจะปิดเครื่องแล้วเปิดใหม่อีกครั้ง"</string>
+ <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"หากคุณหยุดบริการนี้ ฟีเจอร์บางอย่างของโทรศัพท์อาจทำงานได้ไม่ถูกต้องจนกว่าคุณปิดจะเครื่องแล้วเปิดใหม่อีกครั้ง"</string>
<string name="language_settings" msgid="8758655933029560944">"ภาษาและการป้อนข้อมูล"</string>
<string name="language_keyboard_settings_title" msgid="3709159207482544398">"ภาษาและการป้อนข้อมูล"</string>
<string name="input_assistance" msgid="7577795275222555487">"ความช่วยเหลือในการป้อนข้อมูล"</string>
@@ -1756,7 +1756,7 @@
<string name="accessibility_settings_title" msgid="2130492524656204459">"การตั้งค่าการเข้าถึง"</string>
<string name="accessibility_settings_summary" msgid="981260486011624939">"โปรแกรมอ่านหน้าจอ การแสดงผล ส่วนควบคุมการโต้ตอบ"</string>
<string name="vision_settings_title" msgid="4204111425716868288">"การตั้งค่าการมองเห็น"</string>
- <string name="vision_settings_description" msgid="5679491180156408260">"คุณสามารถปรับแต่งอุปกรณ์นี้ให้ตรงกับความต้องการของคุณ และเปลี่ยนคุณลักษณะการเข้าถึงเหล่านี้ได้ภายหลังในการตั้งค่า"</string>
+ <string name="vision_settings_description" msgid="5679491180156408260">"คุณสามารถปรับแต่งอุปกรณ์นี้ให้ตรงกับความต้องการของคุณ และเปลี่ยนฟีเจอร์การเข้าถึงเหล่านี้ได้ภายหลังในการตั้งค่า"</string>
<string name="screen_reader_category_title" msgid="7739154903913400641">"โปรแกรมอ่านหน้าจอ"</string>
<string name="audio_and_captions_category_title" msgid="3420727114421447524">"เสียงและข้อความบนหน้าจอ"</string>
<string name="display_category_title" msgid="685461049938269166">"การแสดงผล"</string>
@@ -1780,7 +1780,7 @@
<string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ทางลัดสำหรับการเข้าถึง"</string>
<string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"บริการทางลัด"</string>
<string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"อนุญาตจากหน้าจอล็อก"</string>
- <string name="accessibility_shortcut_description" msgid="6488524140219209763">"เมื่อทางลัดเปิดอยู่ คุณสามารถกดปุ่มปรับระดับเสียงทั้ง 2 ปุ่มไว้ 3 วินาทีเพื่อเริ่มคุณลักษณะการเข้าถึง"</string>
+ <string name="accessibility_shortcut_description" msgid="6488524140219209763">"เมื่อทางลัดเปิดอยู่ คุณสามารถกดปุ่มปรับระดับเสียงทั้ง 2 ปุ่มไว้ 3 วินาทีเพื่อเริ่มฟีเจอร์การเข้าถึง"</string>
<string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"ข้อความคอนทราสต์สูง"</string>
<string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"อัปเดตการขยายหน้าจอโดยอัตโนมัติ"</string>
<string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"อัปเดตการขยายหน้าจอเมื่อเปลี่ยนแอปพลิเคชัน"</string>
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"ใช้ <xliff:g id="SERVICE">%1$s</xliff:g> ใช่ไหม"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ต้องการที่จะ"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"เนื่องจากแอปหนึ่งได้บดบังคำขอสิทธิ์ ระบบจึงไม่สามารถยืนยันคำตอบของคุณสำหรับการตั้งค่าได้"</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"เนื่องจากมีแอปอื่นแสดงทับตัวเลือกเหล่านี้ ระบบจึงไม่สามารถตอบสนองการดำเนินการของคุณได้"</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"หากคุณเปิด <xliff:g id="SERVICE">%1$s</xliff:g> อุปกรณ์ของคุณจะไม่ใช้ล็อกหน้าจอเพื่อปรับปรุงการเข้ารหัสข้อมูล"</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"เนื่องจากคุณเปิดบริการความสามารถในการเข้าถึง อุปกรณ์ของคุณจะไม่ใช้ล็อกหน้าจอเพื่อปรับปรุงการเข้ารหัสข้อมูล"</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"คุณต้องยืนยันรูปแบบ เนื่องจากการเปิด <xliff:g id="SERVICE">%1$s</xliff:g> จะส่งผลต่อการเข้ารหัสข้อมูล"</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"การสแกนเครือข่ายมือถือ"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>ที่ผ่านมา"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"การใช้งานแอปตั้งแต่ชาร์จจนเต็ม (<xliff:g id="TIME">^1</xliff:g>ที่ผ่านมา)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"การใช้งานอุปกรณ์ครั้งล่าสุดตั้งแต่การชาร์จจนเต็ม (<xliff:g id="TIME">^1</xliff:g> ที่ผ่านมา)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"ระยะเวลาที่หน้าจอเปิดตั้งแต่ชาร์จจนเต็ม"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"การใช้งานอุปกรณ์ตั้งแต่ชาร์จจนเต็ม"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"การใช้แบตเตอรี่ตั้งแต่ถอดปลั๊ก"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"การใช้พลังงานที่คำนวณมากเกินไป"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"ใช้ไป <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"การใช้งานหน้าจอ <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ใช้ไป <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ของแบตเตอรี่ทั้งหมด"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"รายละเอียดนับตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
@@ -2223,7 +2224,7 @@
<string name="add_account_label" msgid="7811707265834013767">"เพิ่มบัญชี"</string>
<string name="managed_profile_not_available_label" msgid="852263300911325904">"โปรไฟล์งานยังไม่พร้อมใช้งาน"</string>
<string name="work_mode_label" msgid="5794470908668593961">"โหมดการทำงาน"</string>
- <string name="work_mode_summary" msgid="1620246003886940776">"อนุญาตให้โปรไฟล์งานทำงาน ซึ่งรวมถึงแอป การซิงค์ในแบ็กกราวด์ และคุณลักษณะที่เกี่ยวข้อง"</string>
+ <string name="work_mode_summary" msgid="1620246003886940776">"อนุญาตให้โปรไฟล์งานทำงาน ซึ่งรวมถึงแอป การซิงค์ในแบ็กกราวด์ และฟีเจอร์ที่เกี่ยวข้อง"</string>
<string name="remove_managed_profile_label" msgid="3856519337797285325">"นำโปรไฟล์งานออก"</string>
<string name="background_data" msgid="5779592891375473817">"ข้อมูลพื้นหลัง"</string>
<string name="background_data_summary" msgid="8328521479872763452">"แอปพลิเคชันสามารถซิงค์ ส่ง และรับข้อมูลได้ตลอดเวลา"</string>
@@ -2329,7 +2330,7 @@
<string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"เปิดใช้อินเทอร์เน็ตมือถือในเบื้องหลัง"</string>
<string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ในการจำกัดข้อมูลแบ็กกราวด์ในแอปฯ ให้ตั้งขีดจำกัดข้อมูลมือถือก่อน"</string>
<string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่"</string>
- <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"คุณลักษณะนี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยข้อมูลแบ็กกราวด์หยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน"</string>
+ <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"ฟีเจอร์นี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยข้อมูลแบ็กกราวด์หยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน"</string>
<string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"คุณสามารถจำกัดอินเทอร์เน็ตในพื้นหลังได้เมื่อคุณได้ตั้งค่าขีดจำกัดอินเทอร์เน็ตมือถือไว้เท่านั้น"</string>
<string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"เปิดซิงค์ข้อมูลอัตโนมัติหรือไม่"</string>
<string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะมีการคัดลอกไปยังแท็บเล็ตโดยอัตโนมัติ\n\nบางบัญชีอาจคัดลอกการเปลี่ยนแปลงที่คุณทำบนแท็บเล็ตไปยังเว็บโดยอัตโนมัติ นี่คือการทำงานของบัญชี Google"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"การแจ้งเตือน"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"ขั้นสูง"</string>
<string name="profile_section_header" msgid="2320848161066912001">"การแจ้งเตือนงาน"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"อนุญาตให้ใช้ป้ายไอคอน"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"ไฟกะพริบ"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"บนหน้าจอล็อก"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"แสดงเนื้อหาการแจ้งเตือนทั้งหมด"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other">ลบแล้ว <xliff:g id="COUNT_1">%d</xliff:g> หมวดหมู่</item>
<item quantity="one">ลบแล้ว <xliff:g id="COUNT_0">%d</xliff:g> หมวดหมู่</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"ป้ายการแจ้งเตือน"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"เปิด"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"ปิด"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"บล็อกทั้งหมด"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"ไม่ต้องแสดงการแจ้งเตือน"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"แสดงการแจ้งเตือน"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"ไม่ต้องแสดงการแจ้งเตือนในแว่นตาหรืออุปกรณ์ต่อพ่วง"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"อนุญาตให้ใช้ป้ายไอคอน"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ลบล้างห้ามรบกวน"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"อนุญาตให้แสดงการแจ้งเตือนต่อไปเมื่อตั้งค่าห้ามรบกวนเป็นเฉพาะเรื่องสำคัญเท่านั้น"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"บนหน้าจอล็อก"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"การเพิ่มประสิทธิภาพแบตเตอรี่"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"การแจ้งเตือนการใช้งาน"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"แสดงแอปทั้งหมด"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"ซ่อนแอปอื่นๆ"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"แสดงการใช้งานอุปกรณ์แบบเต็ม"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"แสดงการใช้งานแอป"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"ไม่ได้เพิ่มประสิทธิภาพ"</string>
<string name="high_power_on" msgid="6216293998227583810">"ไม่ได้เพิ่มประสิทธิภาพ"</string>
<string name="high_power_off" msgid="3393904131961263278">"เพิ่มประสิทธิภาพการใช้แบตเตอรี"</string>
@@ -3275,7 +3279,7 @@
<string name="condition_bg_data_title" msgid="2483860304802846542">"โปรแกรมประหยัดอินเทอร์เน็ตเปิดอยู่"</string>
<string name="condition_bg_data_summary" msgid="656957852895282228">"สามารถใช้ข้อมูลแบ็กกราวด์ผ่าน Wi-Fi ได้เท่านั้น ซึ่งอาจส่งผลกระทบต่อแอปหรือบริการบางอย่างเมื่อไม่มี Wi-Fi"</string>
<string name="condition_work_title" msgid="7293722361184366648">"โปรไฟล์งานปิดอยู่"</string>
- <string name="condition_work_summary" msgid="7543202177571590378">"ปิดใช้แอป การซิงค์ในแบ็กกราวด์ และคุณลักษณะอื่นๆ เกี่ยวกับโปรไฟล์งานของคุณอยู่"</string>
+ <string name="condition_work_summary" msgid="7543202177571590378">"ปิดใช้แอป การซิงค์ในแบ็กกราวด์ และฟีเจอร์อื่นๆ เกี่ยวกับโปรไฟล์งานของคุณอยู่"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"\"แสงตอนกลางคืน\" เปิดอยู่"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"แต้มสีเหลืองอำพันบนหน้าจอ ซึ่งอาจช่วยให้คุณนอนหลับได้ง่ายขึ้น"</string>
<string name="suggestions_title" msgid="7280792342273268377">"คำแนะนำ"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"เกม"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"แอปอื่นๆ"</string>
<string name="storage_files" msgid="8581083146777364063">"ไฟล์"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"พื้นที่จัดเก็บในแท็บเล็ต"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"พื้นที่เก็บข้อมูลโทรศัพท์"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"ที่ใช้ไปจากทั้งหมด <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"ใช้อยู่"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 311fb2b..b003a1f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Gumamit ng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"Kailangan ng <xliff:g id="SERVICE">%1$s</xliff:g> na:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Dahil pinipigilan ng isang app ang kahilingan ng pahintulot, hindi ma-verify ng Mga Setting ang iyong tugon."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Hindi makatugon ang Mga Setting sa iyong pagkilos dahil may ibang app na ipinapakita sa harap ng mga opsyong ito."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Kung io-on mo ang <xliff:g id="SERVICE">%1$s</xliff:g>, hindi gagamitin ng iyong device ang lock ng iyong screen upang pahusayin ang pag-encrypt ng data."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Dahil nag-on ka ng serbisyo sa accessibility, hindi gagamitin ng iyong device ang lock ng iyong screen upang pahusayin ang pag-encrypt ng data."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Dahil nakakaapekto ang pag-o-on ng <xliff:g id="SERVICE">%1$s</xliff:g> sa pag-encrypt ng data, kailangan mong kumpirmahin ang iyong pattern."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Pag-scan ng mobile network"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> na ang nakalipas"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Paggamit ng app mula noong napuno ang baterya (<xliff:g id="TIME">^1</xliff:g> na ang nakalipas)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Paggamit ng device mula noong napuno ang baterya (<xliff:g id="TIME">^1</xliff:g> na ang nakalipas)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Haba ng oras na naka-on ang screen mula noong napuno ang baterya"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Paggamit ng device mula noong napuno ang baterya"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Paggamit ng baterya mula nang hindi nakasaksak"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Sobrang nakalkulang paggamit ng power"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> (na) mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Ginamit nang <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Paggamit ng screen <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ang ginagamit ng <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ng kabuuang baterya"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown mula noong huling napuno ang baterya"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Mga Notification"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Mga notification sa trabaho"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Payagan ang mga badge ng icon"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Patay-sinding ilaw"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Sa lock screen"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ipakita ang lahat ng content ng notification"</string>
@@ -2852,14 +2854,16 @@
<item quantity="one">Na-delete ang <xliff:g id="COUNT_1">%d</xliff:g> kategorya</item>
<item quantity="other">Na-delete ang <xliff:g id="COUNT_1">%d</xliff:g> na kategorya</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Mga notification badge"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Naka-on"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Naka-off"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"I-block lahat"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Huwag kailanman ipakita ang mga notification na ito"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Magpakita ng mga notification"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Huwag kailanman magpakita ng mga notification sa shade o sa mga peripheral na device"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Payagan ang badge ng icon"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"I-override ang Huwag Istorbohin"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Pahintulutan ang mga notification na ito na lumabas kapag nakatakda sa Priyoridad Lang ang Huwag Istorbohin"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Sa lock screen"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Pag-optimize ng baterya"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Mga alerto sa paggamit"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Ipakita ang lahat ng app"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Itago ang mga karagdagang app"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Ipakita ang kumpletong paggamit ng device"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Ipakita ang paggamit ng app"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Hindi naka-optimize"</string>
<string name="high_power_on" msgid="6216293998227583810">"Hindi naka-optimize"</string>
<string name="high_power_off" msgid="3393904131961263278">"Pag-optimize sa paggamit ng baterya"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Mga Laro"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Iba pang mga app"</string>
<string name="storage_files" msgid="8581083146777364063">"Mga File"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Storage ng tablet"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Storage ng telepono"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Nagamit sa <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"nagamit"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 25e11f3..c8e65e8 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> kullanılsın mı?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> şunları gerektiriyor:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Bir uygulama bir izin isteğinin anlaşılmasını engellediğinden, Ayarlar, yanıtınızı doğrulayamıyor."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Bu seçeneklerin üstünde başka bir uygulama görüntülendiğinden Ayarlar, işleminize yanıt veremiyor."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini açarsanız cihazınız veri şifrelemeyi geliştirmek için ekran kilidinizi kullanmaz."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Bir erişilebilirlik hizmetini açtığınız için cihazınız veri şifrelemeyi geliştirmek üzere ekran kilidinizi kullanmayacak."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> hizmetini etkinleştirmek veri şifrelemesini etkileyeceğinden deseninizi doğrulamanız gerekmektedir."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Mobil ağ tarama"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> önce"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Tam şarj sonrası uygulama kullanımı (<xliff:g id="TIME">^1</xliff:g> önce)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Tam şarjdan sonra (<xliff:g id="TIME">^1</xliff:g> önce) cihaz kullanımı"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tam şarjdan sonra ekranın açık olduğu süre"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Tam şarj sonrası cihaz kullanımı"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Fişten çekildikten sonra pil kullanımı"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Fazla hesaplanan güç kullanımı"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> süreyle kullanıldı"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Ekran kullanım süresi: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> kadarı <xliff:g id="APP">%2$s</xliff:g> tarafından kullanılıyor"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"Toplam pilin <xliff:g id="PERCENT">%1$s</xliff:g> kadarı"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Son tam şarj sonrası kullanım dökümü"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Bildirimler"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Gelişmiş"</string>
<string name="profile_section_header" msgid="2320848161066912001">"İş bildirimleri"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Simge rozetlerine izin ver"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Işığı yakıp söndür"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Kilit ekranında"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bildirim içeriğinin tamamını göster"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategori silindi</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kategori silindi</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Bildirim rozetleri"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Açık"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Kapalı"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Tümünü engelle"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Bu bildirimleri hiçbir zaman gösterme"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Bildirim göster"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Bildirimleri hiçbir zaman gölgede veya çevre birimi cihazlarında gösterme"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Resim rozete izin ver"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Rahatsız Etmeyin ayarını geçersiz kıl"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Rahatsız Etmeyin seçeneği \"Yalnızca Öncelikli\" olarak ayarlıyken, bu bildirimlerin kesmeye devam etmesine izin ver"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Kilit ekranında"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Pil optimizasyonu"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Kullanım uyarıları"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Tüm uygulamaları göster"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Ekstra uygulamaları gizle"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Tam cihaz kullanımını göster"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Uygulama kullanımını göster"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Optimize edilmeyenler"</string>
<string name="high_power_on" msgid="6216293998227583810">"Optimize edilmedi"</string>
<string name="high_power_off" msgid="3393904131961263278">"Pil kullanımı optimize ediliyor"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Oyunlar"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Diğer uygulamalar"</string>
<string name="storage_files" msgid="8581083146777364063">"Dosyalar"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tablet depolama alanı"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefon depolama alanı"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Toplam <xliff:g id="TOTAL">%1$s</xliff:g> alanın kullanılan kısmı"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"kullanılan"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fbcc3b8..414d989 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1894,7 +1894,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Використовувати <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"Службі <xliff:g id="SERVICE">%1$s</xliff:g> потрібно:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Вашу відповідь не видно в Налаштуваннях, оскільки інший додаток загороджує запит на дозвіл."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Оскільки поверх цих опцій відображається інший додаток, налаштування не можуть реагувати на ваші дії."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Якщо ви ввімкнете службу <xliff:g id="SERVICE">%1$s</xliff:g>, дані на пристрої не захищатимуться екраном блокування."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Оскільки ви ввімкнули службу доступності, дані на пристрої не захищатимуться екраном блокування."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Оскільки ввімкнення служби <xliff:g id="SERVICE">%1$s</xliff:g> впливає на шифрування даних, потрібно підтвердити ключ."</string>
@@ -1956,6 +1955,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Сканування мобільної мережі"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> тому"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Використання додатками після повного заряджання (<xliff:g id="TIME">^1</xliff:g> тому)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Використання пристрою від повного заряду акумулятора (<xliff:g id="TIME">^1</xliff:g> тому)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Час з увімкненим екраном після повного заряджання"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Викор. пристроєм після повного заряджання"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Споживання акумулятора з часу відключення"</string>
@@ -2047,6 +2047,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Переоцінене енергоспоживання"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА/год"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Час використання: <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Використання екрана: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> заряду використовує додаток <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> усього заряду"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Використання після повного заряджання"</string>
@@ -2831,7 +2832,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Сповіщення"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Розширені налаштування"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Робочі сповіщення"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Показувати значки сповіщень"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Блимання"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"На заблокованому екрані"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показувати весь вміст сповіщень"</string>
@@ -2912,14 +2914,16 @@
<item quantity="many">Видалено <xliff:g id="COUNT_1">%d</xliff:g> категорій</item>
<item quantity="other">Видалено <xliff:g id="COUNT_1">%d</xliff:g> категорії</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Значки сповіщень"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Увімкнено"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Вимкнено"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Блокувати всі"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Ніколи не показувати ці сповіщення"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Показувати сповіщення"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Ніколи не показувати сповіщення на панелі та периферійних пристроях"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Дозволити значок"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Заміна режиму \"Не турбувати\""</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Показувати ці сповіщення, коли в режимі \"Не турбувати\" вибрано \"Лише пріоритетні\""</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На заблокованому екрані"</string>
@@ -3164,8 +3168,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Оптимізація акумулятора"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Сповіщення про використання"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Показати всі додатки"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Сховати зайві додатки"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Показати повне використання пристрою"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Показати використання додатка"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Додатки без оптимізації"</string>
<string name="high_power_on" msgid="6216293998227583810">"Не оптимізовано"</string>
<string name="high_power_off" msgid="3393904131961263278">"Використання акумулятора оптимізується"</string>
@@ -3669,8 +3673,6 @@
<string name="storage_games" msgid="7703159201697117621">"Ігри"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Інші додатки"</string>
<string name="storage_files" msgid="8581083146777364063">"Файли"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Пам’ять планшета"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Пам’ять телефона"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Використовується з <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"зайнято"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index d1fc04c..00f6337 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> کا استعمال کریں؟"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> کو ضرورت ہے:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"چونکہ ایک ایپ اجازت کی درخواست کو مبہم کر رہی ہے، لہذا ترتیبات آپ کے جواب کی توثیق نہیں کر سکتی ہے۔"</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"کیونکہ ایک اور ایپ ان اختیارات میں سے سب سے اوپر ڈسپلے ہو رہی ہے، ترتیبات آپ کی کارروائی کا جواب نہیں دے سکتی۔"</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"اگر آپ <xliff:g id="SERVICE">%1$s</xliff:g> کو آن کرتے ہیں تو آپ کا آلہ ڈیٹا کی مرموزکاری کو بڑھانے کیلئے آپ کی اسکرین کا قفل استعمال نہیں کرے گا۔"</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"چونکہ آپ نے ایکسیسبیلٹی کی ایک سروس کو آن کیا ہے لہذا آپ کا آلہ ڈیٹا کی مرموزکاری کو بڑھانے کیلئے آپ کی اسکرین کا قفل استعمال نہیں کرے گا۔"</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"کیونکہ <xliff:g id="SERVICE">%1$s</xliff:g> کو آن کرنے سے ڈیٹا کی مرموز کاری پر اثر پڑتا ہے، آپ کو اپنے پیٹرن کی توثیق کرنے کی ضرورت ہے۔"</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"موبائل نیٹ ورک اسکیننگ"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> قبل"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"مکمل چارج کے بعد سے ایپ کا استعمال (<xliff:g id="TIME">^1</xliff:g> قبل)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"مکمل چارج کے بعد سے آلہ کا استعمال (<xliff:g id="TIME">^1</xliff:g> قبل)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"مکمل چارج کے بعد سے اسکرین آن ہونے کے وقت کی مقدار"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"مکمل چارج کے بعد سے آلہ کا استعمال"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"پلگ ہٹانے کے بعد سے بیٹری کا استعمال"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"پاور کا ضرورت سے زیادہ استعمال"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> کیلئے استعمال کیا گیا"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"اسکرین کا استعمال <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> کے ذریعے <xliff:g id="PERCENT">%1$s</xliff:g> استعمال کیا گیا"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"مجموعی بیٹری میں سے <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"پچھلے مکمل چارج کے بعد سے تجزیہ"</string>
@@ -2775,7 +2776,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"اطلاعات"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"جدید ترین"</string>
<string name="profile_section_header" msgid="2320848161066912001">"دفتری اطلاعات"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"آئیکن بیجز کی اجازت دیں"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"بلنک لائٹ"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"قفل اسکرین پر"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"سبھی اطلاعی مواد دکھائیں"</string>
@@ -2850,14 +2852,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> زمرے حذف کئے گئے</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> زمرہ حذف کیا گیا</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"اطلاعی بَیجز"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"آن"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"آف"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"سبھی کو مسدود کریں"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"یہ اطلاعات کبھی مت دکھائیں"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"اطلاعات دکھائیں"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"شیڈ میں یا پیریفرل آلات پر کبھی بھی اطلاعات نہ دکھائیں"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"آئیکن بیج کی اجازت دیں"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ڈسٹرب نہ کریں کو اوور رائیڈ کریں"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"جب \'ڈسٹرب نہ کریں\' صرف ترجیح پر سیٹ ہو تو ان اطلاعات کو مداخلت کرنے دیں"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"قفل اسکرین پر"</string>
@@ -3090,8 +3094,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"بیٹری بہترین بنانا"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"استعمال سے متعلق الرٹس"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"سبھی ایپس دکھائیں"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"اضافی ایپس چھپائیں"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"آلہ کا مکمل استعمال دکھائیں"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"ایپ کا استعمال دکھائیں"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"بہترین بنائی گئی نہیں ہیں"</string>
<string name="high_power_on" msgid="6216293998227583810">"بہترین بنائی گئی نہیں ہیں"</string>
<string name="high_power_off" msgid="3393904131961263278">"بیٹری استعمال کو بہترین بنا رہی ہے"</string>
@@ -3565,8 +3569,6 @@
<string name="storage_games" msgid="7703159201697117621">"گیمز"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"دیگر ایپس"</string>
<string name="storage_files" msgid="8581083146777364063">"فائلز"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ٹیبلیٹ اسٹوریج"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"فون اسٹوریج"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> میں سے استعمال ہو گئی"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"مستعمل"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index ae073d7..f88d1c0 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> yoqilsinmi?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Ilova ruxsatnoma so‘roviga xalaqit qilayotgani tufayli, “Sozlamalar” ilovasi javobingizni tekshira olmaydi."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Chunki boshqa ilova bu parametrlar ustidan ko‘rsatilmoqda, Sozlamalar amallaringizga javob bera olmaydi."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Agar <xliff:g id="SERVICE">%1$s</xliff:g> xizmatini yoqsangiz, qurilmangiz ma’lumotlarni shifrlashni kuchaytirish uchun ekran qulfidan foydalanmaydi."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Maxsus imkoniyatlar xizmati yoqilganligi tufayli qurilmangiz ma’lumotlarni shifrlashni kuchaytirish uchun ekran qulfidan foydalanmaydi."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"“<xliff:g id="SERVICE">%1$s</xliff:g>” xizmatini yoqish ma’lumotlarni shifrlashga ta’sir qilgani bois chizmali parolingizni tasdiqlashingiz lozim."</string>
@@ -1918,6 +1917,9 @@
<!-- String.format failed for translation -->
<!-- no translation found for power_usage_list_summary (6775339745194635000) -->
<skip />
+ <!-- String.format failed for translation -->
+ <!-- no translation found for power_usage_list_summary_device (7036566616386864302) -->
+ <skip />
<string name="screen_usage_summary" msgid="6687403051423153550">"To‘liq quvvat olganidan beri ekran yoniq turgan vaqt miqdori"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"To‘liq quvvat olganidan beri qurilmaning quvvat sarfi"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Quvvat manbaidan uzilganidan keyin sarflangan batareya quvvati"</string>
@@ -2009,6 +2011,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Orttirib hisoblangan quvvat sarfi"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mA/s"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Ishlatilgan vaqti: <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Ekrandan foydalanish: <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> – <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> batareya quvvati"</string>
<!-- String.format failed for translation -->
@@ -2787,7 +2790,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Bildirishnomalar"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Kengaytirilgan sozlamalar"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Ishga oid bildirishnomalar"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Nishonchalarga ruxsat berish"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Indikator"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Qulflangan ekranda"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bildirishnomalar to‘liq chiqsin"</string>
@@ -2862,14 +2866,16 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ta turkum o‘chirib tashlandi</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ta turkum o‘chirib tashlandi</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Bildirishnoma nishonchalari"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Yoniq"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"O‘chiq"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Hammasini bloklash"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Bu bildirishnomalar boshqa ko‘rsatilmasin"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Bildirishnomalar ko‘rsatilsin"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Fonda yoki tashqi qurilmalarda bildirishnomalar hech qachon ko‘rsatilmasin"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Nishonchaga ruxsat berish"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Bezovta qilinmasin rejimi ustidan yozish"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Bezovta qilinmasin rejimida faqat muhim bildirishnomalarga ruxsat berilgan bo‘lsa, ushbu bildirishnomalarga ham ruxsat beriladi"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Qulflangan ekranda"</string>
@@ -3102,8 +3108,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Batareya quvvatini tejash"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Ogohlantirishlar"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Barcha ilovalarni ko‘rsatish"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Qo‘shimcha ilovalarni berkitish"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Butun qurilmaning quvvat sarfi"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Ilovalardan foydalanish"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Quvvat tejamaydi"</string>
<string name="high_power_on" msgid="6216293998227583810">"Quvvat tejamaydi"</string>
<string name="high_power_off" msgid="3393904131961263278">"Batareya cheklovi o‘rnatilgan"</string>
@@ -3577,8 +3583,6 @@
<string name="storage_games" msgid="7703159201697117621">"O‘yinlar"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Boshqa ilovalar"</string>
<string name="storage_files" msgid="8581083146777364063">"Fayllar"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Planshet xotirasi"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefon xotirasi"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Jami: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"band"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a120fce..812ca8a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Sử dụng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> cần:"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Vì ứng dụng đang che khuất yêu cầu cấp quyền, Cài đặt không thể xác minh câu trả lời của bạn."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Do một ứng dụng khác đang hiển thị ở phía trên các tùy chọn này nên Cài đặt không thể phản hồi với tác vụ của bạn."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Nếu bạn bật <xliff:g id="SERVICE">%1$s</xliff:g>, thiết bị của bạn sẽ không sử dụng khóa màn hình để cải tiến việc mã hóa dữ liệu."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Vì bạn đã bật dịch vụ trợ năng, thiết bị của bạn sẽ không sử dụng khóa màn hình để cải tiến việc mã hóa dữ liệu."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Vì bật <xliff:g id="SERVICE">%1$s</xliff:g> ảnh hưởng đến mã hóa dữ liệu, bạn cần phải xác nhận hình của mình."</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Quét mạng di động"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"cách đây <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Mức sử dụng ứng dụng kể từ khi sạc đầy (cách đây <xliff:g id="TIME">^1</xliff:g>)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Sử dụng thiết bị kể từ khi sạc đầy (<xliff:g id="TIME">^1</xliff:g> trước)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Lượng thời gian sử dụng màn hình kể từ khi sạc đầy"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Mức sử dụng thiết bị kể từ lần sạc đầy"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Sử dụng pin từ khi tháo đầu cắm"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Sử dụng nguồn vượt mức"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Được sử dụng cho <xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Thời gian sử dụng màn hình <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> được sử dụng bởi <xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> trong tổng số thời lượng pin"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Chi tiết từ lần sạc đầy gần đây nhất"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Thông báo"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Nâng cao"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Thông báo công việc"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Cho phép huy hiệu biểu tượng"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Đèn nhấp nháy"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Trên màn hình khóa"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Hiển thị tất cả nội dung thông báo"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other">Đã xóa <xliff:g id="COUNT_1">%d</xliff:g> danh mục</item>
<item quantity="one">Đã xóa <xliff:g id="COUNT_0">%d</xliff:g> danh mục</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Huy hiệu thông báo"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Bật"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Tắt"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Chặn tất cả"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Không bao giờ hiển thị các thông báo này"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Hiển thị thông báo"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Không bao giờ hiển thị thông báo trong ngăn thông báo hoặc trên thiết bị ngoại vi"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Cho phép huy hiệu biểu tượng"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ghi đè Không làm phiền"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Cho phép các thông báo này tiếp tục làm gián đoạn khi tính năng Không làm phiền được đặt thành Chỉ ưu tiên."</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Trên màn hình khóa"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Tối ưu hóa pin"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Thông báo về mức sử dụng"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Hiển thị tất cả các ứng dụng"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Ẩn ứng dụng bổ sung"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Hiển thị dữ liệu sử dụng thiết bị đầy đủ"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Hiển thị dữ liệu sử dụng ứng dụng"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Không được tối ưu hóa"</string>
<string name="high_power_on" msgid="6216293998227583810">"Không được tối ưu hóa"</string>
<string name="high_power_off" msgid="3393904131961263278">"Tối ưu hóa mức sử dụng pin"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"Trò chơi"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Ứng dụng khác"</string>
<string name="storage_files" msgid="8581083146777364063">"Tệp"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Bộ nhớ máy tính bảng"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Bộ nhớ điện thoại"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Đã sử dụng <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"đã dùng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1dbf691..4cbb7e6 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"要启用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>需要："</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"由于某个应用遮挡了权限请求界面，因此“设置”应用无法验证您的回应。"</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"由于另一个应用目前正显示在这些选项上，“设置”无法回应您的操作。"</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您开启<xliff:g id="SERVICE">%1$s</xliff:g>，您的设备将无法使用屏幕锁定来增强数据加密。"</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"由于您已开启无障碍服务，因此您的设备将无法使用屏幕锁定来增强数据加密。"</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"由于开启<xliff:g id="SERVICE">%1$s</xliff:g>会影响数据加密，因此您需要确认您的解锁图案。"</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"移动网络扫描"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>前"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"充满电（<xliff:g id="TIME">^1</xliff:g>前）后的应用用电量"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"充满电（<xliff:g id="TIME">^1</xliff:g>前）后的设备用电量"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"充满电后的屏幕使用时间"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"充满电后的设备用电量"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"拔下电源后的电量消耗情况"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"多算了的用电量"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>毫安时"</string>
<string name="battery_used_for" msgid="2690821851327075443">"使用时间：<xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"屏幕使用时间：<xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用电量占 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"整体用电量的 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"自上次充满电后的用电明细"</string>
@@ -2777,7 +2778,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"通知"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"高级"</string>
<string name="profile_section_header" msgid="2320848161066912001">"工作通知"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"允许在图标上显示标记"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"闪烁指示灯"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"屏幕锁定时"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"显示所有通知内容"</string>
@@ -2852,14 +2854,16 @@
<item quantity="other">已删除 <xliff:g id="COUNT_1">%d</xliff:g> 个类别</item>
<item quantity="one">已删除 <xliff:g id="COUNT_0">%d</xliff:g> 个类别</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"通知标记"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"开启"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"关闭"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"全部屏蔽"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"一律不显示这类通知"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"显示通知"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"一律不在通知栏或外围设备上显示通知"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"允许在图标上显示标记"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"覆盖“勿扰”设置"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"当勿扰模式设为“仅限优先事项”时，允许继续接收这类通知"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"屏幕锁定时"</string>
@@ -3092,8 +3096,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"电池优化"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"电池用量提醒"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"显示所有应用"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"隐藏其他应用"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"显示完整的设备用电量"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"显示应用使用情况"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"未优化"</string>
<string name="high_power_on" msgid="6216293998227583810">"未优化"</string>
<string name="high_power_off" msgid="3393904131961263278">"优化电池使用"</string>
@@ -3567,8 +3571,6 @@
<string name="storage_games" msgid="7703159201697117621">"游戏"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"其他应用"</string>
<string name="storage_files" msgid="8581083146777364063">"文件"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"平板电脑存储空间"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"手机存储空间使用情况"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"（总共 <xliff:g id="TOTAL">%1$s</xliff:g>）"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"已使用"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index f511e6a..52a5d15 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1855,7 +1855,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"「<xliff:g id="SERVICE">%1$s</xliff:g>」需要："</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"由於有應用程式阻礙權限請求，「設定」無法驗證您的回覆。"</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"由於另一個應用程式正在這些選項上顯示內容，因此「設定」無法回應您的操作。"</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您開啟<xliff:g id="SERVICE">%1$s</xliff:g>，您的裝置將不能透過螢幕鎖定加強資料加密。"</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"因為您已開啟無障礙功能，您的裝置將不能透過螢幕鎖定加強資料加密。"</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響您的資料加密強度，因此您需要確認解鎖圖案。"</string>
@@ -1915,6 +1914,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"流動網絡掃瞄"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>前"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"充滿電後的應用程式用量 (<xliff:g id="TIME">^1</xliff:g>前)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"充滿電 (<xliff:g id="TIME">^1</xliff:g>前) 後的裝置用電量"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"充滿電後的螢幕開啟時間"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"充滿電後的裝置用量"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"拔除插頭後的電池使用狀況"</string>
@@ -2006,6 +2006,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"計算過高的用電量"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"螢幕使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用量佔 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"整體電量的 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"上次充滿電後的詳細用量"</string>
@@ -2780,7 +2781,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"通知"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"進階"</string>
<string name="profile_section_header" msgid="2320848161066912001">"工作通知"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"允許使用圖示標籤"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"閃燈"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"螢幕鎖定畫面上"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
@@ -2855,14 +2857,16 @@
<item quantity="other">已刪除 <xliff:g id="COUNT_1">%d</xliff:g> 個類別</item>
<item quantity="one">已刪除 <xliff:g id="COUNT_0">%d</xliff:g> 個類別</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"通知標誌"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"開啟"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"關閉"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"永不顯示這些通知"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"顯示通知"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"永不在通知欄或周邊裝置上顯示通知"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"允許顯示狀態標籤圖示"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"取代「請勿騷擾」"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"當「請勿騷擾」設定為「只限優先」時，允許顯示這些通知"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"螢幕鎖定畫面上"</string>
@@ -3095,8 +3099,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"電池優化"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"用量警示"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"顯示所有應用程式"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"隱藏其他應用程式"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"顯示完整的裝置用電量"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"顯示應用程式使用情況"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"尚未優化"</string>
<string name="high_power_on" msgid="6216293998227583810">"尚未優化"</string>
<string name="high_power_off" msgid="3393904131961263278">"正在優化電池使用"</string>
@@ -3570,8 +3574,6 @@
<string name="storage_games" msgid="7703159201697117621">"遊戲"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"其他應用程式"</string>
<string name="storage_files" msgid="8581083146777364063">"檔案"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"平板電腦的儲存空間"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"手機儲存空間"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"使用量：<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"已使用"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d4e5657..f02563e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1854,7 +1854,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"「<xliff:g id="SERVICE">%1$s</xliff:g>」需要執行下列動作："</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"權限要求遭到其他應用程式畫面遮掩，因此「設定」無法驗證你的回應。"</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"另一個應用程式目前顯示在畫面上層，覆蓋了這些選項，因此「設定」應用程式無法回應你的動作。"</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果你開啟 <xliff:g id="SERVICE">%1$s</xliff:g>，你的裝置將無法使用螢幕鎖定加強資料加密。"</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"你已開啟協助工具服務，因此你的裝置無法使用螢幕鎖定加強資料加密。"</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密，因此你必須畫出解鎖圖案。"</string>
@@ -1914,6 +1913,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"行動網路掃描作業"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>之前"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"充飽電 (<xliff:g id="TIME">^1</xliff:g>之前) 後的應用程式用電量"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"充飽電 (<xliff:g id="TIME">^1</xliff:g>之前) 後的裝置用電量"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"充飽後的螢幕點亮時間"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"充飽後的裝置用量"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"拔除插頭後的電池使用狀況"</string>
@@ -2005,6 +2005,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"估計過高的用電量"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"螢幕使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用量佔 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"整體電量的 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"上次充飽後的詳細用量資訊"</string>
@@ -2760,7 +2761,7 @@
<string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"設定「零打擾」規則"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"在特定時間禁用音效和震動"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"僅限優先通知"</string>
- <string name="zen_mode_option_alarms" msgid="5785372117288803600">"僅允許鬧鐘"</string>
+ <string name="zen_mode_option_alarms" msgid="5785372117288803600">"僅限鬧鐘"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"完全靜音"</string>
<string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>：<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"封鎖視覺干擾"</string>
@@ -2781,7 +2782,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"通知"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"進階"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Work 通知"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"允許使用圖示徽章"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"閃爍燈光"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"螢幕鎖定時"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
@@ -2856,14 +2858,16 @@
<item quantity="other">已刪除 <xliff:g id="COUNT_1">%d</xliff:g> 個類別</item>
<item quantity="one">已刪除 <xliff:g id="COUNT_0">%d</xliff:g> 個類別</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"通知狀態標籤"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"開啟"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"關閉"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"一律不顯示這類通知"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"顯示通知"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"一律不在通知欄或週邊裝置上顯示通知"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"允許加上狀態標籤圖示"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"覆寫「零打擾」模式設定"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"當「零打擾」模式設定為「僅限優先通知」時，允許這些通知繼續干擾"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"螢幕鎖定時"</string>
@@ -3096,8 +3100,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"電池效能最佳化"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"電池用量警示"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"顯示所有應用程式"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"隱藏其他應用程式"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"顯示完整的裝置用電量"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"應用程式使用情況"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"未套用最佳化設定"</string>
<string name="high_power_on" msgid="6216293998227583810">"未套用最佳化設定"</string>
<string name="high_power_off" msgid="3393904131961263278">"採用電池效能最佳化設定"</string>
@@ -3571,8 +3575,6 @@
<string name="storage_games" msgid="7703159201697117621">"遊戲"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"其他應用程式"</string>
<string name="storage_files" msgid="8581083146777364063">"檔案"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"平板電腦儲存空間"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"手機儲存空間"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"總儲存空間：<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"已使用"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index f37f407..4d2304b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1855,7 +1855,6 @@
<string name="enable_service_title" msgid="3061307612673835592">"Sebenzisa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> idinga :"</string>
<string name="touch_filtered_warning" msgid="8644034725268915030">"Ngoba uhlelo lokusebenza lusitha isicelo semvume, Izilungiselelo azikwazi ukuqinisekisa impendulo yakho."</string>
- <string name="window_obscured_warning" msgid="8711643931674708175">"Ngoba olunye uhlelo libonisa phezulu kwalezi zinketho, izilungiselelo azikwazi ukuphendula esenzweni sakho."</string>
<string name="enable_service_encryption_warning" msgid="3064686622453974606">"Uma uvula i-<xliff:g id="SERVICE">%1$s</xliff:g>, idivayisi yakho ngeke isebenzise ukukhiya kwakho kwesikrini sakho ukuthuthukisa ukubethelwa kwedatha."</string>
<string name="secure_lock_encryption_warning" msgid="460911459695077779">"Ngoba uvule isevisi yokufinyelela, idivayisi yakho ngeke isebenzise ukukhiya kwakho kwesikrini ukuthuthukisa ukubethelwa kwedatha."</string>
<string name="enable_service_pattern_reason" msgid="777577618063306751">"Ngoba ukuvula i-<xliff:g id="SERVICE">%1$s</xliff:g> kuthinta ukubethelwa kwedatha, udinga ukuqinisekisa iphethini yakho."</string>
@@ -1915,6 +1914,7 @@
<string name="device_cellular_network" msgid="4724773411762382950">"Ukuskena kwenethiwekhi yeselula"</string>
<string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> okwedlule"</string>
<string name="power_usage_list_summary" msgid="6775339745194635000">"Ukusebenza kohlelo lokusebenza kusuka ekushajeni okuphelele (<xliff:g id="TIME">^1</xliff:g> okwedlule)"</string>
+ <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Ukusetshenziswa kwedivayisi kusukela ngemuva kokushajwa kugcwale (<xliff:g id="TIME">^1</xliff:g> edlule)"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Inani lesikhathi isikrini sivuliwe kusuka ekushijeni okuphelele"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Ukusebenza kwedivayisi kusuka ekushajeni okuphelele"</string>
<string name="battery_since_unplugged" msgid="338073389740738437">"Ukusebenzisa ibhethri kusukela inqamuliwe"</string>
@@ -2006,6 +2006,7 @@
<string name="battery_desc_overcounted" msgid="5481865509489228603">"Ukusetshenziswa kwamandla okubalwe ngaphezulu"</string>
<string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
<string name="battery_used_for" msgid="2690821851327075443">"Kusetshenziswe nge-<xliff:g id="TIME">^1</xliff:g>"</string>
+ <string name="battery_screen_usage" msgid="6537658662149713585">"Ukusetshenziswa kwesikrini <xliff:g id="TIME">^1</xliff:g>"</string>
<string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> kusetshenziswe yi-<xliff:g id="APP">%2$s</xliff:g>"</string>
<string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kwalo lonke ibhethri"</string>
<string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ukwaphuka kusuka ekushajeni okuphelele"</string>
@@ -2778,7 +2779,8 @@
<string name="configure_notification_settings" msgid="7616737397127242615">"Izaziso"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Okuthuthukisiwe"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Izaziso zomsebenzi"</string>
- <string name="notification_badging_title" msgid="5125022693565388760">"Vumela amabheji esithonjana"</string>
+ <!-- no translation found for notification_badging_title (5938709971403474078) -->
+ <skip />
<string name="notification_pulse_title" msgid="1905382958860387030">"Cwabizisa ukukhanya"</string>
<string name="lock_screen_notifications_title" msgid="6173076173408887213">"Ekukhiyeni kwesikrini"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bonisa konke okuqukethwe kwesaziso"</string>
@@ -2853,14 +2855,16 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> izigaba zisusiwe</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> izigaba zisusiwe</item>
</plurals>
- <string name="notification_badges" msgid="4468378071033143539">"Amabheji esaziso"</string>
<string name="notification_toggle_on" msgid="650145396718191048">"Vuliwe"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Kuvaliwe"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Vimbela konke"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"Ungalokothi ubonise lezi zaziso"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Bonisa izaziso"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Ungalokothi ubonise izaziso kumthunzi noma kumadivayisi alawulwa ikhompuyutha"</string>
- <string name="notification_badge_title" msgid="7734903868300369178">"Vumela ibheji lesithonjana"</string>
+ <!-- no translation found for notification_badge_title (6370122441168519809) -->
+ <skip />
+ <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
+ <skip />
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Bhala ngaphezulu okuthi ungaphazamisi"</string>
<string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Vumela lezi zaziso ziqhubeke nokuphazamisa uma okuthi ungaphazamisi kusethelwe okuphezulu kuphela"</string>
<string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Ekukhiyeni kwesikrini"</string>
@@ -3093,8 +3097,8 @@
<string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
<string name="high_power_apps" msgid="3459065925679828230">"Ukulungiselelwa kwebhethri"</string>
<string name="additional_battery_info" msgid="4754099329165411970">"Izexwayiso zokusetshenziswa"</string>
- <string name="show_all_apps" msgid="1742726460081356745">"Bonisa zonke izinhlelo zokusebenza"</string>
- <string name="hide_extra_apps" msgid="5568177134273528751">"Fihla izinhlelo zokusebenza ezingeziwe"</string>
+ <string name="show_all_apps" msgid="1512506948197818534">"Bonisa ukusetshenziswa kwedivayisi okugcwele"</string>
+ <string name="hide_extra_apps" msgid="5016497281322459633">"Bonisa ukusetshenziswa kohlelo lokusebenza"</string>
<string name="high_power_filter_on" msgid="3222265297576680099">"Akulungiselelwe"</string>
<string name="high_power_on" msgid="6216293998227583810">"Akulungiselelwe"</string>
<string name="high_power_off" msgid="3393904131961263278">"Ilungiselela ukusetshenziswa kwebhethri"</string>
@@ -3568,8 +3572,6 @@
<string name="storage_games" msgid="7703159201697117621">"Amageyimu"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"Ezinye izinhlelo zokusebenza"</string>
<string name="storage_files" msgid="8581083146777364063">"Amafayela"</string>
- <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Isitoreji sethebulethi"</string>
- <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Isitoreji sefoni"</string>
<string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
<string name="storage_volume_total" msgid="3499221850532701342">"Kusetshenziswe okungu-<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"okusetshenzisiwe"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 4a09594..ef85925 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -104,9 +104,6 @@
<color name="status_bar_color">#3c3c3c</color>
- <!-- Color for the background of the donut graph.-->
- <color name="donut_background_grey">#ffd7d7d7</color>
-
<!-- Color for the background of the shortcut icons.-->
<color name="shortcut_background">#fff5f5f5</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6495ab0..2c7a2e8 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -140,6 +140,12 @@
<dimen name="search_suggestion_item_image_margin_start">32dp</dimen>
<dimen name="search_suggestion_item_image_margin_end">32dp</dimen>
+ <!-- The following two margins need to match, with the caveat that
+ the second should be negative. The second one ensures that the icons and text
+ align despite the additional padding caused by the search bar's card background. -->
+ <dimen name="search_bar_margin">8dp</dimen>
+ <dimen name="search_bar_negative_margin">-8dp</dimen>
+
<!-- Dimensions for Wifi Assistant Card -->
<dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
<dimen name="wifi_assistant_padding_start_end">16dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dc7e567..e234892 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3611,8 +3611,6 @@
<!-- Text for filter option in ManageApps screen to display list of
packages installed on sdcard. -->
<string name="filter_apps_onsdcard" product="default">On SD card</string>
- <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
- <string name="disabled">Disabled</string>
<!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. -->
<string name="not_installed">Not installed for this user</string>
<!-- [CHAR LIMIT=30] App details, text telling an application is installed. -->
@@ -4307,11 +4305,6 @@
can't verify user consent. [CHAR LIMIT=NONE] -->
<string name="touch_filtered_warning">Because an app is obscuring a permission request, Settings
can’t verify your response.</string>
- <!-- Warning shown when user input has been blocked due to another app overlaying screen
- content. Since we don't know what the app is showing on top of the input target, we
- can't verify user consent. [CHAR LIMIT=NONE] -->
- <string name="window_obscured_warning">Because another app is displaying on top of these options,
- Settings can\u2019t respond to your action.</string>
<!-- Warning that the device data will not be encrypted with password or PIN if
enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
<string name="enable_service_encryption_warning">If you turn on <xliff:g id="service"
@@ -4486,6 +4479,8 @@
<string name="power_last_full_charge_summary"><xliff:g id="time">^1</xliff:g> ago</string>
<!-- Label for list of apps using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->
<string name="power_usage_list_summary">App usage since full charge (<xliff:g id="time">^1</xliff:g> ago)</string>
+ <!-- Label for device components using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->
+ <string name="power_usage_list_summary_device">Device usage since full charge (<xliff:g id="time">^1</xliff:g> ago)</string>
<!-- Description for the screen usage item [CHAR_LIMIT=120] -->
<string name="screen_usage_summary">Amount of time screen has been on since full charge</string>
<!-- Label for list of different types using battery in power use UI [CHAR_LIMIT=60] -->
@@ -6517,8 +6512,8 @@
<!-- Configure Notifications: Work profile section header [CHAR LIMIT=30] -->
<string name="profile_section_header">Work notifications</string>
- <!-- Configure Notifications: Title for the notification badging option. [CHAR LIMIT=30] -->
- <string name="notification_badging_title">Allow icon badges</string>
+ <!-- Configure Notifications: Title for the notification badging option. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=5125022693565388760] -->
+ <string name="notification_badging_title">Allow notification dots</string>
<!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->
<string name="notification_pulse_title">Blink light</string>
@@ -6753,9 +6748,6 @@
<item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> categories deleted</item>
</plurals>
- <!-- [CHAR LIMIT=45\ Global notification badge setting -->
- <string name="notification_badges">Notification badges</string>
-
<!-- [CHAR LIMIT=NONE] App notification settings: notifications enabled-->
<string name="notification_toggle_on">On</string>
@@ -6774,8 +6766,11 @@
<!-- [CHAR LIMIT=NONE] Channel notification settings: Block option description-->
<string name="notification_content_block_summary">Never show notifications in the shade or on peripheral devices</string>
- <!-- [CHAR LIMIT=NONE] [BACKUP_MESSAGE_ID:7166470350070693657] Channel notification settings: Badging option title -->
- <string name="notification_badge_title">Allow icon badge</string>
+ <!-- [CHAR LIMIT=NONE BACKUP_MESSAGE_ID:7166470350070693657] App notification settings: Badging option title -->
+ <string name="notification_badge_title">Allow notification dot</string>
+
+ <!-- [CHAR LIMIT=NONE BACKUP_MESSAGE_ID:7166470350070693657] Channel notification settings: Badging option title -->
+ <string name="notification_channel_badge_title">Show notification dot</string>
<!-- [CHAR LIMIT=NONE] App notification settings: Override DND option title -->
<string name="app_notification_override_dnd_title">Override Do Not Disturb</string>
@@ -7399,11 +7394,11 @@
<!-- Label for menu to launch a screen showing usage alerts for battery [CHAR LIMIT=30] -->
<string name="additional_battery_info">Usage alerts</string>
- <!-- Label for menu to show all apps in battery settings [CHAR LIMIT=30] -->
- <string name="show_all_apps">Show all apps</string>
+ <!-- Label for menu to show battery usage in the device [CHAR LIMIT=45] -->
+ <string name="show_all_apps">Show full device usage</string>
- <!-- Label for menu to hide extra apps in battery settings [CHAR LIMIT=30] -->
- <string name="hide_extra_apps">Hide extra apps</string>
+ <!-- Label for menu to show app usage [CHAR LIMIT=30] -->
+ <string name="hide_extra_apps">Show app usage</string>
<!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
<string name="high_power_filter_on">Not optimized</string>
@@ -7676,8 +7671,6 @@
<!-- Summary of app not allowed to display over other apps [CHAR LIMIT=60] -->
<string name="system_alert_window_off">No</string>
- <!-- Title for settings screen for controlling apps that can install other apps on device [CHAR LIMIT=50] -->
- <string name="install_other_apps">Install unknown apps</string>
<!-- Keywords for setting screen for controlling apps that can install other apps on device -->
<string name="keywords_install_other_apps">install apps unknown sources</string>
@@ -7707,10 +7700,6 @@
<string name="write_settings_on">Yes</string>
<!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
<string name="write_settings_off">No</string>
- <!-- Summary of app trusted to install apps [CHAR LIMIT=45] -->
- <string name="external_source_trusted">Allowed</string>
- <!-- Summary of app not trusted to install apps [CHAR LIMIT=45] -->
- <string name="external_source_untrusted">Not allowed</string>
<!-- Title of switch preference that controls whether an external app source is trusted or not [CHAR LIMIT=50] -->
<string name="external_source_switch_title">Allow from this source</string>
@@ -8690,4 +8679,8 @@
<!-- Title for the installed app info storage page. The total storage space taken up by this app. [CHAR LIMIT=40]-->
<string name="app_info_storage_title">Space used</string>
+ <!-- The divider symbol between different parts of the notification header including spaces. not translatable [CHAR LIMIT=3] -->
+ <string name="notification_header_divider_symbol_with_spaces" translatable="false">" • "</string>
+
+
</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 3dbaa8b..8d1320b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -165,6 +165,12 @@
<item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.SubSettings</item>
</style>
+ <!-- Variant of the settings theme with no action bar. -->
+ <style name="Theme.Settings.NoActionBar">
+ <item name="android:windowActionBar">false</item>
+ <item name="android:windowNoTitle">true</item>
+ </style>
+
<style name="Theme.ProvisioningActivity" parent="@android:style/Theme.Translucent.NoTitleBar">
<item name="android:windowAnimationStyle">@null</item>
<item name="android:windowIsTranslucent">true</item>
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 1720c73..52f6793 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -22,6 +22,6 @@
<DropDownPreference
android:key="turn_on_automatically"
android:title="@string/battery_saver_turn_on_automatically_title"
- android:summary="%s" />
+ android:summary="@string/summary_placeholder" />
</PreferenceScreen>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 0089ed7..a60276c 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -423,6 +423,11 @@
android:title="@string/show_all_anrs"
android:summary="@string/show_all_anrs_summary"/>
+ <SwitchPreference
+ android:key="show_notification_channel_warnings"
+ android:title="@string/show_notification_channel_warnings"
+ android:summary="@string/show_notification_channel_warnings_summary"/>
+
<Preference
android:key="inactive_apps"
android:title="@string/inactive_apps_title"
diff --git a/res/xml/encryption_and_credential.xml b/res/xml/encryption_and_credential.xml
index a84c2a1..be643b1 100644
--- a/res/xml/encryption_and_credential.xml
+++ b/res/xml/encryption_and_credential.xml
@@ -15,7 +15,8 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/encryption_and_credential_settings_title">
+ android:title="@string/encryption_and_credential_settings_title"
+ android:key="encryption_and_credentials_screen">
<PreferenceCategory android:key="credentials_management"
android:title="@string/credentials_title"
diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml
index 45c784e..2d07fa2 100644
--- a/res/xml/enterprise_privacy_settings.xml
+++ b/res/xml/enterprise_privacy_settings.xml
@@ -45,7 +45,8 @@
android:selectable="false"/>
</PreferenceCategory>
- <PreferenceCategory android:title="@string/enterprise_privacy_exposure_changes_category">
+ <PreferenceCategory android:title="@string/enterprise_privacy_exposure_changes_category"
+ android:key="exposure_changes_category">
<Preference android:fragment="com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages"
android:key="number_enterprise_installed_packages"
android:title="@string/enterprise_privacy_enterprise_installed_packages"/>
diff --git a/res/xml/location_scanning.xml b/res/xml/location_scanning.xml
index f82500b..5e7bd24 100644
--- a/res/xml/location_scanning.xml
+++ b/res/xml/location_scanning.xml
@@ -15,7 +15,8 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/location_scanning_screen_title">
+ android:title="@string/location_scanning_screen_title"
+ android:key="scanning_screen">
<SwitchPreference
android:title="@string/location_scanning_wifi_always_scanning_title"
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index e063d13..77063bd 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -24,7 +24,7 @@
android:key="location_mode"
android:title="@string/location_mode_title"
settings:keywords="@string/keywords_location_mode"
- android:summary="@string/location_mode_location_off_title" />
+ android:summary="@string/summary_placeholder" />
<!-- This preference category gets removed if there is no managed profile -->
<com.android.settingslib.RestrictedSwitchPreference
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index 2a4416e..d10440e 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -15,21 +15,32 @@
-->
<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/lockscreen_settings_title">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/lockscreen_settings_title">
+
+ <com.android.settings.notification.RestrictedDropDownPreference
+ android:key="security_setting_lock_screen_notif"
+ android:title="@string/lock_screen_notifications_title"
+ android:summary="@string/summary_placeholder" />
+
+ <com.android.settingslib.RestrictedSwitchPreference
+ android:key="add_users_when_locked"
+ android:title="@string/user_add_on_lockscreen_menu" />
+
+ <com.android.settingslib.RestrictedPreference
+ android:key="owner_info_settings"
+ android:title="@string/owner_info_settings_title"
+ android:summary="@string/owner_info_settings_summary" />
+
+ <PreferenceCategory
+ android:key="security_setting_lock_screen_notif_work_header"
+ android:title="@string/profile_section_header">
<com.android.settings.notification.RestrictedDropDownPreference
- android:key="lock_screen_notifications"
+ android:key="security_setting_lock_screen_notif_work"
android:title="@string/lock_screen_notifications_title"
- android:summary="@string/summary_placeholder"/>
+ android:summary="@string/summary_placeholder" />
- <com.android.settingslib.RestrictedSwitchPreference
- android:key="add_users_when_locked"
- android:title="@string/user_add_on_lockscreen_menu"/>
-
- <com.android.settingslib.RestrictedPreference
- android:key="owner_info_settings"
- android:title="@string/owner_info_settings_title"
- android:summary="@string/owner_info_settings_summary"/>
+ </PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index d288a9d..33c1b0a 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -124,7 +124,7 @@
<DropDownPreference
android:key="dock_audio_media"
android:title="@string/dock_audio_media_title"
- android:summary="%s" />
+ android:summary="@string/summary_placeholder" />
<!-- Boot sounds -->
<SwitchPreference
@@ -135,7 +135,7 @@
<DropDownPreference
android:key="emergency_tone"
android:title="@string/emergency_tone_title"
- android:summary="%s" />
+ android:summary="@string/summary_placeholder" />
<com.android.settingslib.RestrictedPreference
android:key="cell_broadcast_settings"
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 22a4747..a936a50 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -15,7 +15,7 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto">
+ xmlns:settings="http://schemas.android.com/apk/res-auto">
<SwitchPreference
android:key="usb_tether_settings"
@@ -23,7 +23,8 @@
<SwitchPreference
android:key="enable_wifi_ap"
- android:title="@string/wifi_tether_checkbox_text" />
+ android:title="@string/wifi_tether_checkbox_text"
+ android:summary="@string/summary_two_lines_placeholder" />
<Preference
android:key="wifi_ap_ssid_and_security"
@@ -34,9 +35,9 @@
android:key="enable_bluetooth_tethering"
android:title="@string/bluetooth_tether_checkbox_text" />
- <com.android.settings.DividerPreference
- android:key="disabled_on_data_saver"
- android:summary="@string/tether_settings_disabled_on_data_saver"
- android:selectable="false"
- settings:allowDividerAbove="true" />
+ <Preference
+ android:key="disabled_on_data_saver"
+ android:summary="@string/tether_settings_disabled_on_data_saver"
+ android:selectable="false"
+ settings:allowDividerAbove="true" />
</PreferenceScreen>
diff --git a/res/xml/upgraded_channel_notification_settings.xml b/res/xml/upgraded_channel_notification_settings.xml
index 4cf171f..7925bb7 100644
--- a/res/xml/upgraded_channel_notification_settings.xml
+++ b/res/xml/upgraded_channel_notification_settings.xml
@@ -40,7 +40,7 @@
<!-- Show badge -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="badge"
- android:title="@string/notification_badge_title"
+ android:title="@string/notification_channel_badge_title"
settings:useAdditionalSummary="true"
settings:restrictedSwitchSummary="@string/enabled_by_admin" />
diff --git a/res/xml/wifi_network_details_fragment.xml b/res/xml/wifi_network_details_fragment.xml
index 5d5958d..f9926ca 100644
--- a/res/xml/wifi_network_details_fragment.xml
+++ b/res/xml/wifi_network_details_fragment.xml
@@ -29,7 +29,7 @@
<!-- Buttons -->
<com.android.settings.applications.LayoutPreference
android:key="buttons"
- android:layout="@layout/two_buttons_panel"
+ android:layout="@layout/wifi_network_details_two_buttons_panel"
android:selectable="false" />
<com.android.settings.wifi.WifiDetailPreference
@@ -82,8 +82,12 @@
<!-- IPv6 Details -->
<PreferenceCategory
- android:key="ipv6_details_category"
+ android:key="ipv6_category"
android:title="@string/wifi_details_ipv6_address_header"
- android:selectable="false"/>
+ android:selectable="false">
+ <Preference
+ android:key="ipv6_addresses"
+ android:selectable="false"/>
+ </PreferenceCategory>
</PreferenceScreen>
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index 3bb82cf..5978f5e 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -40,6 +40,7 @@
import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
+import android.os.IBinder;
import android.os.RemoteCallback;
import android.os.RemoteException;
import android.os.UserHandle;
@@ -65,8 +66,6 @@
import com.android.settings.users.UserDialogs;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.SecureTouchListener;
-
import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
@@ -92,6 +91,7 @@
public static final String EXTRA_CALLED_FROM_SUPPORT_DIALOG =
"android.app.extra.CALLED_FROM_SUPPORT_DIALOG";
+ private final IBinder mToken = new Binder();
Handler mHandler;
DevicePolicyManager mDPM;
@@ -120,8 +120,6 @@
boolean mWaitingForRemoveMsg;
boolean mAddingProfileOwner;
boolean mAdminPoliciesInitialized;
- int mCurSysAppOpMode;
- int mCurToastAppOpMode;
boolean mIsCalledFromSupportDialog = false;
@@ -352,10 +350,11 @@
final View restrictedAction = findViewById(R.id.restricted_action);
restrictedAction.setFilterTouchesWhenObscured(true);
- restrictedAction.setOnTouchListener(
- new SecureTouchListener(getString(R.string.window_obscured_warning)));
restrictedAction.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
+ if (!mActionButton.isEnabled()) {
+ return;
+ }
if (mAdding) {
addAndFinish();
} else if (isManagedProfile(mDeviceAdmin)
@@ -477,24 +476,21 @@
@Override
protected void onResume() {
super.onResume();
+ mActionButton.setEnabled(true);
updateInterface();
- // As long as we are running, don't let this admin overlay stuff on top of the screen.
- final int uid = mDeviceAdmin.getActivityInfo().applicationInfo.uid;
- final String pkg = mDeviceAdmin.getActivityInfo().applicationInfo.packageName;
- mCurSysAppOpMode = mAppOps.checkOp(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg);
- mCurToastAppOpMode = mAppOps.checkOp(AppOpsManager.OP_TOAST_WINDOW, uid, pkg);
- mAppOps.setMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg, AppOpsManager.MODE_IGNORED);
- mAppOps.setMode(AppOpsManager.OP_TOAST_WINDOW, uid, pkg, AppOpsManager.MODE_IGNORED);
+ // As long as we are running, don't let anyone overlay stuff on top of the screen.
+ mAppOps.setUserRestriction(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, true, mToken);
+ mAppOps.setUserRestriction(AppOpsManager.OP_TOAST_WINDOW, true, mToken);
+
}
@Override
protected void onPause() {
super.onPause();
- // As long as we are running, don't let this admin overlay stuff on top of the screen.
- final int uid = mDeviceAdmin.getActivityInfo().applicationInfo.uid;
- final String pkg = mDeviceAdmin.getActivityInfo().applicationInfo.packageName;
- mAppOps.setMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg, mCurSysAppOpMode);
- mAppOps.setMode(AppOpsManager.OP_TOAST_WINDOW, uid, pkg, mCurToastAppOpMode);
+ // This just greys out the button. The actual listener is attached to R.id.restricted_action
+ mActionButton.setEnabled(false);
+ mAppOps.setUserRestriction(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, false, mToken);
+ mAppOps.setUserRestriction(AppOpsManager.OP_TOAST_WINDOW, false, mToken);
try {
ActivityManager.getService().resumeAppSwitches();
} catch (RemoteException e) {
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 9a149c3..678a63b 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -102,6 +102,8 @@
private static final String KEY_UNIFICATION = "unification";
@VisibleForTesting
static final String KEY_LOCKSCREEN_PREFERENCES = "lockscreen_preferences";
+ private static final String KEY_ENCRYPTION_AND_CREDENTIALS = "encryption_and_credential";
+ private static final String KEY_LOCATION_SCANNING = "location_scanning";
private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
private static final int CHANGE_TRUST_AGENT_SETTINGS = 126;
@@ -930,7 +932,7 @@
@Override
public List<String> getNonIndexableKeys(Context context) {
- final List<String> keys = new ArrayList<String>();
+ final List<String> keys = super.getNonIndexableKeys(context);
LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
@@ -952,6 +954,14 @@
keys.add(KEY_ENTERPRISE_PRIVACY);
}
+ // Duplicate in special app access
+ keys.add(KEY_MANAGE_DEVICE_ADMIN);
+ // Duplicates between parent-child
+ keys.add((new LocationPreferenceController(context)).getPreferenceKey());
+ keys.add(KEY_ENCRYPTION_AND_CREDENTIALS);
+ keys.add(KEY_SCREEN_PINNING);
+ keys.add(KEY_LOCATION_SCANNING);
+
return keys;
}
}
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 3e45af7..9956f71 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -50,6 +50,7 @@
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
+import android.widget.Toolbar;
import com.android.internal.util.ArrayUtils;
import com.android.settings.Settings.WifiSettingsActivity;
@@ -62,6 +63,7 @@
import com.android.settings.development.DevelopmentSettings;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.DynamicIndexableContentMonitor;
+import com.android.settings.search2.SearchActivity;
import com.android.settings.search2.SearchFeatureProvider;
import com.android.settings.wfd.WifiDisplaySettings;
import com.android.settings.widget.SwitchBar;
@@ -75,7 +77,7 @@
public class SettingsActivity extends SettingsDrawerActivity
implements PreferenceManager.OnPreferenceTreeClickListener,
PreferenceFragment.OnPreferenceStartFragmentCallback,
- ButtonBarHandler, FragmentManager.OnBackStackChangedListener {
+ ButtonBarHandler, FragmentManager.OnBackStackChangedListener, OnClickListener {
private static final String LOG_TAG = "Settings";
@@ -345,6 +347,14 @@
launchSettingFragment(initialFragmentName, isSubSettings, intent);
}
+ if (mIsShowingDashboard) {
+ findViewById(R.id.search_bar).setVisibility(View.VISIBLE);
+ findViewById(R.id.action_bar).setVisibility(View.GONE);
+ Toolbar toolbar = findViewById(R.id.search_action_bar);
+ toolbar.setOnClickListener(this);
+ setActionBar(toolbar);
+ }
+
mActionBar = getActionBar();
if (mActionBar != null) {
mActionBar.setDisplayHomeAsUpEnabled(mDisplayHomeAsUpEnabled);
@@ -432,10 +442,10 @@
switchToFragment(initialFragmentName, initialArguments, true, false,
mInitialTitleResId, mInitialTitle, false);
} else {
- // No UP affordance if we are displaying the main Dashboard
- mDisplayHomeAsUpEnabled = false;
- // Show Search affordance
- mDisplaySearch = true;
+ // Show search icon as up affordance if we are displaying the main Dashboard
+ mDisplayHomeAsUpEnabled = true;
+ // toolbar is search affordance so don't show search
+ mDisplaySearch = false;
mInitialTitleResId = R.string.dashboard_title;
switchToFragment(DashboardSummary.class.getName(), null /* args */, false, false,
@@ -842,8 +852,7 @@
// Enable/disable backup settings depending on whether the user is admin.
setTileEnabled(new ComponentName(packageName,
- BackupSettingsActivity.class.getName()), true,
- isAdmin || Utils.isCarrierDemoUser(this));
+ BackupSettingsActivity.class.getName()), true, isAdmin);
setTileEnabled(new ComponentName(packageName,
Settings.WifiDisplaySettingsActivity.class.getName()),
@@ -940,4 +949,10 @@
return bitmap;
}
-}
\ No newline at end of file
+
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(this, SearchActivity.class);
+ startActivity(intent);
+ }
+}
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 761e8cf..b4ca6a6 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -26,6 +26,7 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
import android.support.annotation.XmlRes;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
@@ -423,11 +424,28 @@
return -1;
}
- protected void removePreference(String key) {
- Preference pref = findPreference(key);
- if (pref != null) {
- getPreferenceScreen().removePreference(pref);
+ protected boolean removePreference(String key) {
+ return removePreference(getPreferenceScreen(), key);
+ }
+
+ @VisibleForTesting
+ boolean removePreference(PreferenceGroup group, String key) {
+ final int preferenceCount = group.getPreferenceCount();
+ for (int i = 0; i < preferenceCount; i++) {
+ final Preference preference = group.getPreference(i);
+ final String curKey = preference.getKey();
+
+ if (TextUtils.equals(curKey, key)) {
+ return group.removePreference(preference);
+ }
+
+ if (preference instanceof PreferenceGroup) {
+ if (removePreference((PreferenceGroup) preference, key)) {
+ return true;
+ }
+ }
}
+ return false;
}
/**
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 5d797a7..9475f45 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -37,7 +37,6 @@
import android.os.UserManager;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 0142ea2..8a77fea 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -25,6 +25,7 @@
import android.app.ActivityManager;
import android.app.AlertDialog;
import android.app.AppGlobals;
+import android.app.AppOpsManager;
import android.app.Dialog;
import android.app.Fragment;
import android.app.IActivityManager;
@@ -602,7 +603,8 @@
}
/**
- * Returns the managed profile of the current user or null if none found.
+ * Returns the managed profile of the current user or {@code null} if none is found or a profile
+ * exists but it is disabled.
*/
public static UserHandle getManagedProfile(UserManager userManager) {
List<UserHandle> userProfiles = userManager.getUserProfiles();
@@ -621,6 +623,29 @@
}
/**
+ * Returns the managed profile of the current user or {@code null} if none is found. Unlike
+ * {@link #getManagedProfile} this method returns enabled and disabled managed profiles.
+ */
+ public static UserHandle getManagedProfileWithDisabled(UserManager userManager) {
+ // TODO: Call getManagedProfileId from here once Robolectric supports
+ // API level 24 and UserManager.getProfileIdsWithDisabled can be Mocked (to avoid having
+ // yet another implementation that loops over user profiles in this method). In the meantime
+ // we need to use UserManager.getProfiles that is available on API 23 (the one currently
+ // used for Settings Robolectric tests).
+ final int myUserId = UserHandle.myUserId();
+ List<UserInfo> profiles = userManager.getProfiles(myUserId);
+ final int count = profiles.size();
+ for (int i = 0; i < count; i++) {
+ final UserInfo profile = profiles.get(i);
+ if (profile.isManagedProfile()
+ && profile.getUserHandle().getIdentifier() != myUserId) {
+ return profile.getUserHandle();
+ }
+ }
+ return null;
+ }
+
+ /**
* Retrieves the id for the given user's managed profile.
*
* @return the managed profile id or UserHandle.USER_NULL if there is none.
@@ -1272,6 +1297,22 @@
return info.enabled ? R.string.installed : R.string.disabled;
}
+ /**
+ * Control if other apps can display overlays. By default this is allowed. Be sure to
+ * re-enable overlays, as the effect is system-wide.
+ */
+ public static void setOverlayAllowed(Context context, IBinder token, boolean allowed) {
+ AppOpsManager appOpsManager = context.getSystemService(AppOpsManager.class);
+ if (appOpsManager != null) {
+ appOpsManager.setUserRestriction(AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
+ !allowed, token);
+ appOpsManager.setUserRestriction(AppOpsManager.OP_TOAST_WINDOW,
+ !allowed, token);
+ }
+ }
+
+
+
private static boolean isVolumeValid(VolumeInfo volume) {
return (volume != null) && (volume.getType() == VolumeInfo.TYPE_PRIVATE)
&& volume.isMountedReadable();
diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
index e0c58db..e0d2c69 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -48,14 +48,14 @@
.setTitle(parentActivity.getString(R.string.enable_service_title,
getServiceName(parentActivity, info)))
.setView(createEnableDialogContentView(parentActivity, info))
- .setCancelable(true)
.setPositiveButton(android.R.string.ok, listener)
.setNegativeButton(android.R.string.cancel, listener)
.create();
final View.OnTouchListener filterTouchListener = (View v, MotionEvent event) -> {
// Filter obscured touches by consuming them.
- if ((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED) != 0) {
+ if (((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_OBSCURED) != 0)
+ || ((event.getFlags() & MotionEvent.FLAG_WINDOW_IS_PARTIALLY_OBSCURED) != 0)) {
if (event.getAction() == MotionEvent.ACTION_UP) {
Toast.makeText(v.getContext(), R.string.touch_filtered_warning,
Toast.LENGTH_SHORT).show();
@@ -67,6 +67,8 @@
ad.create();
ad.getButton(AlertDialog.BUTTON_POSITIVE).setOnTouchListener(filterTouchListener);
+ ad.setCanceledOnTouchOutside(true);
+
return ad;
}
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index d7749ea..38e6b0f 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -17,25 +17,24 @@
import static android.content.DialogInterface.BUTTON_POSITIVE;
+import static com.android.settings.Utils.setOverlayAllowed;
+
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Activity;
-import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.Fragment;
import android.content.ComponentName;
import android.content.DialogInterface;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageParser;
+import android.os.Binder;
import android.os.Bundle;
+import android.os.IBinder;
import android.os.UserHandle;
import android.provider.Settings;
-import android.support.v7.preference.Preference;
import android.text.TextUtils;
import android.view.accessibility.AccessibilityManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.DialogCreatable;
import com.android.settings.applications.defaultapps.DefaultAppInfo;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -118,6 +117,7 @@
implements DialogInterface.OnClickListener {
private static final String EXTRA_KEY = "extra_key";
private static final String TAG = "ConfirmationDialogFragment";
+ private IBinder mToken;
public static ConfirmationDialogFragment newInstance(ShortcutServicePickerFragment parent,
String key) {
@@ -126,6 +126,7 @@
argument.putString(EXTRA_KEY, key);
fragment.setArguments(argument);
fragment.setTargetFragment(parent, 0);
+ fragment.mToken = new Binder();
return fragment;
}
@@ -147,6 +148,22 @@
}
@Override
+ public void onResume() {
+ super.onResume();
+ if (mToken != null) {
+ setOverlayAllowed(getActivity(), mToken, false);
+ }
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ if (mToken != null) {
+ setOverlayAllowed(getActivity(), mToken, true);
+ }
+ }
+
+ @Override
public void onClick(DialogInterface dialog, int which) {
final Fragment fragment = getTargetFragment();
if ((which == BUTTON_POSITIVE) && (fragment instanceof DefaultAppPickerFragment)) {
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 9c01a5f..da4bdcf 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -16,34 +16,30 @@
package com.android.settings.accessibility;
+import static com.android.settings.Utils.setOverlayAllowed;
+
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
-import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ResolveInfo;
import android.net.Uri;
+import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
+import android.os.IBinder;
import android.os.UserHandle;
import android.os.storage.StorageManager;
import android.provider.Settings;
import android.text.TextUtils;
-import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
import android.view.accessibility.AccessibilityManager;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
@@ -77,6 +73,8 @@
private int mShownDialogId;
+ private final IBinder mToken = new Binder();
+
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCESSIBILITY_SERVICE;
@@ -107,12 +105,18 @@
public void onResume() {
mSettingsContentObserver.register(getContentResolver());
updateSwitchBarToggleSwitch();
+ if (mToken != null) {
+ setOverlayAllowed(getActivity(), mToken, false);
+ }
super.onResume();
}
@Override
public void onPause() {
mSettingsContentObserver.unregister(getContentResolver());
+ if (mToken != null) {
+ setOverlayAllowed(getActivity(), mToken, true);
+ }
super.onPause();
}
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index 6ed2c34..4820161 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -299,6 +299,11 @@
final ProfileData data = mProfiles.get(userInfo.id);
if (data != null) {
data.pendingRemoval = false;
+ if (userInfo.isEnabled()) {
+ // recreate the authentication helper to refresh the list of enabled accounts
+ data.authenticatorHelper =
+ new AuthenticatorHelper(mContext, userInfo.getUserHandle(), this);
+ }
return;
}
final Context context = mContext;
diff --git a/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java b/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java
index 1d08968..acf43aa 100644
--- a/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java
+++ b/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java
@@ -27,7 +27,7 @@
public AutoSyncWorkDataPreferenceController(Context context, Fragment parent) {
super(context, parent);
- mUserHandle = Utils.getManagedProfile(mUserManager);
+ mUserHandle = Utils.getManagedProfileWithDisabled(mUserManager);
}
@Override
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index b86f2f4..a93bfbd 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -42,6 +42,7 @@
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -62,6 +63,7 @@
protected EnforcedAdmin mAppsControlDisallowedAdmin;
protected boolean mAppsControlDisallowedBySystem;
+ protected ApplicationFeatureProvider mApplicationFeatureProvider;
protected ApplicationsState mState;
protected ApplicationsState.Session mSession;
protected ApplicationsState.AppEntry mAppEntry;
@@ -84,13 +86,14 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mFinishing = false;
-
- mState = ApplicationsState.getInstance(getActivity().getApplication());
+ final Activity activity = getActivity();
+ mApplicationFeatureProvider = FeatureFactory.getFactory(activity)
+ .getApplicationFeatureProvider(activity);
+ mState = ApplicationsState.getInstance(activity.getApplication());
mSession = mState.newSession(this);
- Context context = getActivity();
- mDpm = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
- mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
- mPm = context.getPackageManager();
+ mDpm = (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+ mUserManager = (UserManager) activity.getSystemService(Context.USER_SERVICE);
+ mPm = activity.getPackageManager();
IBinder b = ServiceManager.getService(Context.USB_SERVICE);
mUsbManager = IUsbManager.Stub.asInterface(b);
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 5ad5e48..e21ab7e 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -543,8 +543,8 @@
mClearCacheButton.setEnabled(false);
} else {
long codeSize = result.getCodeBytes();
- long dataSize = result.getDataBytes();
long cacheSize = result.getCacheBytes();
+ long dataSize = result.getDataBytes() - cacheSize;
if (dataSize <= 0 || !mCanClearData || mDataCleared) {
mClearDataButton.setEnabled(false);
diff --git a/src/com/android/settings/applications/AppStorageSizesController.java b/src/com/android/settings/applications/AppStorageSizesController.java
index 45ece6e..3626fab 100644
--- a/src/com/android/settings/applications/AppStorageSizesController.java
+++ b/src/com/android/settings/applications/AppStorageSizesController.java
@@ -70,7 +70,8 @@
mTotalSize.setSummary(errorRes);
} else {
long codeSize = mLastResult.getCodeBytes();
- long dataSize = mDataCleared ? 0 : mLastResult.getDataBytes();
+ long dataSize =
+ mDataCleared ? 0 : mLastResult.getDataBytes() - mLastResult.getCacheBytes();
if (mLastCodeSize != codeSize) {
mLastCodeSize = codeSize;
mAppSize.setSummary(getSizeStr(context, codeSize));
diff --git a/src/com/android/settings/applications/ApplicationFeatureProvider.java b/src/com/android/settings/applications/ApplicationFeatureProvider.java
index 3266fe0..27cac64 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProvider.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProvider.java
@@ -24,6 +24,7 @@
import com.android.settings.applications.instantapps.InstantAppButtonsController;
import java.util.List;
+import java.util.Set;
public interface ApplicationFeatureProvider {
@@ -94,6 +95,11 @@
List<UserAppInfo> findPersistentPreferredActivities(@UserIdInt int userId, Intent[] intents);
/**
+ * Returns a list of package names that should be kept enabled.
+ */
+ Set<String> getKeepEnabledPackages();
+
+ /**
* Callback that receives the number of packages installed on the device.
*/
interface NumberOfAppsCallback {
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index a744792..685bd20 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -135,6 +135,11 @@
return preferredActivities;
}
+ @Override
+ public Set<String> getKeepEnabledPackages() {
+ return new ArraySet<>();
+ }
+
private static class CurrentUserAndManagedProfilePolicyInstalledAppCounter
extends InstalledAppCounter {
private NumberOfAppsCallback mCallback;
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index e9b7481..3ee3c50 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -16,8 +16,6 @@
package com.android.settings.applications;
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
import android.Manifest.permission;
import android.app.Activity;
import android.app.ActivityManager;
@@ -93,6 +91,7 @@
import com.android.settings.datausage.DataUsageSummary;
import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
import com.android.settings.fuelgauge.BatteryEntry;
+import com.android.settings.fuelgauge.BatteryStatsHelperLoader;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.notification.NotificationBackend;
@@ -116,6 +115,8 @@
import java.util.List;
import java.util.Set;
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
/**
* Activity to display application information from Settings. This activity presents
* extended information associated with a package like code, data, total size, permissions
@@ -143,6 +144,8 @@
private static final int LOADER_CHART_DATA = 2;
private static final int LOADER_STORAGE = 3;
+ @VisibleForTesting
+ static final int LOADER_BATTERY = 4;
private static final int DLG_FORCE_STOP = DLG_BASE + 1;
private static final int DLG_DISABLE = DLG_BASE + 2;
@@ -194,6 +197,8 @@
BatterySipper mSipper;
@VisibleForTesting
BatteryStatsHelper mBatteryHelper;
+ @VisibleForTesting
+ BatteryUtils mBatteryUtils;
protected ProcStatsData mStatsManager;
protected ProcStatsPackageEntry mStats;
@@ -202,9 +207,35 @@
private AppStorageStats mLastResult;
private String mBatteryPercent;
- private BatteryUtils mBatteryUtils;
- private boolean handleDisableable(Button button) {
+ @VisibleForTesting
+ final LoaderCallbacks<BatteryStatsHelper> mBatteryCallbacks =
+ new LoaderCallbacks<BatteryStatsHelper>() {
+
+ @Override
+ public Loader<BatteryStatsHelper> onCreateLoader(int id, Bundle args) {
+ return new BatteryStatsHelperLoader(getContext(), args);
+ }
+
+ @Override
+ public void onLoadFinished(Loader<BatteryStatsHelper> loader,
+ BatteryStatsHelper batteryHelper) {
+ mBatteryHelper = batteryHelper;
+ if (mPackageInfo != null) {
+ mSipper = findTargetSipper(batteryHelper, mPackageInfo.applicationInfo.uid);
+ if (getActivity() != null) {
+ updateBattery();
+ }
+ }
+ }
+
+ @Override
+ public void onLoaderReset(Loader<BatteryStatsHelper> loader) {
+ }
+ };
+
+ @VisibleForTesting
+ boolean handleDisableable(Button button) {
boolean disableable = false;
// Try to prevent the user from bricking their phone
// by not allowing disabling of apps signed with the
@@ -215,7 +246,8 @@
button.setText(R.string.disable_text);
} else if (mAppEntry.info.enabled && !isDisabledUntilUsed()) {
button.setText(R.string.disable_text);
- disableable = true;
+ disableable = !mApplicationFeatureProvider.getKeepEnabledPackages()
+ .contains(mAppEntry.info.packageName);
} else {
button.setText(R.string.enable_text);
disableable = true;
@@ -362,7 +394,6 @@
} else {
removePreference(KEY_DATA);
}
- mBatteryHelper = new BatteryStatsHelper(getActivity(), true);
mBatteryUtils = BatteryUtils.getInstance(getContext());
}
@@ -386,11 +417,16 @@
mDataCallbacks);
loaderManager.restartLoader(LOADER_STORAGE, Bundle.EMPTY, this);
}
- new BatteryUpdater().execute();
+ restartBatteryStatsLoader();
new MemoryUpdater().execute();
updateDynamicPrefs();
}
+ @VisibleForTesting
+ public void restartBatteryStatsLoader() {
+ getLoaderManager().restartLoader(LOADER_BATTERY, Bundle.EMPTY, mBatteryCallbacks);
+ }
+
@Override
public void onPause() {
getLoaderManager().destroyLoader(LOADER_CHART_DATA);
@@ -625,6 +661,19 @@
return showIt;
}
+ @VisibleForTesting
+ BatterySipper findTargetSipper(BatteryStatsHelper batteryHelper, int uid) {
+ List<BatterySipper> usageList = batteryHelper.getUsageList();
+ for (int i = 0, size = usageList.size(); i < size; i++) {
+ BatterySipper sipper = usageList.get(i);
+ if (sipper.getUid() == uid) {
+ return sipper;
+ }
+ }
+
+ return null;
+ }
+
private boolean signaturesMatch(String pkg1, String pkg2) {
if (pkg1 != null && pkg2 != null) {
try {
@@ -690,8 +739,6 @@
mDataPreference.setSummary(getDataSummary());
}
- updateBattery();
-
if (!mInitialized) {
// First time init: are we displaying an uninstalled app?
mInitialized = true;
@@ -718,9 +765,10 @@
return true;
}
- private void updateBattery() {
- if (mSipper != null) {
- mBatteryPreference.setEnabled(true);
+ @VisibleForTesting
+ void updateBattery() {
+ mBatteryPreference.setEnabled(true);
+ if (isBatteryStatsAvailable()) {
final int dischargeAmount = mBatteryHelper.getStats().getDischargeAmount(
BatteryStats.STATS_SINCE_CHARGED);
@@ -732,7 +780,6 @@
mBatteryPercent = Utils.formatPercentage(percentOfMax);
mBatteryPreference.setSummary(getString(R.string.battery_summary, mBatteryPercent));
} else {
- mBatteryPreference.setEnabled(false);
mBatteryPreference.setSummary(getString(R.string.no_battery_summary));
}
}
@@ -766,6 +813,11 @@
}
}
+ @VisibleForTesting
+ boolean isBatteryStatsAvailable() {
+ return mBatteryHelper != null && mSipper != null;
+ }
+
private static CharSequence getSize(Context context, AppStorageStats stats) {
return Formatter.formatFileSize(context, stats.getTotalBytes());
}
@@ -1004,9 +1056,15 @@
} else if (preference == mDataPreference) {
startAppInfoFragment(AppDataUsage.class, getString(R.string.app_data_usage));
} else if (preference == mBatteryPreference) {
- BatteryEntry entry = new BatteryEntry(getContext(), null, mUserManager, mSipper);
- AdvancedPowerUsageDetail.startBatteryDetailPage((SettingsActivity) getActivity(), this,
- mBatteryHelper, BatteryStats.STATS_SINCE_CHARGED, entry, mBatteryPercent);
+ if (isBatteryStatsAvailable()) {
+ BatteryEntry entry = new BatteryEntry(getContext(), null, mUserManager, mSipper);
+ AdvancedPowerUsageDetail.startBatteryDetailPage((SettingsActivity) getActivity(),
+ this, mBatteryHelper, BatteryStats.STATS_SINCE_CHARGED, entry,
+ mBatteryPercent);
+ } else {
+ AdvancedPowerUsageDetail.startBatteryDetailPage((SettingsActivity) getActivity(),
+ this, mPackageName);
+ }
} else {
return false;
}
@@ -1172,9 +1230,7 @@
void maybeAddInstantAppButtons() {
if (AppUtils.isInstant(mPackageInfo.applicationInfo)) {
LayoutPreference buttons = (LayoutPreference) findPreference(KEY_INSTANT_APP_BUTTONS);
- final Activity activity = getActivity();
- mInstantAppButtonsController = FeatureFactory.getFactory(activity)
- .getApplicationFeatureProvider(activity)
+ mInstantAppButtonsController = mApplicationFeatureProvider
.newInstantAppButtonsController(this,
buttons.findViewById(R.id.instant_app_button_container),
id -> showDialogInner(id, 0))
@@ -1343,33 +1399,6 @@
}
- private class BatteryUpdater extends AsyncTask<Void, Void, Void> {
- @Override
- protected Void doInBackground(Void... params) {
- mBatteryHelper.create((Bundle) null);
- mBatteryHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED,
- mUserManager.getUserProfiles());
- List<BatterySipper> usageList = mBatteryHelper.getUsageList();
- final int N = usageList.size();
- for (int i = 0; i < N; i++) {
- BatterySipper sipper = usageList.get(i);
- if (sipper.getUid() == mPackageInfo.applicationInfo.uid) {
- mSipper = sipper;
- break;
- }
- }
- return null;
- }
-
- @Override
- protected void onPostExecute(Void result) {
- if (getActivity() == null) {
- return;
- }
- refreshUi();
- }
- }
-
/**
* Elicit this class for testing. Test cannot be done in robolectric because it
* invokes the new API.
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index be3bdfa..76129b7 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -418,14 +418,14 @@
mFilterAdapter.enableFilter(FILTER_APPS_POWER_WHITELIST_ALL);
}
- AppFilter overrideFilter = getOverrideFilter(mListType, mStorageType, mVolumeUuid);
- if (overrideFilter != null) {
- mApplications.setOverrideFilter(overrideFilter);
+ AppFilter compositeFilter = getCompositeFilter(mListType, mStorageType, mVolumeUuid);
+ if (compositeFilter != null) {
+ mApplications.setCompositeFilter(compositeFilter);
}
}
@VisibleForTesting
- static @Nullable AppFilter getOverrideFilter(int listType, int storageType, String volumeUuid) {
+ static @Nullable AppFilter getCompositeFilter(int listType, int storageType, String volumeUuid) {
AppFilter filter = new VolumeFilter(volumeUuid);
if (listType == LIST_TYPE_STORAGE) {
if (storageType == STORAGE_TYPE_MUSIC) {
@@ -845,7 +845,7 @@
private int mWhichSize = SIZE_TOTAL;
CharSequence mCurFilterPrefix;
private PackageManager mPm;
- private AppFilter mOverrideFilter;
+ private AppFilter mCompositeFilter;
private boolean mHasReceivedLoadEntries;
private boolean mHasReceivedBridgeCallback;
private FileViewHolderController mExtraViewController;
@@ -909,8 +909,8 @@
}
}
- public void setOverrideFilter(AppFilter overrideFilter) {
- mOverrideFilter = overrideFilter;
+ public void setCompositeFilter(AppFilter compositeFilter) {
+ mCompositeFilter = compositeFilter;
rebuild(true);
}
@@ -988,8 +988,8 @@
mWhichSize = SIZE_INTERNAL;
}
filterObj = FILTERS[mFilterMode];
- if (mOverrideFilter != null) {
- filterObj = mOverrideFilter;
+ if (mCompositeFilter != null) {
+ filterObj = new CompoundFilter(filterObj, mCompositeFilter);
}
if (!mManageApplications.mShowSystem) {
if (LIST_TYPES_WITH_INSTANT.contains(mManageApplications.mListType)) {
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
index 73f4bbe..a08711c 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
@@ -23,6 +23,7 @@
import android.app.Fragment;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
import android.os.Bundle;
import android.text.TextUtils;
@@ -76,7 +77,9 @@
protected ConfirmationDialogFragment newConfirmationDialogFragment(String selectedKey,
CharSequence confirmationMessage) {
- return ConfirmationDialogFragment.newInstance(this, selectedKey, confirmationMessage);
+ final ConfirmationDialogFragment fragment = new ConfirmationDialogFragment();
+ fragment.init(this, selectedKey, confirmationMessage);
+ return fragment;
}
protected CharSequence getConfirmationMessage(CandidateInfo info) {
@@ -90,33 +93,29 @@
public static final String EXTRA_KEY = "extra_key";
public static final String EXTRA_MESSAGE = "extra_message";
- private final DialogInterface.OnClickListener mCancelListener;
-
- private ConfirmationDialogFragment(DialogInterface.OnClickListener cancelListener) {
- mCancelListener = cancelListener;
- }
+ private DialogInterface.OnClickListener mCancelListener;
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG;
}
- public static ConfirmationDialogFragment newInstance(DefaultAppPickerFragment parent,
- String key, CharSequence message) {
- return newInstance(parent, key, message, null);
- }
-
- // TODO: add test case for cancelListener
- public static ConfirmationDialogFragment newInstance(DefaultAppPickerFragment parent,
- String key, CharSequence message, DialogInterface.OnClickListener cancelListener) {
- final ConfirmationDialogFragment fragment = new ConfirmationDialogFragment(
- cancelListener);
+ /**
+ * Initializes the fragment.
+ *
+ * <p>Should be called after it's constructed.
+ */
+ public void init(DefaultAppPickerFragment parent, String key, CharSequence message) {
final Bundle argument = new Bundle();
argument.putString(EXTRA_KEY, key);
argument.putCharSequence(EXTRA_MESSAGE, message);
- fragment.setArguments(argument);
- fragment.setTargetFragment(parent, 0);
- return fragment;
+ setArguments(argument);
+ setTargetFragment(parent, 0);
+ }
+
+ // TODO: add test case for cancelListener
+ public void setCancelListener(DialogInterface.OnClickListener cancelListener) {
+ this.mCancelListener = cancelListener;
}
@Override
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
index 6dcf7b8..d674522 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
@@ -18,6 +18,7 @@
import android.Manifest;
import android.app.Activity;
+import android.app.Dialog;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
@@ -60,7 +61,7 @@
/**
* Set when the fragment is implementing ACTION_REQUEST_SET_AUTOFILL_SERVICE.
*/
- public DialogInterface.OnClickListener mCancelListener;
+ private DialogInterface.OnClickListener mCancelListener;
private final Handler mHandler = new Handler();
@Override
@@ -75,15 +76,33 @@
};
}
- mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
+ mSettingsPackageMonitor.register(activity, activity.getMainLooper(), false);
update();
}
@Override
protected ConfirmationDialogFragment newConfirmationDialogFragment(String selectedKey,
CharSequence confirmationMessage) {
- return ConfirmationDialogFragment.newInstance(this, selectedKey, confirmationMessage,
- mCancelListener);
+ final AutofillPickerConfirmationDialogFragment fragment =
+ new AutofillPickerConfirmationDialogFragment();
+ fragment.init(this, selectedKey, confirmationMessage);
+ return fragment;
+ }
+
+ /**
+ * Custom dialog fragment that has a cancel listener used to propagate the result back to
+ * caller (for the cases where the picker is launched by
+ * {@code android.settings.REQUEST_SET_AUTOFILL_SERVICE}.
+ */
+ public static class AutofillPickerConfirmationDialogFragment
+ extends ConfirmationDialogFragment {
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ final DefaultAutofillPicker target = (DefaultAutofillPicker) getTargetFragment();
+ setCancelListener(target.mCancelListener);
+ super.onCreate(savedInstanceState);
+ }
}
@Override
diff --git a/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java b/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
index 038267b..dca7ad1 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultHomePicker.java
@@ -63,13 +63,15 @@
}
final String summary;
+ boolean enabled = true;
if (mustSupportManagedProfile && !launcherHasManagedProfilesFeature(resolveInfo)) {
summary = getContext().getString(R.string.home_work_profile_not_supported);
+ enabled = false;
} else {
summary = null;
}
final DefaultAppInfo candidate =
- new DefaultAppInfo(mPm, mUserId, activityName, summary);
+ new DefaultAppInfo(mPm, mUserId, activityName, summary, enabled);
candidates.add(candidate);
}
return candidates;
diff --git a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
index 9323aa3..8d98b50 100644
--- a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
+++ b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
@@ -29,6 +29,7 @@
private Preference mPreference;
private PreferenceScreen mScreen;
+ private PreferenceAvailabilityObserver mAvailabilityObserver = null;
public DynamicAvailabilityPreferenceController(Context context, Lifecycle lifecycle) {
super(context);
@@ -37,6 +38,14 @@
}
}
+ public void setAvailabilityObserver(PreferenceAvailabilityObserver observer) {
+ mAvailabilityObserver = observer;
+ }
+
+ public PreferenceAvailabilityObserver getAvailabilityObserver() {
+ return mAvailabilityObserver;
+ }
+
@Override
public void displayPreference(PreferenceScreen screen) {
mScreen = screen;
@@ -56,4 +65,10 @@
mScreen.addPreference(mPreference);
}
}
+
+ protected void notifyOnAvailabilityUpdate(boolean available) {
+ if (mAvailabilityObserver != null) {
+ mAvailabilityObserver.onPreferenceAvailabilityUpdated(getPreferenceKey(), available);
+ }
+ }
}
diff --git a/src/com/android/settings/core/PreferenceAvailabilityObserver.java b/src/com/android/settings/core/PreferenceAvailabilityObserver.java
new file mode 100644
index 0000000..46ff3ba
--- /dev/null
+++ b/src/com/android/settings/core/PreferenceAvailabilityObserver.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 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.core;
+
+/**
+ * @deprecated This interface allows a {@link android.support.v7.preference.PreferenceGroup}'s
+ * controller to observe the availability of the {@link android.support.v7.preference.Preference}s
+ * inside it, hiding the group when all preferences become unavailable. In the future,
+ * {@link android.support.v7.preference.PreferenceGroup} will have native support for that
+ * functionality, removing the need for this interface.
+ */
+public interface PreferenceAvailabilityObserver {
+
+ /**
+ * Notifies the observer that the availability of the preference identified by {@code key} has
+ * been updated.
+ */
+ void onPreferenceAvailabilityUpdated(String key, boolean available);
+}
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index e3e95be..dc67888 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -15,6 +15,8 @@
*/
package com.android.settings.dashboard;
+import android.annotation.AttrRes;
+import android.annotation.ColorInt;
import android.app.Activity;
import android.content.Context;
import android.content.res.TypedArray;
@@ -55,6 +57,7 @@
private static final String STATE_CATEGORY_LIST = "category_list";
private static final String STATE_SUGGESTION_MODE = "suggestion_mode";
private static final String STATE_SUGGESTIONS_SHOWN_LOGGED = "suggestions_shown_logged";
+ private static final int DONT_SET_BACKGROUND_ATTR = -1;
private final IconCache mCache;
private final Context mContext;
@@ -222,6 +225,9 @@
public void onBindViewHolder(DashboardItemHolder holder, int position) {
final int type = mDashboardData.getItemTypeByPosition(position);
switch (type) {
+ case R.layout.dashboard_header_spacer:
+ onBindHeaderSpacer(holder, position);
+ break;
case R.layout.dashboard_category:
onBindCategory(holder,
(DashboardCategory) mDashboardData.getItemEntityByPosition(position));
@@ -352,6 +358,33 @@
notifyDashboardDataChanged(prevData);
}
+ private void onBindHeaderSpacer(DashboardItemHolder holder, int position) {
+ if (mDashboardData.size() > (position + 1)) {
+ // The spacer that goes underneath the search bar needs to match the
+ // background of the first real view. That view is either a condition,
+ // a suggestion, or the dashboard item.
+ //
+ // If it's a dashboard item, set null background so it uses the parent's
+ // background like the other views. Otherwise, match the colors.
+ int nextType = mDashboardData.getItemTypeByPosition(position + 1);
+ int colorAttr = nextType == R.layout.suggestion_header
+ ? android.R.attr.colorSecondary
+ : nextType == R.layout.condition_card
+ ? android.R.attr.colorAccent
+ : DONT_SET_BACKGROUND_ATTR;
+
+ if (colorAttr != DONT_SET_BACKGROUND_ATTR) {
+ TypedArray array = holder.itemView.getContext()
+ .obtainStyledAttributes(new int[]{colorAttr});
+ @ColorInt int color = array.getColor(0, 0);
+ array.recycle();
+ holder.itemView.setBackgroundColor(color);
+ } else {
+ holder.itemView.setBackground(null);
+ }
+ }
+ }
+
@VisibleForTesting
void onBindSuggestionHeader(final DashboardItemHolder holder, DashboardData
.SuggestionHeaderData data) {
diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java
index 4e8c7a0..8625790 100644
--- a/src/com/android/settings/dashboard/DashboardData.java
+++ b/src/com/android/settings/dashboard/DashboardData.java
@@ -45,7 +45,8 @@
public static final int DEFAULT_SUGGESTION_COUNT = 2;
// id namespace for different type of items.
- private static final int NS_SPACER = 0;
+ private static final int NS_HEADER_SPACER = 0;
+ private static final int NS_SPACER = 1000;
private static final int NS_ITEMS = 2000;
private static final int NS_CONDITION = 3000;
@@ -228,6 +229,9 @@
* and mIsShowingAll, mSuggestionMode flag.
*/
private void buildItemsData() {
+ // add the view that goes under the search bar
+ countItem(null, R.layout.dashboard_header_spacer, true, NS_HEADER_SPACER);
+ resetCount();
boolean hasConditions = false;
for (int i = 0; mConditions != null && i < mConditions.size(); i++) {
boolean shouldShow = mConditions.get(i).shouldShow();
diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index e06c869..74a6091 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -226,6 +226,8 @@
private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
+ private static final String SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY = "show_notification_channel_warnings";
+
private static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
@@ -326,6 +328,8 @@
private SwitchPreference mShowAllANRs;
+ private SwitchPreference mShowNotificationChannelWarnings;
+
private ColorModePreference mColorModePreference;
private SwitchPreference mForceResizable;
@@ -523,6 +527,11 @@
mAllPrefs.add(mShowAllANRs);
mResetSwitchPrefs.add(mShowAllANRs);
+ mShowNotificationChannelWarnings = (SwitchPreference) findPreference(
+ SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY);
+ mAllPrefs.add(mShowNotificationChannelWarnings);
+ mResetSwitchPrefs.add(mShowNotificationChannelWarnings);
+
Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
if (hdcpChecking != null) {
mAllPrefs.add(hdcpChecking);
@@ -788,6 +797,7 @@
updateImmediatelyDestroyActivitiesOptions();
updateAppProcessLimitOptions();
updateShowAllANRsOptions();
+ updateShowNotificationChannelWarningsOptions();
mVerifyAppsOverUsbController.updatePreference();
updateOtaDisableAutomaticUpdateOptions();
updateBugreportOptions();
@@ -2268,6 +2278,19 @@
getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0);
}
+ private void writeShowNotificationChannelWarningsOptions() {
+ Settings.Global.putInt(getActivity().getContentResolver(),
+ Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS,
+ mShowNotificationChannelWarnings.isChecked() ? 1 : 0);
+ }
+
+ private void updateShowNotificationChannelWarningsOptions() {
+ final int defaultWarningEnabled = Build.IS_DEBUGGABLE ? 1 : 0;
+ updateSwitchPreference(mShowNotificationChannelWarnings, Settings.Global.getInt(
+ getActivity().getContentResolver(),
+ Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, defaultWarningEnabled) != 0);
+ }
+
private void confirmEnableOemUnlock() {
DialogInterface.OnClickListener onClickListener = new DialogInterface.OnClickListener() {
@Override
@@ -2454,6 +2477,8 @@
writeImmediatelyDestroyActivitiesOptions();
} else if (preference == mShowAllANRs) {
writeShowAllANRsOptions();
+ } else if (preference == mShowNotificationChannelWarnings) {
+ writeShowNotificationChannelWarningsOptions();
} else if (preference == mForceHardwareUi) {
writeHardwareUiOptions();
} else if (preference == mForceMsaa) {
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index 4974f78..13b3d0b 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -131,7 +131,7 @@
}
}
- mPreferenceController.onLoadFinished(mAppsResult.get(UserHandle.myUserId()));
+ mPreferenceController.onLoadFinished(mAppsResult, UserHandle.myUserId());
updateSecondaryUserControllers(mSecondaryUsers, mAppsResult);
// setLoading always causes a flicker, so let's avoid doing it.
diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
index 7e2d941..dee6793 100644
--- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
@@ -120,7 +120,8 @@
@Override
public void onLoadFinished(Loader<SparseArray<AppsStorageResult>> loader,
SparseArray<AppsStorageResult> result) {
- mPreferenceController.onLoadFinished(scrubAppsFromResult(result.get(mUserId)));
+ scrubAppsFromResult(result.get(mUserId));
+ mPreferenceController.onLoadFinished(result, mUserId);
}
@Override
diff --git a/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
index 8652804..74474b3 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageAsyncLoader.java
@@ -22,8 +22,8 @@
import android.content.Context;
import android.content.pm.ApplicationInfo;
-import android.content.pm.UserInfo;
import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.UserInfo;
import android.os.UserHandle;
import android.util.Log;
import android.util.SparseArray;
@@ -87,45 +87,43 @@
stats = mStatsManager.getStatsForPackage(mUuid, app.packageName, myUser);
} catch (NameNotFoundException | IOException e) {
// This may happen if the package was removed during our calculation.
- Log.w("App unexpectedly not found", e);
+ Log.w(TAG, "App unexpectedly not found", e);
continue;
}
- long attributedAppSizeInBytes = stats.getDataBytes();
- // This matches how the package manager calculates sizes -- by zeroing out code sizes of
- // system apps which are not updated. My initial tests suggest that this results in the
- // original code size being counted for updated system apps when they shouldn't, but
- // I am not sure how to avoid this problem without specifically going in to find that
- // code size.
- if (!app.isSystemApp() || app.isUpdatedSystemApp()) {
- attributedAppSizeInBytes += stats.getCodeBytes();
- } else {
- result.systemSize += stats.getCodeBytes();
+ long blamedSize = stats.getDataBytes() - stats.getCacheBytes();
+
+ // Only count app code against the current user; we don't want
+ // double-counting on multi-user devices.
+ if (userId == UserHandle.myUserId()) {
+ blamedSize += stats.getCodeBytes();
}
+
switch (app.category) {
case CATEGORY_GAME:
- result.gamesSize += attributedAppSizeInBytes;
+ result.gamesSize += blamedSize;
break;
case CATEGORY_AUDIO:
- result.musicAppsSize += attributedAppSizeInBytes;
+ result.musicAppsSize += blamedSize;
break;
case CATEGORY_VIDEO:
- result.videoAppsSize += attributedAppSizeInBytes;
+ result.videoAppsSize += blamedSize;
break;
default:
// The deprecated game flag does not set the category.
if ((app.flags & ApplicationInfo.FLAG_IS_GAME) != 0) {
- result.gamesSize += attributedAppSizeInBytes;
+ result.gamesSize += blamedSize;
break;
}
- result.otherAppsSize += attributedAppSizeInBytes;
+ result.otherAppsSize += blamedSize;
break;
}
}
Log.d(TAG, "Loading external stats");
try {
- result.externalStats = mStatsManager.getExternalStorageStats(mUuid, UserHandle.of(userId));
+ result.externalStats = mStatsManager.getExternalStorageStats(mUuid,
+ UserHandle.of(userId));
} catch (IOException e) {
Log.w(TAG, e);
}
@@ -142,7 +140,6 @@
public long musicAppsSize;
public long videoAppsSize;
public long otherAppsSize;
- public long systemSize;
public StorageStatsSource.ExternalStorageStats externalStats;
}
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index f8df375..cebd114 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -23,6 +23,7 @@
import android.content.pm.PackageManager;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
+import android.net.TrafficStats;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.storage.VolumeInfo;
@@ -30,6 +31,7 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
+import android.util.SparseArray;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
@@ -237,7 +239,10 @@
setFilesPreferenceVisibility();
}
- public void onLoadFinished(StorageAsyncLoader.AppsStorageResult data) {
+ public void onLoadFinished(SparseArray<StorageAsyncLoader.AppsStorageResult> result,
+ int userId) {
+ final StorageAsyncLoader.AppsStorageResult data = result.get(userId);
+
// TODO(b/35927909): Figure out how to split out apps which are only installed for work
// profiles in order to attribute those app's code bytes only to that profile.
mPhotoPreference.setStorageSize(
@@ -248,23 +253,30 @@
mMoviesPreference.setStorageSize(data.videoAppsSize, mTotalSize);
mAppPreference.setStorageSize(data.otherAppsSize, mTotalSize);
- long unattributedExternalBytes =
+ long otherExternalBytes =
data.externalStats.totalBytes
- data.externalStats.audioBytes
- data.externalStats.videoBytes
- - data.externalStats.imageBytes;
- mFilePreference.setStorageSize(unattributedExternalBytes, mTotalSize);
+ - data.externalStats.imageBytes
+ - data.externalStats.appBytes;
+ mFilePreference.setStorageSize(otherExternalBytes, mTotalSize);
- // We define the system size as everything we can't classify.
if (mSystemPreference != null) {
- mSystemPreference.setStorageSize(
- mUsedBytes
- - data.externalStats.totalBytes
- - data.musicAppsSize
- - data.gamesSize
- - data.videoAppsSize
- - data.otherAppsSize,
- mTotalSize);
+ // Everything else that hasn't already been attributed is tracked as
+ // belonging to system.
+ long attributedSize = 0;
+ for (int i = 0; i < result.size(); i++) {
+ final StorageAsyncLoader.AppsStorageResult otherData = result.valueAt(i);
+ attributedSize += otherData.gamesSize
+ + otherData.musicAppsSize
+ + otherData.videoAppsSize
+ + otherData.otherAppsSize;
+ attributedSize += otherData.externalStats.totalBytes
+ - otherData.externalStats.appBytes;
+ }
+
+ final long systemSize = Math.max(TrafficStats.GB_IN_BYTES, mUsedBytes - attributedSize);
+ mSystemPreference.setStorageSize(systemSize, mTotalSize);
}
}
diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
index f0aca01..556baec 100644
--- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
@@ -50,15 +50,15 @@
true /* async */,
(num) -> {
if (num == 0) {
- preference.setVisible(false);
mHasApps = false;
} else {
- preference.setVisible(true);
preference.setSummary(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_packages_lower_bound,
num, num));
mHasApps = true;
}
+ preference.setVisible(mHasApps);
+ notifyOnAvailabilityUpdate(mHasApps);
});
}
@@ -80,6 +80,7 @@
mFeatureProvider.calculateNumberOfAppsWithAdminGrantedPermissions(mPermissions,
false /* async */, (num) -> haveAppsWithAdminGrantedPermissions[0] = num > 0);
mHasApps = haveAppsWithAdminGrantedPermissions[0];
+ notifyOnAvailabilityUpdate(mHasApps);
return mHasApps;
}
diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
index e98ece8..32f2bbe 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
@@ -42,7 +42,9 @@
@Override
public boolean isAvailable() {
- return mFeatureProvider.isAlwaysOnVpnSetInCurrentUser();
+ final boolean available = mFeatureProvider.isAlwaysOnVpnSetInCurrentUser();
+ notifyOnAvailabilityUpdate(available);
+ return available;
}
@Override
diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
index 4796b75..8486368 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
@@ -33,7 +33,9 @@
@Override
public boolean isAvailable() {
- return mFeatureProvider.isAlwaysOnVpnSetInManagedProfile();
+ final boolean available = mFeatureProvider.isAlwaysOnVpnSetInManagedProfile();
+ notifyOnAvailabilityUpdate(available);
+ return available;
}
@Override
diff --git a/src/com/android/settings/enterprise/CaCertsPreferenceController.java b/src/com/android/settings/enterprise/CaCertsPreferenceController.java
index d020676..fc89dc8 100644
--- a/src/com/android/settings/enterprise/CaCertsPreferenceController.java
+++ b/src/com/android/settings/enterprise/CaCertsPreferenceController.java
@@ -44,8 +44,11 @@
@Override
public boolean isAvailable() {
- return mFeatureProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()
- > 0;
+ final boolean available =
+ mFeatureProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()
+ > 0;
+ notifyOnAvailabilityUpdate(available);
+ return available;
}
@Override
diff --git a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
index acbcc2e..9876f71 100644
--- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
@@ -42,14 +42,18 @@
public void updateState(Preference preference) {
mFeatureProvider.calculateNumberOfPolicyInstalledApps(true /* async */,
(num) -> {
+ final boolean available;
if (num == 0) {
- preference.setVisible(false);
+ available = false;
} else {
- preference.setVisible(true);
+ available = true;
preference.setSummary(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_packages_lower_bound, num,
num));
+
}
+ preference.setVisible(available);
+ notifyOnAvailabilityUpdate(available);
});
}
@@ -68,7 +72,9 @@
final Boolean[] haveEnterpriseInstalledPackages = { null };
mFeatureProvider.calculateNumberOfPolicyInstalledApps(false /* async */,
(num) -> haveEnterpriseInstalledPackages[0] = num > 0);
- return haveEnterpriseInstalledPackages[0];
+ final boolean available = haveEnterpriseInstalledPackages[0];
+ notifyOnAvailabilityUpdate(available);
+ return available;
}
@Override
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
index 69e0416..372982f 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
@@ -45,7 +45,9 @@
@Override
public boolean isAvailable() {
- return mFeatureProvider.hasDeviceOwner();
+ final boolean available = mFeatureProvider.hasDeviceOwner();
+ notifyOnAvailabilityUpdate(available);
+ return available;
}
@Override
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
index a80dec0..f7327c8 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
@@ -61,23 +61,32 @@
controllers.add(new NetworkLogsPreferenceController(context));
controllers.add(new BugReportsPreferenceController(context));
controllers.add(new SecurityLogsPreferenceController(context));
- controllers.add(new EnterpriseInstalledPackagesPreferenceController(context, lifecycle,
- async));
- controllers.add(new AdminGrantedLocationPermissionsPreferenceController(context, lifecycle,
- async));
- controllers.add(new AdminGrantedMicrophonePermissionPreferenceController(context, lifecycle,
- async));
- controllers.add(new AdminGrantedCameraPermissionPreferenceController(context, lifecycle,
- async));
- controllers.add(new EnterpriseSetDefaultAppsPreferenceController(context, lifecycle));
- controllers.add(new AlwaysOnVpnCurrentUserPreferenceController(context, lifecycle));
- controllers.add(new AlwaysOnVpnManagedProfilePreferenceController(context, lifecycle));
- controllers.add(new GlobalHttpProxyPreferenceController(context, lifecycle));
- controllers.add(new CaCertsPreferenceController(context, lifecycle));
+ final List exposureChangesCategoryControllers = new ArrayList<PreferenceController>();
+ exposureChangesCategoryControllers.add(new EnterpriseInstalledPackagesPreferenceController(
+ context, lifecycle, async));
+ exposureChangesCategoryControllers.add(
+ new AdminGrantedLocationPermissionsPreferenceController(context, lifecycle, async));
+ exposureChangesCategoryControllers.add(
+ new AdminGrantedMicrophonePermissionPreferenceController(context, lifecycle,
+ async));
+ exposureChangesCategoryControllers.add(new AdminGrantedCameraPermissionPreferenceController(
+ context, lifecycle, async));
+ exposureChangesCategoryControllers.add(new EnterpriseSetDefaultAppsPreferenceController(
+ context, lifecycle));
+ exposureChangesCategoryControllers.add(new AlwaysOnVpnCurrentUserPreferenceController(
+ context, lifecycle));
+ exposureChangesCategoryControllers.add(new AlwaysOnVpnManagedProfilePreferenceController(
+ context, lifecycle));
+ exposureChangesCategoryControllers.add(new ImePreferenceController(context, lifecycle));
+ exposureChangesCategoryControllers.add(new GlobalHttpProxyPreferenceController(context,
+ lifecycle));
+ exposureChangesCategoryControllers.add(new CaCertsPreferenceController(context, lifecycle));
+ controllers.addAll(exposureChangesCategoryControllers);
+ controllers.add(new ExposureChangesCategoryPreferenceController(context, lifecycle,
+ exposureChangesCategoryControllers, async));
controllers.add(new FailedPasswordWipeCurrentUserPreferenceController(context, lifecycle));
controllers.add(new FailedPasswordWipeManagedProfilePreferenceController(context,
lifecycle));
- controllers.add(new ImePreferenceController(context, lifecycle));
return controllers;
}
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
index 2f43a61..35f6e41 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
@@ -1,3 +1,4 @@
+
/*
* Copyright (C) 2017 The Android Open Source Project
*
@@ -48,7 +49,9 @@
@Override
public boolean isAvailable() {
- return getNumberOfEnterpriseSetDefaultApps() > 0;
+ final boolean available = getNumberOfEnterpriseSetDefaultApps() > 0;
+ notifyOnAvailabilityUpdate(available);
+ return available;
}
@Override
diff --git a/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java b/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
new file mode 100644
index 0000000..4c89659
--- /dev/null
+++ b/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
@@ -0,0 +1,111 @@
+
+/*
+ * Copyright (C) 2017 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.enterprise;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceAvailabilityObserver;
+import com.android.settings.core.lifecycle.Lifecycle;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * A controller that hides a {@link android.support.v7.preference.PreferenceGroup} when none of the
+ * {@link Preference}s inside it are visible.
+ *
+ * TODO(b/62051162): Use {@link android.support.v7.preference.PreferenceGroup}'s native ability to
+ * hide itself when all {@link Preference}s inside it are invisible when that functionality becomes
+ * available. This custom controller will still be needed to remove the
+ * {@link android.support.v7.preference.PreferenceGroup} from the search index as required (by
+ * having {@link #isAvailable()} return {@code false} if the method returns {@code false} for all
+ * {@link Preference}s in the {@link android.support.v7.preference.PreferenceGroup}).
+ */
+public class ExposureChangesCategoryPreferenceController
+ extends DynamicAvailabilityPreferenceController implements PreferenceAvailabilityObserver {
+
+ private static final String KEY_EXPOSURE_CHANGES_CATEGORY = "exposure_changes_category";
+ private final Set<String> mAvailablePrefs = new HashSet<String>();
+ private Preference mPreference = null;
+ private boolean mControllingUi;
+
+ /**
+ * When {@code controllingUi} is {@code true}, some of the preferences may have their visibility
+ * determined asynchronously. In this case, {@link #isAvailable()} must always return {@code
+ * true} and the group should be hidden using {@link Preference#setVisible()} if all preferences
+ * report that they are invisible.
+ * When {@code controllingUi} is {@code false}, we are running on the search indexer thread and
+ * visibility must be determined synchronously. {@link #isAvailable()} can rely on all
+ * preferences having their visibility determined already and should return whether the group is
+ * visible or not.
+ */
+ public ExposureChangesCategoryPreferenceController(Context context, Lifecycle lifecycle,
+ List<DynamicAvailabilityPreferenceController> controllers, boolean controllingUi) {
+ super(context, lifecycle);
+ mControllingUi = controllingUi;
+ for (final DynamicAvailabilityPreferenceController controller : controllers) {
+ controller.setAvailabilityObserver(this);
+ }
+ }
+
+ @Override
+ public void onPreferenceAvailabilityUpdated(String key, boolean available) {
+ if (available) {
+ mAvailablePrefs.add(key);
+ } else {
+ mAvailablePrefs.remove(key);
+ }
+ available = haveAnyVisiblePreferences();
+ if (mControllingUi) {
+ notifyOnAvailabilityUpdate(available);
+ }
+ if (mPreference != null) {
+ mPreference.setVisible(available);
+ }
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ mPreference = preference;
+ mPreference.setVisible(haveAnyVisiblePreferences());
+ }
+
+ @Override
+ public boolean isAvailable() {
+ if (mControllingUi) {
+ // When running on the main UI thread, some preferences determine their visibility
+ // asynchronously. Always return true here and determine the pref group's actual
+ // visibility as the other preferences report their visibility asynchronously via
+ // onPreferenceAvailabilityUpdated().
+ return true;
+ }
+ final boolean available = haveAnyVisiblePreferences();
+ notifyOnAvailabilityUpdate(available);
+ return available;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY_EXPOSURE_CHANGES_CATEGORY;
+ }
+
+ private boolean haveAnyVisiblePreferences() {
+ return mAvailablePrefs.size() > 0;
+ }
+}
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
index 2f35da6..7485fe2 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
@@ -46,6 +46,8 @@
@Override
public boolean isAvailable() {
- return getMaximumFailedPasswordsBeforeWipe() > 0;
+ final boolean available = getMaximumFailedPasswordsBeforeWipe() > 0;
+ notifyOnAvailabilityUpdate(available);
+ return available;
}
}
diff --git a/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java b/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
index 6ee7fc4..76c49da 100644
--- a/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
+++ b/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
@@ -32,7 +32,9 @@
@Override
public boolean isAvailable() {
- return mFeatureProvider.isGlobalHttpProxySet();
+ final boolean available = mFeatureProvider.isGlobalHttpProxySet();
+ notifyOnAvailabilityUpdate(available);
+ return available;
}
@Override
diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java
index b090bed..b13aec7 100644
--- a/src/com/android/settings/enterprise/ImePreferenceController.java
+++ b/src/com/android/settings/enterprise/ImePreferenceController.java
@@ -43,7 +43,9 @@
@Override
public boolean isAvailable() {
- return mFeatureProvider.getImeLabelIfOwnerSet() != null;
+ final boolean available = mFeatureProvider.getImeLabelIfOwnerSet() != null;
+ notifyOnAvailabilityUpdate(available);
+ return available;
}
@Override
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index e6e6bcd..7454c60 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -159,6 +159,22 @@
startIconAnimation();
}
+ @Override
+ protected void onResume() {
+ super.onResume();
+ if (mSidecar != null) {
+ mSidecar.setListener(this);
+ }
+ }
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+ if (mSidecar != null) {
+ mSidecar.setListener(null);
+ }
+ }
+
private void startIconAnimation() {
mIconAnimationDrawable.start();
}
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
index 7fc7a04..cbfec0c 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
@@ -31,6 +31,8 @@
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.password.IFingerprintManager;
+import java.util.ArrayList;
+
/**
* Sidecar fragment to handle the state around fingerprint enrollment.
*/
@@ -46,6 +48,57 @@
private boolean mDone;
private int mUserId;
private IFingerprintManager mFingerprintManager;
+ private ArrayList<QueuedEvent> mQueuedEvents;
+
+ private abstract class QueuedEvent {
+ public abstract void send(Listener listener);
+ }
+
+ private class QueuedEnrollmentProgress extends QueuedEvent {
+ int enrollmentSteps;
+ int remaining;
+ public QueuedEnrollmentProgress(int enrollmentSteps, int remaining) {
+ this.enrollmentSteps = enrollmentSteps;
+ this.remaining = remaining;
+ }
+
+ @Override
+ public void send(Listener listener) {
+ listener.onEnrollmentProgressChange(enrollmentSteps, remaining);
+ }
+ }
+
+ private class QueuedEnrollmentHelp extends QueuedEvent {
+ int helpMsgId;
+ CharSequence helpString;
+ public QueuedEnrollmentHelp(int helpMsgId, CharSequence helpString) {
+ this.helpMsgId = helpMsgId;
+ this.helpString = helpString;
+ }
+
+ @Override
+ public void send(Listener listener) {
+ listener.onEnrollmentHelp(helpString);
+ }
+ }
+
+ private class QueuedEnrollmentError extends QueuedEvent {
+ int errMsgId;
+ CharSequence errString;
+ public QueuedEnrollmentError(int errMsgId, CharSequence errString) {
+ this.errMsgId = errMsgId;
+ this.errString = errString;
+ }
+
+ @Override
+ public void send(Listener listener) {
+ listener.onEnrollmentError(errMsgId, errString);
+ }
+ }
+
+ public FingerprintEnrollSidecar() {
+ mQueuedEvents = new ArrayList<>();
+ }
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -103,6 +156,13 @@
public void setListener(Listener listener) {
mListener = listener;
+ if (mListener != null) {
+ for (int i=0; i<mQueuedEvents.size(); i++) {
+ QueuedEvent event = mQueuedEvents.get(i);
+ event.send(mListener);
+ }
+ mQueuedEvents.clear();
+ }
}
public int getEnrollmentSteps() {
@@ -129,6 +189,8 @@
mDone = remaining == 0;
if (mListener != null) {
mListener.onEnrollmentProgressChange(mEnrollmentSteps, remaining);
+ } else {
+ mQueuedEvents.add(new QueuedEnrollmentProgress(mEnrollmentSteps, remaining));
}
}
@@ -136,6 +198,8 @@
public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
if (mListener != null) {
mListener.onEnrollmentHelp(helpString);
+ } else {
+ mQueuedEvents.add(new QueuedEnrollmentHelp(helpMsgId, helpString));
}
}
@@ -143,6 +207,8 @@
public void onEnrollmentError(int errMsgId, CharSequence errString) {
if (mListener != null) {
mListener.onEnrollmentError(errMsgId, errString);
+ } else {
+ mQueuedEvents.add(new QueuedEnrollmentError(errMsgId, errString));
}
mEnrolling = false;
}
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 7a2e4c0..580eb1b 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -129,6 +129,17 @@
args.putInt(EXTRA_POWER_USAGE_AMOUNT, (int) sipper.totalPowerMah);
caller.startPreferencePanelAsUser(fragment, AdvancedPowerUsageDetail.class.getName(), args,
+ R.string.battery_details_title, null,
+ new UserHandle(UserHandle.getUserId(sipper.getUid())));
+ }
+
+ public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment,
+ String packageName) {
+ final Bundle args = new Bundle(2);
+ args.putString(EXTRA_PACKAGE_NAME, packageName);
+ args.putString(EXTRA_POWER_USAGE_PERCENT, Utils.formatPercentage(0));
+
+ caller.startPreferencePanelAsUser(fragment, AdvancedPowerUsageDetail.class.getName(), args,
R.string.battery_details_title, null, new UserHandle(UserHandle.myUserId()));
}
diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
index 49a0179..89f03b3 100644
--- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
@@ -98,6 +98,8 @@
@VisibleForTesting
Button mUninstallButton;
@VisibleForTesting
+ String mPackageName;
+ @VisibleForTesting
boolean mDisableAfterUninstall = false;
private final int mRequestUninstall;
@@ -113,7 +115,6 @@
private MetricsFeatureProvider mMetricsFeatureProvider;
private LayoutPreference mButtonsPref;
- private String mPackageName;
private int mUserId;
private boolean mUpdatedSysApp = false;
private boolean mListeningToPackageRemove = false;
@@ -134,7 +135,6 @@
mMetricsFeatureProvider = FeatureFactory.getFactory(activity).getMetricsFeatureProvider();
mState = state;
- mSession = mState.newSession(this);
mDpm = dpm;
mUserManager = userManager;
mPm = packageManager;
@@ -145,10 +145,10 @@
mRequestUninstall = requestUninstall;
mRequestRemoveDeviceAdmin = requestRemoveDeviceAdmin;
- lifecycle.addObserver(this);
-
if (packageName != null) {
mAppEntry = mState.getEntry(packageName, mUserId);
+ mSession = mState.newSession(this);
+ lifecycle.addObserver(this);
} else {
mFinishing = true;
}
@@ -620,7 +620,11 @@
return false;
}
- private boolean refreshUi() {
+ @VisibleForTesting
+ boolean refreshUi() {
+ if (mPackageName == null) {
+ return false;
+ }
retrieveAppEntry();
if (mAppEntry == null || mPackageInfo == null) {
return false;
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
new file mode 100644
index 0000000..04e2c7a
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2017 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.fuelgauge;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.PreferenceScreen;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.BatteryInfo;
+import com.android.settingslib.Utils;
+
+/**
+ * Controller that update the battery header view
+ */
+public class BatteryHeaderPreferenceController extends PreferenceController {
+ @VisibleForTesting
+ static final String KEY_BATTERY_HEADER = "battery_header";
+ @VisibleForTesting
+ BatteryMeterView mBatteryMeterView;
+ @VisibleForTesting
+ TextView mTimeText;
+ @VisibleForTesting
+ TextView mSummary;
+
+ private LayoutPreference mBatteryLayoutPref;
+
+ public BatteryHeaderPreferenceController(Context context) {
+ super(context);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+
+ mBatteryLayoutPref = (LayoutPreference) screen.findPreference(KEY_BATTERY_HEADER);
+ mBatteryMeterView = (BatteryMeterView) mBatteryLayoutPref
+ .findViewById(R.id.battery_header_icon);
+ mTimeText = (TextView) mBatteryLayoutPref.findViewById(R.id.battery_percent);
+ mSummary = (TextView) mBatteryLayoutPref.findViewById(R.id.summary1);
+
+ Intent batteryBroadcast = mContext.registerReceiver(null,
+ new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+ final int batteryLevel = Utils.getBatteryLevel(batteryBroadcast);
+
+ mBatteryMeterView.setBatteryLevel(batteryLevel);
+ mTimeText.setText(Utils.formatPercentage(batteryLevel));
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return true;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY_BATTERY_HEADER;
+ }
+
+ public void updateHeaderPreference(BatteryInfo info) {
+ mTimeText.setText(Utils.formatPercentage(info.batteryLevel));
+ if (info.remainingLabel == null) {
+ mSummary.setText(info.statusLabel);
+ } else {
+ mSummary.setText(info.remainingLabel);
+ }
+
+ mBatteryMeterView.setBatteryLevel(info.batteryLevel);
+ mBatteryMeterView.setCharging(!info.discharging);
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java
index 969f886..09f7c7a 100644
--- a/src/com/android/settings/fuelgauge/BatteryMeterView.java
+++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java
@@ -38,8 +38,6 @@
@VisibleForTesting
ColorFilter mAccentColorFilter;
- private int mLevel;
-
public BatteryMeterView(Context context) {
this(context, null, 0);
}
@@ -51,7 +49,7 @@
public BatteryMeterView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
- final int frameColor = context.getColor(R.color.batterymeter_frame_color);
+ final int frameColor = context.getColor(R.color.meter_background_color);
mAccentColorFilter = new PorterDuffColorFilter(
Utils.getColorAttr(context, android.R.attr.colorAccent), PorterDuff.Mode.SRC_IN);
mErrorColorFilter = new PorterDuffColorFilter(
@@ -66,7 +64,6 @@
}
public void setBatteryLevel(int level) {
- mLevel = level;
mDrawable.setBatteryLevel(level);
if (level < mDrawable.getCriticalLevel()) {
mDrawable.setBatteryColorFilter(mErrorColorFilter);
@@ -76,7 +73,7 @@
}
public int getBatteryLevel() {
- return mLevel;
+ return mDrawable.getBatteryLevel();
}
public void setCharging(boolean charging) {
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index 6b7ddf9..45d0db2 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -99,7 +99,6 @@
}
};
mTriggerPref.init(this);
-
mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
}
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 849144a..a3ff1f4 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -27,10 +27,13 @@
import android.util.SparseLongArray;
import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.overlay.FeatureFactory;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
/**
@@ -213,6 +216,32 @@
return (powerUsageMah / (totalPowerMah - hiddenPowerMah)) * dischargeAmount;
}
+ /**
+ * Sort the {@code usageList} based on {@link BatterySipper#totalPowerMah}
+ * @param usageList
+ */
+ public void sortUsageList(List<BatterySipper> usageList) {
+ Collections.sort(usageList, new Comparator<BatterySipper>() {
+ @Override
+ public int compare(BatterySipper a, BatterySipper b) {
+ return Double.compare(b.totalPowerMah, a.totalPowerMah);
+ }
+ });
+ }
+
+ /**
+ * Calculate the time since last full charge, including the device off time
+ *
+ * @param batteryStatsHelper utility class that contains the data
+ * @param currentTimeMs current wall time
+ * @return time in millis
+ */
+ public long calculateLastFullChargeTime(BatteryStatsHelper batteryStatsHelper,
+ long currentTimeMs) {
+ return currentTimeMs - batteryStatsHelper.getStats().getStartClockTime();
+
+ }
+
private long convertUsToMs(long timeUs) {
return timeUs / 1000;
}
diff --git a/src/com/android/settings/fuelgauge/FakeUid.java b/src/com/android/settings/fuelgauge/FakeUid.java
index 6cb5c64..70fb3d4 100644
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -297,11 +297,26 @@
}
@Override
+ public Timer getBluetoothUnoptimizedScanTimer() {
+ return null;
+ }
+
+ @Override
+ public Timer getBluetoothUnoptimizedScanBackgroundTimer() {
+ return null;
+ }
+
+ @Override
public Counter getBluetoothScanResultCounter() {
return null;
}
@Override
+ public Counter getBluetoothScanResultBgCounter() {
+ return null;
+ }
+
+ @Override
public long getWifiRadioApWakeupCount(int which) {
return 0;
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index 10ffc49..be38855 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -77,11 +77,11 @@
@Override
public boolean isAdvancedUiEnabled() {
- return false;
+ return true;
}
@Override
public boolean isPowerAccountingToggleEnabled() {
- return false;
+ return true;
}
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 9ee71dd..0b21fc9 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -16,8 +16,6 @@
package com.android.settings.fuelgauge;
-import android.animation.Animator;
-import android.animation.ValueAnimator;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -43,8 +41,6 @@
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
-import android.view.animation.AnimationUtils;
-import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.os.BatterySipper;
@@ -69,8 +65,6 @@
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
/**
@@ -87,10 +81,6 @@
private static final String KEY_BATTERY_HEADER = "battery_header";
private static final int MAX_ITEMS_TO_LIST = USE_FAKE_DATA ? 30 : 10;
private static final int MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP = 10;
- private static final int BATTERY_ANIMATION_DURATION_MS_PER_LEVEL = 30;
-
- @VisibleForTesting
- static final String ARG_BATTERY_LEVEL = "key_battery_level";
private static final String KEY_SCREEN_USAGE = "screen_usage";
private static final String KEY_TIME_SINCE_LAST_FULL_CHARGE = "last_full_charge";
@@ -112,8 +102,6 @@
new FooterPreferenceMixin(this, getLifecycle());
@VisibleForTesting
- int mBatteryLevel;
- @VisibleForTesting
boolean mShowAllApps = false;
@VisibleForTesting
PowerGaugePreference mScreenUsagePref;
@@ -124,6 +112,7 @@
@VisibleForTesting
BatteryUtils mBatteryUtils;
+ private BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
private LayoutPreference mBatteryLayoutPref;
private PreferenceGroup mAppListGroup;
private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
@@ -133,8 +122,6 @@
super.onCreate(icicle);
setAnimationAllowed(true);
- mBatteryLevel = getContext().getResources().getInteger(
- com.android.internal.R.integer.config_criticalBatteryWarningLevel) + 1;
mBatteryLayoutPref = (LayoutPreference) findPreference(KEY_BATTERY_HEADER);
mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
mScreenUsagePref = (PowerGaugePreference) findPreference(KEY_SCREEN_USAGE);
@@ -148,26 +135,11 @@
}
@Override
- public void onActivityCreated(Bundle savedInstanceState) {
- super.onActivityCreated(savedInstanceState);
- if (savedInstanceState != null) {
- mBatteryLevel = savedInstanceState.getInt(ARG_BATTERY_LEVEL);
- }
- }
-
- @Override
public int getMetricsCategory() {
return MetricsEvent.FUELGAUGE_POWER_USAGE_SUMMARY;
}
@Override
- public void onResume() {
- super.onResume();
-
- initHeaderPreference();
- }
-
- @Override
public void onPause() {
BatteryEntry.stopRequestQueue();
mHandler.removeMessages(BatteryEntry.MSG_UPDATE_NAME_ICON);
@@ -183,12 +155,6 @@
}
@Override
- public void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- outState.putInt(ARG_BATTERY_LEVEL, mBatteryLevel);
- }
-
- @Override
public boolean onPreferenceTreeClick(Preference preference) {
if (KEY_BATTERY_HEADER.equals(preference.getKey())) {
performBatteryHeaderClick();
@@ -216,6 +182,8 @@
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
final List<PreferenceController> controllers = new ArrayList<>();
+ mBatteryHeaderPreferenceController = new BatteryHeaderPreferenceController(context);
+ controllers.add(mBatteryHeaderPreferenceController);
controllers.add(new AutoBrightnessPreferenceController(context, KEY_AUTO_BRIGHTNESS));
controllers.add(new TimeoutPreferenceController(context, KEY_SCREEN_TIMEOUT));
controllers.add(new BatterySaverController(context, getLifecycle()));
@@ -340,7 +308,7 @@
*
* @return A sorted list of apps using power.
*/
- private static List<BatterySipper> getCoalescedUsageList(final List<BatterySipper> sippers) {
+ private List<BatterySipper> getCoalescedUsageList(final List<BatterySipper> sippers) {
final SparseArray<BatterySipper> uidList = new SparseArray<>();
final ArrayList<BatterySipper> results = new ArrayList<>();
@@ -415,12 +383,7 @@
}
// The sort order must have changed, so re-sort based on total power use.
- Collections.sort(results, new Comparator<BatterySipper>() {
- @Override
- public int compare(BatterySipper a, BatterySipper b) {
- return Double.compare(b.totalPowerMah, a.totalPowerMah);
- }
- });
+ mBatteryUtils.sortUsageList(results);
return results;
}
@@ -443,7 +406,7 @@
new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
BatteryInfo batteryInfo = BatteryInfo.getBatteryInfo(context, batteryBroadcast,
mStatsHelper.getStats(), elapsedRealtimeUs, false);
- updateHeaderPreference(batteryInfo);
+ mBatteryHeaderPreferenceController.updateHeaderPreference(batteryInfo);
final TypedValue value = new TypedValue();
context.getTheme().resolveAttribute(android.R.attr.colorControlNormal, value, true);
@@ -451,20 +414,23 @@
final int dischargeAmount = USE_FAKE_DATA ? 5000
: stats != null ? stats.getDischargeAmount(mStatsType) : 0;
- final long runningTime = calculateRunningTimeBasedOnStatsType();
+ final long lastFullChargeTime = mBatteryUtils.calculateLastFullChargeTime(mStatsHelper,
+ System.currentTimeMillis());
updateScreenPreference();
- updateLastFullChargePreference(runningTime);
+ updateLastFullChargePreference(lastFullChargeTime);
- final CharSequence timeSequence = Utils.formatElapsedTime(context, runningTime, false);
- mAppListGroup.setTitle(
- TextUtils.expandTemplate(getText(R.string.power_usage_list_summary), timeSequence));
+ final CharSequence timeSequence = Utils.formatElapsedTime(context, lastFullChargeTime,
+ false);
+ final int resId = mShowAllApps ? R.string.power_usage_list_summary_device
+ : R.string.power_usage_list_summary;
+ mAppListGroup.setTitle(TextUtils.expandTemplate(getText(resId), timeSequence));
if (averagePower >= MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP || USE_FAKE_DATA) {
final List<BatterySipper> usageList = getCoalescedUsageList(
USE_FAKE_DATA ? getFakeStats() : mStatsHelper.getUsageList());
-
double hiddenPowerMah = mShowAllApps ? 0 :
mBatteryUtils.removeHiddenBatterySippers(usageList);
+ mBatteryUtils.sortUsageList(usageList);
final int numSippers = usageList.size();
for (int i = 0; i < numSippers; i++) {
@@ -587,58 +553,6 @@
}
@VisibleForTesting
- void updateHeaderPreference(BatteryInfo info) {
- final Context context = getContext();
- if (context == null) {
- return;
- }
- final BatteryMeterView batteryView = (BatteryMeterView) mBatteryLayoutPref
- .findViewById(R.id.battery_header_icon);
- final TextView timeText = (TextView) mBatteryLayoutPref.findViewById(R.id.battery_percent);
- final TextView summary1 = (TextView) mBatteryLayoutPref.findViewById(R.id.summary1);
- if (info.remainingLabel == null ) {
- summary1.setText(info.statusLabel);
- } else {
- summary1.setText(info.remainingLabel);
- }
- batteryView.setCharging(!info.discharging);
- startBatteryHeaderAnimationIfNecessary(batteryView, timeText, mBatteryLevel,
- info.batteryLevel);
- }
-
- @VisibleForTesting
- void initHeaderPreference() {
- final BatteryMeterView batteryView = (BatteryMeterView) mBatteryLayoutPref
- .findViewById(R.id.battery_header_icon);
- final TextView timeText = (TextView) mBatteryLayoutPref.findViewById(R.id.battery_percent);
-
- batteryView.setBatteryLevel(mBatteryLevel);
- timeText.setText(Utils.formatPercentage(mBatteryLevel));
- }
-
- @VisibleForTesting
- void startBatteryHeaderAnimationIfNecessary(BatteryMeterView batteryView, TextView timeTextView,
- int prevLevel, int currentLevel) {
- mBatteryLevel = currentLevel;
- final int diff = Math.abs(prevLevel - currentLevel);
- if (diff != 0) {
- final ValueAnimator animator = ValueAnimator.ofInt(prevLevel, currentLevel);
- animator.setDuration(BATTERY_ANIMATION_DURATION_MS_PER_LEVEL * diff);
- animator.setInterpolator(AnimationUtils.loadInterpolator(getContext(),
- android.R.interpolator.fast_out_slow_in));
- animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
- @Override
- public void onAnimationUpdate(ValueAnimator animation) {
- final Integer level = (Integer) animation.getAnimatedValue();
- batteryView.setBatteryLevel(level);
- timeTextView.setText(Utils.formatPercentage(level));
- }
- });
- animator.start();
- }
- }
-
- @VisibleForTesting
double calculatePercentage(double powerUsage, double dischargeAmount) {
final double totalPower = mStatsHelper.getTotalPower();
return totalPower == 0 ? 0 :
diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
index f1c7455..12f28d2 100644
--- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
@@ -20,21 +20,27 @@
import android.content.res.Resources;
import android.hardware.Sensor;
import android.hardware.SensorManager;
+import android.os.UserHandle;
+import android.os.UserManager;
import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.text.TextUtils;
import com.android.settings.R;
+import com.android.settings.Utils;
import com.android.settings.core.lifecycle.Lifecycle;
public class DoubleTwistPreferenceController extends GesturePreferenceController {
private static final String PREF_KEY_VIDEO = "gesture_double_twist_video";
private final String mDoubleTwistPrefKey;
+ private final UserManager mUserManager;
public DoubleTwistPreferenceController(Context context, Lifecycle lifecycle, String key) {
super(context, lifecycle);
mDoubleTwistPrefKey = key;
+ mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
}
@Override
@@ -55,9 +61,14 @@
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
- final boolean enabled = (boolean) newValue;
+ final int enabled = (boolean) newValue ? 1 : 0;
Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, enabled ? 1 : 0);
+ Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, enabled);
+ final int managedProfileUserId = getManagedProfileUserId();
+ if (managedProfileUserId != UserHandle.USER_NULL) {
+ Settings.Secure.putIntForUser(mContext.getContentResolver(),
+ Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, enabled, managedProfileUserId);
+ }
return true;
}
@@ -68,6 +79,11 @@
return doubleTwistEnabled != 0;
}
+ @VisibleForTesting
+ int getManagedProfileUserId() {
+ return Utils.getManagedProfileId(mUserManager, UserHandle.myUserId());
+ }
+
private boolean hasSensor(int nameResId, int vendorResId) {
final Resources resources = mContext.getResources();
final String name = resources.getString(nameResId);
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index 19a22ba..fab700b 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -18,7 +18,10 @@
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothPan;
import android.bluetooth.BluetoothProfile;
+import android.content.BroadcastReceiver;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.database.ContentObserver;
import android.net.ConnectivityManager;
import android.net.Uri;
@@ -67,6 +70,7 @@
private SettingObserver mAirplaneModeObserver;
private Preference mPreference;
+ private TetherBroadcastReceiver mTetherReceiver;
@VisibleForTesting(otherwise = VisibleForTesting.NONE)
TetherPreferenceController() {
@@ -131,6 +135,11 @@
if (mAirplaneModeObserver == null) {
mAirplaneModeObserver = new SettingObserver();
}
+ if (mTetherReceiver == null) {
+ mTetherReceiver = new TetherBroadcastReceiver();
+ }
+ mContext.registerReceiver(
+ mTetherReceiver, new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
mContext.getContentResolver()
.registerContentObserver(mAirplaneModeObserver.uri, false, mAirplaneModeObserver);
}
@@ -140,6 +149,9 @@
if (mAirplaneModeObserver != null) {
mContext.getContentResolver().unregisterContentObserver(mAirplaneModeObserver);
}
+ if (mTetherReceiver != null) {
+ mContext.unregisterReceiver(mTetherReceiver);
+ }
}
@Override
@@ -238,4 +250,14 @@
}
}
}
+
+ @VisibleForTesting
+ class TetherBroadcastReceiver extends BroadcastReceiver {
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ updateSummary();
+ }
+
+ }
}
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 2035cd2..6c4f27c 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -95,7 +95,6 @@
getPreferenceScreen().setOrderingAsAdded(true);
setupBlock();
addHeaderPref();
- addAppLinkPref();
mShowLegacyChannelConfig = mBackend.onlyHasDefaultChannel(mAppRow.pkg, mAppRow.uid);
if (mShowLegacyChannelConfig) {
@@ -120,6 +119,7 @@
return;
}
populateChannelList();
+ addAppLinkPref();
}
}.execute();
}
@@ -203,7 +203,8 @@
final NotificationChannel channel) {
MasterSwitchPreference channelPref = new MasterSwitchPreference(
getPrefContext());
- channelPref.setSwitchEnabled(mSuspendedAppsAdmin == null && !mAppRow.systemApp);
+ channelPref.setSwitchEnabled(mSuspendedAppsAdmin == null
+ && isChannelBlockable(mAppRow.systemApp, channel));
channelPref.setKey(channel.getId());
channelPref.setTitle(channel.getName());
channelPref.setChecked(channel.getImportance() != IMPORTANCE_NONE);
diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java
index 27e60c7..3ae0bfa 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -22,15 +22,17 @@
import android.app.Activity;
import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
import android.app.NotificationManager;
import android.content.Intent;
-import android.content.pm.UserInfo;
import android.net.Uri;
import android.os.Bundle;
-import android.os.UserHandle;
+import android.os.AsyncTask;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.text.TextUtils;
+import android.text.BidiFormatter;
+import android.text.SpannableStringBuilder;
import android.util.ArrayMap;
import android.util.Log;
import android.view.LayoutInflater;
@@ -38,7 +40,6 @@
import android.widget.Switch;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.widget.LockPatternUtils;
import com.android.settings.AppHeader;
import com.android.settings.R;
import com.android.settings.RingtonePreference;
@@ -64,6 +65,8 @@
private RestrictedSwitchPreference mVibrate;
private NotificationSoundPreference mRingtone;
private FooterPreference mFooter;
+ private NotificationChannelGroup mChannelGroup;
+ private AppHeaderController mHeaderPref;
@Override
public int getMetricsCategory() {
@@ -93,6 +96,27 @@
mShowLegacyChannelConfig = true;
} else {
populateUpgradedChannelPrefs();
+
+ if (mChannel.getGroup() != null) {
+ // Go look up group name
+ new AsyncTask<Void, Void, Void>() {
+ @Override
+ protected Void doInBackground(Void... unused) {
+ if (mChannel.getGroup() != null) {
+ mChannelGroup = mBackend.getGroup(mChannel.getGroup(), mPkg, mUid);
+ }
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void unused) {
+ if (getHost() == null || mChannelGroup == null) {
+ return;
+ }
+ setChannelGroupLabel(mChannelGroup.getName());
+ }
+ }.execute();
+ }
}
updateDependents(mChannel.getImportance() == IMPORTANCE_NONE);
@@ -114,9 +138,10 @@
rows.put(mAppRow.pkg, mAppRow);
collectConfigActivities(rows);
final Activity activity = getActivity();
- final Preference pref = FeatureFactory.getFactory(activity)
+ mHeaderPref = FeatureFactory.getFactory(activity)
.getApplicationFeatureProvider(activity)
- .newAppHeaderController(this /* fragment */, null /* appHeader */)
+ .newAppHeaderController(this /* fragment */, null /* appHeader */);
+ final Preference pref = mHeaderPref
.setIcon(mAppRow.icon)
.setLabel(mChannel.getName())
.setSummary(mAppRow.label)
@@ -128,6 +153,20 @@
getPreferenceScreen().addPreference(pref);
}
+ private void setChannelGroupLabel(CharSequence groupName) {
+ final SpannableStringBuilder summary = new SpannableStringBuilder();
+ BidiFormatter bidi = BidiFormatter.getInstance();
+ summary.append(bidi.unicodeWrap(mAppRow.label.toString()));
+ if (groupName != null) {
+ summary.append(bidi.unicodeWrap(mContext.getText(
+ R.string.notification_header_divider_symbol_with_spaces)));
+ summary.append(bidi.unicodeWrap(groupName.toString()));
+ }
+ final Activity activity = getActivity();
+ mHeaderPref.setSummary(summary.toString());
+ mHeaderPref.done(activity, getPrefContext());
+ }
+
private void addFooterPref() {
if (!TextUtils.isEmpty(mChannel.getDescription())) {
FooterPreference descPref = new FooterPreference(getPrefContext());
@@ -175,6 +214,7 @@
private void setupVibrate() {
mVibrate = (RestrictedSwitchPreference) findPreference(KEY_VIBRATE);
mVibrate.setDisabledByAdmin(mSuspendedAppsAdmin);
+ mVibrate.setEnabled(!(mAppRow.lockedImportance || mVibrate.isDisabledByAdmin()));
mVibrate.setChecked(mChannel.shouldVibrate());
mVibrate.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
@@ -191,6 +231,7 @@
private void setupRingtone() {
mRingtone = (NotificationSoundPreference) findPreference(KEY_RINGTONE);
mRingtone.setRingtone(mChannel.getSound());
+ mRingtone.setEnabled(!(mAppRow.lockedImportance));
mRingtone.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -232,7 +273,7 @@
mBlockBar.setKey(KEY_BLOCK);
getPreferenceScreen().addPreference(mBlockBar);
- if (mAppRow.systemApp && mChannel.getImportance() != NotificationManager.IMPORTANCE_NONE) {
+ if (!isChannelBlockable(mAppRow.systemApp, mChannel)) {
setVisible(mBlockBar, false);
}
@@ -246,12 +287,15 @@
channelArgs.putBoolean(AppHeader.EXTRA_HIDE_INFO_BUTTON, true);
channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
channelArgs.putString(Settings.EXTRA_CHANNEL_ID, mChannel.getId());
- Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
- ChannelImportanceSettings.class.getName(),
- channelArgs, null, R.string.notification_importance_title, null,
- false, getMetricsCategory());
- mImportance.setIntent(channelIntent);
- mImportance.setEnabled(mSuspendedAppsAdmin == null);
+ mImportance.setEnabled(mSuspendedAppsAdmin == null && !mAppRow.lockedImportance);
+ // Set up intent to show importance selection only if this setting is enabled.
+ if (mImportance.isEnabled()) {
+ Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
+ ChannelImportanceSettings.class.getName(),
+ channelArgs, null, R.string.notification_importance_title, null,
+ false, getMetricsCategory());
+ mImportance.setIntent(channelIntent);
+ }
mImportance.setSummary(getImportanceSummary(mChannel.getImportance()));
}
@@ -345,7 +389,7 @@
if (mAppLink != null) {
setVisible(mAppLink, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
}
- if (mFooter !=null) {
+ if (mFooter != null) {
setVisible(mFooter, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
}
}
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index d9da051..a06d069 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -65,7 +65,10 @@
final PulseNotificationPreferenceController pulseController =
new PulseNotificationPreferenceController(context);
final LockScreenNotificationPreferenceController lockScreenNotificationController =
- new LockScreenNotificationPreferenceController(context);
+ new LockScreenNotificationPreferenceController(context,
+ "lock_screen_notifications",
+ "lock_screen_notifications_profile_header",
+ "lock_screen_notifications_profile");
if (lifecycle != null) {
lifecycle.addObserver(pulseController);
lifecycle.addObserver(lockScreenNotificationController);
diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
index 73469b0..1f0c4a8 100644
--- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
@@ -26,6 +26,7 @@
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
import android.util.Log;
import com.android.internal.widget.LockPatternUtils;
@@ -46,11 +47,10 @@
Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
private static final String TAG = "LockScreenNotifPref";
- private static final String KEY_LOCK_SCREEN_NOTIFICATIONS = "lock_screen_notifications";
- private static final String KEY_LOCK_SCREEN_PROFILE_HEADER =
- "lock_screen_notifications_profile_header";
- private static final String KEY_LOCK_SCREEN_PROFILE_NOTIFICATIONS =
- "lock_screen_notifications_profile";
+
+ private final String mSettingKey;
+ private final String mWorkSettingCategoryKey;
+ private final String mWorkSettingKey;
private RestrictedDropDownPreference mLockscreen;
private RestrictedDropDownPreference mLockscreenProfile;
@@ -64,7 +64,16 @@
private int mLockscreenSelectedValueProfile;
public LockScreenNotificationPreferenceController(Context context) {
+ this(context, null, null, null);
+ }
+
+ public LockScreenNotificationPreferenceController(Context context,
+ String settingKey, String workSettingCategoryKey, String workSettingKey) {
super(context);
+ mSettingKey = settingKey;
+ mWorkSettingCategoryKey = workSettingCategoryKey;
+ mWorkSettingKey = workSettingKey;
+
mProfileChallengeUserId = Utils.getManagedProfileId(
UserManager.get(context), UserHandle.myUserId());
final LockPatternUtils utils = new LockPatternUtils(context);
@@ -79,17 +88,17 @@
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mLockscreen =
- (RestrictedDropDownPreference) screen.findPreference(KEY_LOCK_SCREEN_NOTIFICATIONS);
+ (RestrictedDropDownPreference) screen.findPreference(mSettingKey);
if (mLockscreen == null) {
- Log.i(TAG, "Preference not found: " + KEY_LOCK_SCREEN_NOTIFICATIONS);
+ Log.i(TAG, "Preference not found: " + mSettingKey);
return;
}
if (mProfileChallengeUserId != UserHandle.USER_NULL) {
mLockscreenProfile = (RestrictedDropDownPreference) screen.findPreference(
- KEY_LOCK_SCREEN_PROFILE_NOTIFICATIONS);
+ mWorkSettingKey);
} else {
- removePreference(screen, KEY_LOCK_SCREEN_PROFILE_NOTIFICATIONS);
- removePreference(screen, KEY_LOCK_SCREEN_PROFILE_HEADER);
+ removePreference(screen, mWorkSettingKey);
+ removePreference(screen, mWorkSettingCategoryKey);
}
mSettingObserver = new SettingObserver();
initLockScreenNotificationPrefDisplay();
@@ -136,7 +145,7 @@
private void initLockscreenNotificationPrefForProfile() {
if (mLockscreenProfile == null) {
- Log.i(TAG, "Preference not found: " + KEY_LOCK_SCREEN_PROFILE_NOTIFICATIONS);
+ Log.i(TAG, "Preference not found: " + mWorkSettingKey);
return;
}
ArrayList<CharSequence> entries = new ArrayList<>();
@@ -205,8 +214,8 @@
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
- switch (preference.getKey()) {
- case KEY_LOCK_SCREEN_PROFILE_NOTIFICATIONS: {
+ final String key = preference.getKey();
+ if (TextUtils.equals(mWorkSettingKey, key)) {
final int val = Integer.parseInt((String) newValue);
if (val == mLockscreenSelectedValueProfile) {
return false;
@@ -223,8 +232,7 @@
enabled ? 1 : 0, mProfileChallengeUserId);
mLockscreenSelectedValueProfile = val;
return true;
- }
- case KEY_LOCK_SCREEN_NOTIFICATIONS: {
+ } else if (TextUtils.equals(mSettingKey, key)) {
final int val = Integer.parseInt((String) newValue);
if (val == mLockscreenSelectedValue) {
return false;
@@ -238,10 +246,8 @@
Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, enabled ? 1 : 0);
mLockscreenSelectedValue = val;
return true;
- }
- default:
- return false;
}
+ return false;
}
private void setRestrictedIfNotificationFeaturesDisabled(CharSequence entry,
@@ -295,6 +301,7 @@
final boolean enabled = getLockscreenNotificationsEnabled(mProfileChallengeUserId);
final boolean allowPrivate = !mSecureProfile
|| getLockscreenAllowPrivateNotifications(mProfileChallengeUserId);
+ mLockscreenProfile.setSummary("%s");
mLockscreenSelectedValueProfile = !enabled
? R.string.lock_screen_notifications_summary_disable_profile
: (allowPrivate ? R.string.lock_screen_notifications_summary_show_profile
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 84d7e31..96737db 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -122,6 +122,19 @@
}
}
+
+ public NotificationChannelGroup getGroup(String groupId, String pkg, int uid) {
+ if (groupId == null) {
+ return null;
+ }
+ try {
+ return sINM.getNotificationChannelGroupForPackage(groupId, pkg, uid);
+ } catch (Exception e) {
+ Log.w(TAG, "Error calling NoMan", e);
+ return null;
+ }
+ }
+
public ParceledListSlice<NotificationChannelGroup> getChannelGroups(String pkg, int uid) {
try {
return sINM.getNotificationChannelGroupsForPackage(pkg, uid, false);
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index 695c796..717cf08 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -263,7 +263,7 @@
}
protected void addAppLinkPref() {
- if (mAppRow.settingsIntent != null) {
+ if (mAppRow.settingsIntent != null && mAppLink == null) {
mAppLink = new Preference(getPrefContext());
mAppLink.setKey(KEY_APP_LINK);
mAppLink.setOrder(500);
@@ -293,6 +293,8 @@
private void setupImportanceToggle() {
mImportanceToggle = (RestrictedSwitchPreference) findPreference(KEY_ALLOW_SOUND);
mImportanceToggle.setDisabledByAdmin(mSuspendedAppsAdmin);
+ mImportanceToggle.setEnabled(!(mAppRow.lockedImportance
+ || mImportanceToggle.isDisabledByAdmin()));
mImportanceToggle.setChecked(mChannel.getImportance() >= IMPORTANCE_DEFAULT
|| mChannel.getImportance() == IMPORTANCE_UNSPECIFIED);
mImportanceToggle.setOnPreferenceChangeListener(
@@ -313,6 +315,7 @@
protected void setupPriorityPref(boolean priority) {
mPriority = (RestrictedSwitchPreference) findPreference(KEY_BYPASS_DND);
mPriority.setDisabledByAdmin(mSuspendedAppsAdmin);
+ mPriority.setEnabled(!(mAppRow.lockedImportance || mPriority.isDisabledByAdmin()));
mPriority.setChecked(priority);
mPriority.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
@@ -443,4 +446,12 @@
return lockscreenSecure;
}
+
+ protected boolean isChannelBlockable(boolean systemApp, NotificationChannel channel) {
+ if (!mAppRow.systemApp) {
+ return true;
+ }
+ return channel.isBlockableSystem()
+ || channel.getImportance() == NotificationManager.IMPORTANCE_NONE;
+ }
}
diff --git a/src/com/android/settings/notification/SettingPref.java b/src/com/android/settings/notification/SettingPref.java
index 18efc33..cdbd5b3 100644
--- a/src/com/android/settings/notification/SettingPref.java
+++ b/src/com/android/settings/notification/SettingPref.java
@@ -121,6 +121,19 @@
if (mTwoState != null) {
mTwoState.setChecked(val != 0);
} else if (mDropDown != null) {
+ if (mValues != null) {
+ int index = 0;
+ for (int len = mValues.length; index < len; index++) {
+ if (mValues[index] == val) {
+ break;
+ }
+ }
+
+ if (index < mValues.length) {
+ CharSequence entry = mDropDown.getEntries()[index];
+ mDropDown.setSummary(entry);
+ }
+ }
mDropDown.setValue(Integer.toString(val));
}
}
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index 8a51961..b4fe6d8 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -91,9 +91,10 @@
mStopped = true;
if (mVolumizer != null) {
mVolumizer.stop();
+ mVolumizer = null;
}
}
-
+
@Override
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);
diff --git a/src/com/android/settings/search2/DatabaseResultLoader.java b/src/com/android/settings/search2/DatabaseResultLoader.java
index 5892ebc..70cefe5 100644
--- a/src/com/android/settings/search2/DatabaseResultLoader.java
+++ b/src/com/android/settings/search2/DatabaseResultLoader.java
@@ -323,18 +323,18 @@
for (int j = i - 1; j >= 0; j--) {
primaryResult = results.get(j);
if (areDuplicateResults(primaryResult, secondaryResult)) {
-
if (primaryResult.viewType != ResultPayload.PayloadType.INTENT) {
// Case where both payloads are inline
results.remove(i);
break;
} else if (secondaryResult.viewType != ResultPayload.PayloadType.INTENT) {
- // Case where only second result is inline
+ // Case where only second result is inline.
results.remove(j);
i--; // shift the top index to reflect the lower element being removed
} else {
- // Case where both payloads are intent
+ // Case where both payloads are intent.
results.remove(i);
+ break;
}
}
}
diff --git a/src/com/android/settings/search2/HeaderDecorator.java b/src/com/android/settings/search2/HeaderDecorator.java
new file mode 100644
index 0000000..786692e
--- /dev/null
+++ b/src/com/android/settings/search2/HeaderDecorator.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2017 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.search2;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Rect;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import com.android.settings.R;
+
+public class HeaderDecorator extends RecyclerView.ItemDecoration {
+ @Override
+ public void getItemOffsets(Rect outRect, View view, RecyclerView parent,
+ RecyclerView.State state) {
+ super.getItemOffsets(outRect, view, parent, state);
+ if (parent.getChildAdapterPosition(view) > 0) {
+ return;
+ }
+
+ Context context = view.getContext();
+ TypedArray ta = context.obtainStyledAttributes(new int[]{android.R.attr.actionBarSize});
+ outRect.top = ta.getDimensionPixelSize(0, 0);
+ ta.recycle();
+
+ outRect.top += 2 * context.getResources().getDimensionPixelSize(R.dimen.search_bar_margin);
+ }
+}
diff --git a/src/com/android/settings/search2/SearchFeatureProviderImpl.java b/src/com/android/settings/search2/SearchFeatureProviderImpl.java
index 4e47f9d..1179c51 100644
--- a/src/com/android/settings/search2/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search2/SearchFeatureProviderImpl.java
@@ -54,13 +54,10 @@
String menuTitle = activity.getString(R.string.search_menu);
MenuItem menuItem = menu.add(Menu.NONE, Menu.NONE, Menu.NONE, menuTitle)
.setIcon(R.drawable.ic_search_24dp)
- .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
- @Override
- public boolean onMenuItemClick(MenuItem item) {
- Intent intent = new Intent(activity, SearchActivity.class);
- activity.startActivity(intent);
- return true;
- }
+ .setOnMenuItemClickListener(item -> {
+ Intent intent = new Intent(activity, SearchActivity.class);
+ activity.startActivity(intent);
+ return true;
});
menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
diff --git a/src/com/android/settings/search2/SearchFragment.java b/src/com/android/settings/search2/SearchFragment.java
index 2a5c961..b4d443b 100644
--- a/src/com/android/settings/search2/SearchFragment.java
+++ b/src/com/android/settings/search2/SearchFragment.java
@@ -16,7 +16,6 @@
package com.android.settings.search2;
-import android.app.ActionBar;
import android.app.Activity;
import android.app.LoaderManager;
import android.content.Context;
@@ -32,7 +31,6 @@
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
import android.widget.LinearLayout;
-import android.widget.LinearLayout.LayoutParams;
import android.widget.SearchView;
import com.android.internal.logging.nano.MetricsProto;
@@ -60,9 +58,6 @@
LoaderManager.LoaderCallbacks<List<? extends SearchResult>>, IndexingCallback {
private static final String TAG = "SearchFragment";
- @VisibleForTesting
- static final int SEARCH_TAG = "SearchViewTag".hashCode();
-
// State values
private static final String STATE_QUERY = "state_query";
private static final String STATE_SHOWING_SAVED_QUERY = "state_showing_saved_query";
@@ -95,12 +90,12 @@
@VisibleForTesting
SavedQueryController mSavedQueryController;
- @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+ @VisibleForTesting
SearchFeatureProvider mSearchFeatureProvider;
private SearchResultsAdapter mSearchAdapter;
- @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+ @VisibleForTesting
RecyclerView mResultsRecyclerView;
@VisibleForTesting
SearchView mSearchView;
@@ -149,13 +144,6 @@
}
final Activity activity = getActivity();
- final ActionBar actionBar = activity.getActionBar();
- mSearchView = makeSearchView(actionBar, mQuery);
- actionBar.setCustomView(mSearchView);
- actionBar.setDisplayShowCustomEnabled(true);
- actionBar.setDisplayShowTitleEnabled(false);
- mSearchView.requestFocus();
-
// Run the Index update only if we have some space
if (!Utils.isLowStorage(activity)) {
mSearchFeatureProvider.updateIndex(activity, this /* indexingCallback */);
@@ -172,8 +160,14 @@
mResultsRecyclerView.setAdapter(mSearchAdapter);
mResultsRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mResultsRecyclerView.addOnScrollListener(mScrollListener);
+ mResultsRecyclerView.addItemDecoration(new HeaderDecorator());
mNoResultsView = view.findViewById(R.id.no_results_layout);
+
+ mSearchView = view.findViewById(R.id.search_view);
+ mSearchView.setQuery(mQuery, false /* submitQuery */);
+ mSearchView.setOnQueryTextListener(this);
+ mSearchView.requestFocus();
return view;
}
@@ -347,19 +341,6 @@
onQueryTextChange(query);
}
- @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
- SearchView makeSearchView(ActionBar actionBar, String query) {
- final SearchView searchView = new SearchView(actionBar.getThemedContext());
- searchView.setIconifiedByDefault(false);
- searchView.setQuery(query, false /* submitQuery */);
- searchView.setOnQueryTextListener(this);
- searchView.setTag(SEARCH_TAG, searchView);
- final LayoutParams lp =
- new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
- searchView.setLayoutParams(lp);
- return searchView;
- }
-
private void hideKeyboard() {
final Activity activity = getActivity();
if (activity != null) {
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index b781fbb..3137863 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -18,6 +18,8 @@
import android.content.Context;
import android.provider.SearchIndexableResource;
+import android.support.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.accounts.AddUserWhenLockedPreferenceController;
@@ -26,6 +28,7 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.notification.LockScreenNotificationPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -38,6 +41,15 @@
private static final String TAG = "LockscreenDashboardFragment";
+ @VisibleForTesting
+ static final String KEY_LOCK_SCREEN_NOTIFICATON = "security_setting_lock_screen_notif";
+ @VisibleForTesting
+ static final String KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER =
+ "security_setting_lock_screen_notif_work_header";
+ @VisibleForTesting
+ static final String KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE =
+ "security_setting_lock_screen_notif_work";
+
private OwnerInfoPreferenceController mOwnerInfoPreferenceController;
@Override
@@ -60,7 +72,10 @@
final List<PreferenceController> controllers = new ArrayList<>();
final Lifecycle lifecycle = getLifecycle();
final LockScreenNotificationPreferenceController notificationController =
- new LockScreenNotificationPreferenceController(context);
+ new LockScreenNotificationPreferenceController(context,
+ KEY_LOCK_SCREEN_NOTIFICATON,
+ KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER,
+ KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE);
lifecycle.addObserver(notificationController);
controllers.add(notificationController);
final AddUserWhenLockedPreferenceController addUserWhenLockedController =
diff --git a/src/com/android/settings/system/FactoryResetPreferenceController.java b/src/com/android/settings/system/FactoryResetPreferenceController.java
index 38afd16..a3cf10a 100644
--- a/src/com/android/settings/system/FactoryResetPreferenceController.java
+++ b/src/com/android/settings/system/FactoryResetPreferenceController.java
@@ -24,6 +24,7 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
+import com.android.settings.Utils;
import com.android.settings.core.PreferenceController;
import java.util.List;
@@ -41,10 +42,10 @@
mAm = (AccountManager) context.getSystemService(Context.ACCOUNT_SERVICE);
}
- /** Hide "Factory reset" settings for secondary users. */
+ /** Hide "Factory reset" settings for secondary users, except demo users. */
@Override
public boolean isAvailable() {
- return mUm.isAdminUser();
+ return mUm.isAdminUser() || Utils.isCarrierDemoUser(mContext);
}
@Override
diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java
index 0feaa07..7a13a0e 100644
--- a/src/com/android/settings/widget/DonutView.java
+++ b/src/com/android/settings/widget/DonutView.java
@@ -17,12 +17,14 @@
import android.content.Context;
import android.graphics.Canvas;
+import android.graphics.ColorFilter;
import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
import android.text.TextPaint;
import android.util.AttributeSet;
import android.view.View;
-import com.android.internal.util.Preconditions;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -50,20 +52,26 @@
super(context, attrs);
mDeviceDensity = getResources().getDisplayMetrics().density;
mStrokeWidth = 6f * mDeviceDensity;
+ final ColorFilter mAccentColorFilter =
+ new PorterDuffColorFilter(
+ Utils.getColorAttr(context, android.R.attr.colorAccent),
+ PorterDuff.Mode.SRC_IN);
mBackgroundCircle = new Paint();
mBackgroundCircle.setAntiAlias(true);
mBackgroundCircle.setStrokeCap(Paint.Cap.BUTT);
mBackgroundCircle.setStyle(Paint.Style.STROKE);
mBackgroundCircle.setStrokeWidth(mStrokeWidth);
- mBackgroundCircle.setColor(getResources().getColor(R.color.donut_background_grey));
+ mBackgroundCircle.setColorFilter(mAccentColorFilter);
+ mBackgroundCircle.setColor(context.getColor(R.color.meter_background_color));
mFilledArc = new Paint();
mFilledArc.setAntiAlias(true);
mFilledArc.setStrokeCap(Paint.Cap.BUTT);
mFilledArc.setStyle(Paint.Style.STROKE);
mFilledArc.setStrokeWidth(mStrokeWidth);
- mFilledArc.setColor(Utils.getColorAccent(getContext()));
+ mFilledArc.setColor(Utils.getDefaultColor(mContext, R.color.meter_consumed_color));
+ mFilledArc.setColorFilter(mAccentColorFilter);
mTextPaint = new TextPaint();
mTextPaint.setColor(Utils.getColorAccent(getContext()));
@@ -86,11 +94,25 @@
}
private void drawDonut(Canvas canvas) {
- canvas.drawArc(0 + mStrokeWidth, 0 + mStrokeWidth, getWidth() - mStrokeWidth,
- getHeight() - mStrokeWidth, TOP, 360, false, mBackgroundCircle);
+ canvas.drawArc(
+ 0 + mStrokeWidth,
+ 0 + mStrokeWidth,
+ getWidth() - mStrokeWidth,
+ getHeight() - mStrokeWidth,
+ TOP,
+ 360,
+ false,
+ mBackgroundCircle);
- canvas.drawArc(0 + mStrokeWidth, 0 + mStrokeWidth, getWidth() - mStrokeWidth,
- getHeight() - mStrokeWidth, TOP, (360 * mPercent / 100), false, mFilledArc);
+ canvas.drawArc(
+ 0 + mStrokeWidth,
+ 0 + mStrokeWidth,
+ getWidth() - mStrokeWidth,
+ getHeight() - mStrokeWidth,
+ TOP,
+ (360 * mPercent / 100),
+ false,
+ mFilledArc);
}
private void drawInnerText(Canvas canvas) {
diff --git a/src/com/android/settings/widget/FooterPreference.java b/src/com/android/settings/widget/FooterPreference.java
index 9cb9e11..84e3ed8 100644
--- a/src/com/android/settings/widget/FooterPreference.java
+++ b/src/com/android/settings/widget/FooterPreference.java
@@ -50,11 +50,14 @@
super.onBindViewHolder(holder);
TextView title = holder.itemView.findViewById(android.R.id.title);
title.setMovementMethod(new LinkMovementMethod());
+ title.setClickable(false);
+ title.setLongClickable(false);
}
private void init() {
setIcon(R.drawable.ic_info_outline_24dp);
setKey(KEY_FOOTER);
setOrder(ORDER_FOOTER);
+ setSelectable(false);
}
}
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 38fed94..7dacaf5 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -395,7 +395,10 @@
int wifiApState = wifiManager.getWifiApState();
if (desiredState && ((wifiApState == WifiManager.WIFI_AP_STATE_ENABLING) ||
(wifiApState == WifiManager.WIFI_AP_STATE_ENABLED))) {
- wifiManager.setWifiApEnabled(null, false);
+ final ConnectivityManager connectivityManager =
+ (ConnectivityManager) context.getSystemService(
+ Context.CONNECTIVITY_SERVICE);
+ connectivityManager.stopTethering(ConnectivityManager.TETHERING_WIFI);
}
wifiManager.setWifiEnabled(desiredState);
diff --git a/src/com/android/settings/wifi/ConnectivityManagerWrapper.java b/src/com/android/settings/wifi/ConnectivityManagerWrapper.java
new file mode 100644
index 0000000..7317666
--- /dev/null
+++ b/src/com/android/settings/wifi/ConnectivityManagerWrapper.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017 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.wifi;
+
+import android.net.ConnectivityManager;
+
+/**
+ * Wrapper around {@link ConnectivityManager} to facilitate unit testing.
+ */
+public class ConnectivityManagerWrapper {
+ private final ConnectivityManager mConnectivityManager;
+
+ public ConnectivityManagerWrapper(ConnectivityManager connectivityManager) {
+ mConnectivityManager = connectivityManager;
+ }
+
+ /**
+ * {@link ConnectivityManager#stopTethering}
+ */
+ public void stopTethering(int type) {
+ mConnectivityManager.stopTethering(type);
+ }
+}
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index 1a60256..bf67565 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -38,7 +38,7 @@
import com.android.settings.search.SearchIndexableRaw;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.AccessPointPreference;
-import com.android.settingslib.wifi.WifiTracker;
+import com.android.settingslib.wifi.WifiSavedConfigUtils;
import java.util.ArrayList;
import java.util.Arrays;
@@ -124,7 +124,8 @@
PreferenceScreen preferenceScreen = getPreferenceScreen();
final Context context = getPrefContext();
- final List<AccessPoint> accessPoints = getSavedConfigs(context, mWifiManager);
+ final List<AccessPoint> accessPoints =
+ WifiSavedConfigUtils.getAllConfigs(context, mWifiManager);
Collections.sort(accessPoints, SAVED_NETWORK_COMPARATOR);
preferenceScreen.removeAll();
@@ -142,39 +143,6 @@
}
}
- /**
- * Retrieved the list of saved network configurations from {@link WifiManager}.
- * Each configuration is represented by {@link AccessPoint}.
- *
- * @param context The application context
- * @param wifiManager An instance of {@link WifiManager}
- * @return List of {@link AccessPoint}
- */
- private static List<AccessPoint> getSavedConfigs(Context context, WifiManager wifiManager) {
- List<AccessPoint> savedConfigs = new ArrayList<>();
- List<WifiConfiguration> savedNetworks = wifiManager.getConfiguredNetworks();
- for (WifiConfiguration network : savedNetworks) {
- // Configuration for Passpoint network is configured temporary by WifiService for
- // connection attempt only. The underlying configuration is saved as Passpoint
- // configuration, which will be retrieved with WifiManager#getPasspointConfiguration
- // call below.
- if (network.isPasspoint()) {
- continue;
- }
- savedConfigs.add(new AccessPoint(context, network));
- }
- try {
- List<PasspointConfiguration> savedPasspointConfigs =
- wifiManager.getPasspointConfigurations();
- for (PasspointConfiguration config : savedPasspointConfigs) {
- savedConfigs.add(new AccessPoint(context, config));
- }
- } catch (UnsupportedOperationException e) {
- // Passpoint not supported.
- }
- return savedConfigs;
- }
-
private void showDialog(LongPressAccessPointPreference accessPoint, boolean edit) {
if (mDialog != null) {
removeDialog(WifiSettings.WIFI_DIALOG_ID);
@@ -292,8 +260,8 @@
result.add(data);
// Add available Wi-Fi access points
- final List<AccessPoint> accessPoints =
- getSavedConfigs(context, context.getSystemService(WifiManager.class));
+ final List<AccessPoint> accessPoints = WifiSavedConfigUtils.getAllConfigs(
+ context, context.getSystemService(WifiManager.class));
final int accessPointsSize = accessPoints.size();
for (int i = 0; i < accessPointsSize; ++i){
diff --git a/src/com/android/settings/wifi/WifiDetailPreference.java b/src/com/android/settings/wifi/WifiDetailPreference.java
index 6d34ad1..b62df56 100644
--- a/src/com/android/settings/wifi/WifiDetailPreference.java
+++ b/src/com/android/settings/wifi/WifiDetailPreference.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
+import android.text.TextUtils;
import android.util.AttributeSet;
import android.widget.TextView;
@@ -37,6 +38,7 @@
}
public void setDetailText(String text) {
+ if (TextUtils.equals(mDetailText, text)) return;
mDetailText = text;
notifyChanged();
}
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index abab154..7718898 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.wifi.SupplicantState;
import android.net.wifi.WifiInfo;
@@ -27,6 +28,7 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
import android.widget.Toast;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -43,6 +45,7 @@
private final SwitchWidgetController mSwitchWidget;
private final WifiManager mWifiManager;
+ private final ConnectivityManagerWrapper mConnectivityManager;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private Context mContext;
@@ -76,12 +79,21 @@
private static final int EVENT_UPDATE_INDEX = 0;
public WifiEnabler(Context context, SwitchWidgetController switchWidget,
- MetricsFeatureProvider metricsFeatureProvider) {
+ MetricsFeatureProvider metricsFeatureProvider) {
+ this(context, switchWidget, metricsFeatureProvider, new ConnectivityManagerWrapper(
+ (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE)));
+ }
+
+ @VisibleForTesting
+ WifiEnabler(Context context, SwitchWidgetController switchWidget,
+ MetricsFeatureProvider metricsFeatureProvider,
+ ConnectivityManagerWrapper connectivityManagerWrapper) {
mContext = context;
mSwitchWidget = switchWidget;
mSwitchWidget.setListener(this);
mMetricsFeatureProvider = metricsFeatureProvider;
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+ mConnectivityManager = connectivityManagerWrapper;
mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
// The order matters! We really should not depend on this. :(
@@ -198,7 +210,7 @@
// Disable tethering if enabling Wifi
if (mayDisableTethering(isChecked)) {
- mWifiManager.setWifiApEnabled(null, false);
+ mConnectivityManager.stopTethering(ConnectivityManager.TETHERING_WIFI);
}
if (isChecked) {
mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_WIFI_ON);
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index a5d922d..0d585c7 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -16,6 +16,7 @@
package com.android.settings.wifi.details;
import static android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL;
+import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import android.app.Fragment;
@@ -27,6 +28,7 @@
import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback;
import android.net.IpPrefix;
+import android.net.LinkAddress;
import android.net.LinkProperties;
import android.net.Network;
import android.net.NetworkBadging;
@@ -67,6 +69,7 @@
import java.net.UnknownHostException;
import java.util.List;
import java.util.StringJoiner;
+import java.util.stream.Collectors;
/**
* Controller for logic pertaining to displaying Wifi information for the
@@ -100,7 +103,9 @@
@VisibleForTesting
static final String KEY_DNS_PREF = "dns";
@VisibleForTesting
- static final String KEY_IPV6_ADDRESS_CATEGORY = "ipv6_details_category";
+ static final String KEY_IPV6_CATEGORY = "ipv6_category";
+ @VisibleForTesting
+ static final String KEY_IPV6_ADDRESSES_PREF = "ipv6_addresses";
private AccessPoint mAccessPoint;
private final ConnectivityManagerWrapper mConnectivityManagerWrapper;
@@ -133,8 +138,9 @@
private WifiDetailPreference mGatewayPref;
private WifiDetailPreference mSubnetPref;
private WifiDetailPreference mDnsPref;
+ private PreferenceCategory mIpv6Category;
+ private Preference mIpv6AddressPref;
- private PreferenceCategory mIpv6AddressCategory;
private final IntentFilter mFilter;
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
@@ -160,9 +166,24 @@
}
}
+ private boolean hasCapabilityChanged(NetworkCapabilities nc, int cap) {
+ // If this is the first time we get NetworkCapabilities, report that something changed.
+ if (mNetworkCapabilities == null) return true;
+
+ // nc can never be null, see ConnectivityService#callCallbackForRequest.
+ return mNetworkCapabilities.hasCapability(cap) != nc.hasCapability(cap);
+ }
+
@Override
public void onCapabilitiesChanged(Network network, NetworkCapabilities nc) {
+ // If the network just validated or lost Internet access, refresh network state.
+ // Don't do this on every NetworkCapabilities change because refreshNetworkState
+ // sends IPCs to the system server from the UI thread, which can cause jank.
if (network.equals(mNetwork) && !nc.equals(mNetworkCapabilities)) {
+ if (hasCapabilityChanged(nc, NET_CAPABILITY_VALIDATED) ||
+ hasCapabilityChanged(nc, NET_CAPABILITY_CAPTIVE_PORTAL)) {
+ refreshNetworkState();
+ }
mNetworkCapabilities = nc;
updateIpLayerInfo();
}
@@ -224,7 +245,7 @@
mConnectionDetailPref = screen.findPreference(KEY_CONNECTION_DETAIL_PREF);
mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF);
- mSignInButton = (Button) mButtonsPref.findViewById(R.id.right_button);
+ mSignInButton = (Button) mButtonsPref.findViewById(R.id.signin_button);
mSignInButton.setText(R.string.support_sign_in_button_text);
mSignInButton.setOnClickListener(
view -> mConnectivityManagerWrapper.startCaptivePortalApp(mNetwork));
@@ -241,11 +262,11 @@
mSubnetPref = (WifiDetailPreference) screen.findPreference(KEY_SUBNET_MASK_PREF);
mDnsPref = (WifiDetailPreference) screen.findPreference(KEY_DNS_PREF);
- mIpv6AddressCategory =
- (PreferenceCategory) screen.findPreference(KEY_IPV6_ADDRESS_CATEGORY);
+ mIpv6Category = (PreferenceCategory) screen.findPreference(KEY_IPV6_CATEGORY);
+ mIpv6AddressPref = (Preference) screen.findPreference(KEY_IPV6_ADDRESSES_PREF);
mSecurityPref.setDetailText(mAccessPoint.getSecurityString(false /* concise */));
- mForgetButton = (Button) mButtonsPref.findViewById(R.id.left_button);
+ mForgetButton = (Button) mButtonsPref.findViewById(R.id.forget_button);
mForgetButton.setText(R.string.forget);
mForgetButton.setOnClickListener(view -> forgetNetwork());
updateInfo();
@@ -315,8 +336,6 @@
mFrequencyPref.setDetailText(band);
updateIpLayerInfo();
- mButtonsPref.setVisible(mForgetButton.getVisibility() == View.VISIBLE
- || mSignInButton.getVisibility() == View.VISIBLE);
}
private void exitActivity() {
@@ -348,74 +367,69 @@
mSignalStrengthPref.setDetailText(mSignalStr[summarySignalLevel]);
}
+ private void updatePreference(WifiDetailPreference pref, String detailText) {
+ if (!TextUtils.isEmpty(detailText)) {
+ pref.setDetailText(detailText);
+ pref.setVisible(true);
+ } else {
+ pref.setVisible(false);
+ }
+ }
+
private void updateIpLayerInfo() {
mSignInButton.setVisibility(canSignIntoNetwork() ? View.VISIBLE : View.INVISIBLE);
-
- // Reset all fields
- mIpv6AddressCategory.removeAll();
- mIpv6AddressCategory.setVisible(false);
- mIpAddressPref.setVisible(false);
- mSubnetPref.setVisible(false);
- mGatewayPref.setVisible(false);
- mDnsPref.setVisible(false);
+ mButtonsPref.setVisible(mForgetButton.getVisibility() == View.VISIBLE
+ || mSignInButton.getVisibility() == View.VISIBLE);
if (mNetwork == null || mLinkProperties == null) {
+ mIpAddressPref.setVisible(false);
+ mSubnetPref.setVisible(false);
+ mGatewayPref.setVisible(false);
+ mDnsPref.setVisible(false);
+ mIpv6Category.setVisible(false);
return;
}
- List<InetAddress> addresses = mLinkProperties.getAddresses();
- // Set IPv4 and IPv6 addresses
- for (int i = 0; i < addresses.size(); i++) {
- InetAddress addr = addresses.get(i);
- if (addr instanceof Inet4Address) {
- mIpAddressPref.setDetailText(addr.getHostAddress());
- mIpAddressPref.setVisible(true);
- } else if (addr instanceof Inet6Address) {
- String ip = addr.getHostAddress();
- Preference pref = new Preference(mPrefContext);
- pref.setKey(ip);
- pref.setTitle(ip);
- pref.setSelectable(false);
- mIpv6AddressCategory.addPreference(pref);
- mIpv6AddressCategory.setVisible(true);
- }
- }
-
- // Set up IPv4 gateway and subnet mask
- String gateway = null;
+ // Find IPv4 and IPv6 addresses.
+ String ipv4Address = null;
String subnet = null;
+ StringJoiner ipv6Addresses = new StringJoiner("\n");
+
+ for (LinkAddress addr : mLinkProperties.getLinkAddresses()) {
+ if (addr.getAddress() instanceof Inet4Address) {
+ ipv4Address = addr.getAddress().getHostAddress();
+ subnet = ipv4PrefixLengthToSubnetMask(addr.getPrefixLength());
+ } else if (addr.getAddress() instanceof Inet6Address) {
+ ipv6Addresses.add(addr.getAddress().getHostAddress());
+ }
+ }
+
+ // Find IPv4 default gateway.
+ String gateway = null;
for (RouteInfo routeInfo : mLinkProperties.getRoutes()) {
- if (routeInfo.hasGateway() && routeInfo.getGateway() instanceof Inet4Address) {
+ if (routeInfo.isIPv4Default() && routeInfo.hasGateway()) {
gateway = routeInfo.getGateway().getHostAddress();
- }
- IpPrefix ipPrefix = routeInfo.getDestination();
- if (ipPrefix != null && ipPrefix.getAddress() instanceof Inet4Address
- && ipPrefix.getPrefixLength() > 0) {
- subnet = ipv4PrefixLengthToSubnetMask(ipPrefix.getPrefixLength());
+ break;
}
}
- if (!TextUtils.isEmpty(subnet)) {
- mSubnetPref.setDetailText(subnet);
- mSubnetPref.setVisible(true);
- }
+ // Find IPv4 DNS addresses.
+ String dnsServers = mLinkProperties.getDnsServers().stream()
+ .filter(Inet4Address.class::isInstance)
+ .map(InetAddress::getHostAddress)
+ .collect(Collectors.joining(","));
- if (!TextUtils.isEmpty(gateway)) {
- mGatewayPref.setDetailText(gateway);
- mGatewayPref.setVisible(true);
- }
+ // Update UI.
+ updatePreference(mIpAddressPref, ipv4Address);
+ updatePreference(mSubnetPref, subnet);
+ updatePreference(mGatewayPref, gateway);
+ updatePreference(mDnsPref, dnsServers);
- // Set IPv4 DNS addresses
- StringJoiner stringJoiner = new StringJoiner(",");
- for (InetAddress dnsServer : mLinkProperties.getDnsServers()) {
- if (dnsServer instanceof Inet4Address) {
- stringJoiner.add(dnsServer.getHostAddress());
- }
- }
- String dnsText = stringJoiner.toString();
- if (!dnsText.isEmpty()) {
- mDnsPref.setDetailText(dnsText);
- mDnsPref.setVisible(true);
+ if (ipv6Addresses.length() > 0) {
+ mIpv6AddressPref.setSummary(ipv6Addresses.toString());
+ mIpv6Category.setVisible(true);
+ } else {
+ mIpv6Category.setVisible(false);
}
}
diff --git a/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java b/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java
index e6fe899..3d39cdb 100644
--- a/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java
+++ b/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java
@@ -28,11 +28,13 @@
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.matcher.ViewMatchers.hasFocus;
import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.withTagKey;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.core.AllOf.allOf;
+import com.android.settings.R;
+
@RunWith(AndroidJUnit4.class)
@SmallTest
@@ -43,7 +45,7 @@
@Test
public void test_OpenKeyboardOnSearchLaunch() {
- onView(allOf(hasFocus(), withTagKey(SearchFragment.SEARCH_TAG)))
+ onView(allOf(hasFocus(), withId(R.id.search_view)))
.check(matches(withClassName(containsString(SearchView.class.getName()))));
}
}
diff --git a/tests/robotests/assets/whitelist_duplicate_index_key b/tests/robotests/assets/whitelist_duplicate_index_key
index 6ced706..020957e 100644
--- a/tests/robotests/assets/whitelist_duplicate_index_key
+++ b/tests/robotests/assets/whitelist_duplicate_index_key
@@ -1,6 +1,5 @@
add_users_when_locked
additional_system_update_settings
dashboard_tile_placeholder
-lock_screen_notifications
screen_zoom
usage_access
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
index c636748..e28a594 100644
--- a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java
@@ -21,8 +21,7 @@
import android.content.IContentProvider;
import android.content.pm.PackageManager;
import android.hardware.fingerprint.FingerprintManager;
-import android.os.Bundle;
-import android.provider.Settings;
+import android.os.UserManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
@@ -31,33 +30,30 @@
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.notification.LockScreenNotificationPreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.ShadowSecureSettings;
+import com.android.settings.testutils.XmlTestUtils;
+import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-import com.android.settingslib.drawer.TileUtils;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
+import java.util.List;
import java.util.Map;
-import org.robolectric.util.ReflectionHelpers;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
@@ -182,4 +178,26 @@
securitySettings.setLockscreenPreferencesSummary(group);
verify(preference).setSummary(1234);
}
+
+ @Test
+ @Config (shadows = {
+ ShadowLockPatternUtils.class,
+ })
+ public void testNonIndexableKeys_existInXmlLayout() {
+ final Context context = spy(RuntimeEnvironment.application);
+ UserManager manager = mock(UserManager.class);
+ when(manager.isAdminUser()).thenReturn(false);
+ doReturn(manager).when(context).getSystemService(Context.USER_SERVICE);
+ final List<String> niks = SecuritySettings.SEARCH_INDEX_DATA_PROVIDER
+ .getNonIndexableKeys(context);
+
+ final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context,
+ R.xml.security_settings_misc);
+ keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
+ R.xml.location_settings));
+ keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context,
+ R.xml.encryption_and_credential));
+
+ assertThat(keys).containsAllIn(niks);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
index 65e9708..eecd88a 100644
--- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
@@ -20,12 +20,15 @@
import android.app.ActivityManager;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.view.Menu;
+
+import com.android.settings.search2.SearchActivity;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Test;
@@ -35,6 +38,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
import static com.google.common.truth.Truth.assertThat;
@@ -138,4 +142,15 @@
assertThat(mActivity.mDisplaySearch).isTrue();
}
+
+ @Test
+ public void testOnClick() {
+ doReturn("com.android.settings").when(mActivity).getPackageName();
+
+ mActivity.onClick(null);
+
+ Intent intent = ShadowApplication.getInstance().getNextStartedActivity();
+ assertThat(intent.getComponent()).isEqualTo(
+ new ComponentName("com.android.settings", SearchActivity.class.getName()));
+ }
}
diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
new file mode 100644
index 0000000..cd48da3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2017 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;
+
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SettingsPreferenceFragmentTest {
+
+ @Mock
+ private PreferenceManager mPreferenceManager;
+ private Context mContext;
+ private TestFragment mFragment;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mFragment = new TestFragment();
+ }
+
+ @Test
+ public void removePreference_nested_shouldRemove() {
+ final String key = "test_key";
+ final PreferenceScreen mScreen = spy(new PreferenceScreen(mContext, null));
+ when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
+
+ final PreferenceCategory nestedCategory = new ProgressCategory(mContext);
+ final Preference preference = new Preference(mContext);
+ preference.setKey(key);
+ preference.setPersistent(false);
+
+ mScreen.addPreference(nestedCategory);
+ nestedCategory.addPreference(preference);
+
+ assertThat(mFragment.removePreference(mScreen, key)).isTrue();
+ assertThat(nestedCategory.getPreferenceCount()).isEqualTo(0);
+ }
+
+ @Test
+ public void removePreference_flat_shouldRemove() {
+ final String key = "test_key";
+ final PreferenceScreen mScreen = spy(new PreferenceScreen(mContext, null));
+ when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
+
+ final Preference preference = mock(Preference.class);
+ when(preference.getKey()).thenReturn(key);
+
+ mScreen.addPreference(preference);
+
+ assertThat(mFragment.removePreference(mScreen, key)).isTrue();
+ assertThat(mScreen.getPreferenceCount()).isEqualTo(0);
+ }
+
+ @Test
+ public void removePreference_doNotExist_shouldNotRemove() {
+ final String key = "test_key";
+ final PreferenceScreen mScreen = spy(new PreferenceScreen(mContext, null));
+ when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
+
+ final Preference preference = mock(Preference.class);
+ when(preference.getKey()).thenReturn(key);
+
+ mScreen.addPreference(preference);
+
+ assertThat(mFragment.removePreference(mScreen, "not" + key)).isFalse();
+ assertThat(mScreen.getPreferenceCount()).isEqualTo(1);
+ }
+
+ public static final class TestFragment extends SettingsPreferenceFragment {
+
+ @Override
+ public int getMetricsCategory() {
+ return 0;
+ }
+ }
+
+
+}
diff --git a/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java
index a991e7a..1daefc4 100644
--- a/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java
@@ -93,6 +93,10 @@
getPackageName(),
Fs.fileFromPath("./frameworks/support/v7/appcompat/res"),
null));
+ paths.add(new ResourcePath(
+ getPackageName(),
+ Fs.fileFromPath("./frameworks/support/v7/cardview/res"),
+ null));
return paths;
}
};
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
index 66f5549..f1ad142 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
@@ -493,6 +493,42 @@
@Test
@Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
+ public void onResume_oneNewAccountType_shouldAddOneAccountPreference() {
+ final List<UserInfo> infos = new ArrayList<>();
+ infos.add(new UserInfo(1, "user 1", 0));
+ infos.add(new UserInfo(2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
+ when(mUserManager.isManagedProfile()).thenReturn(false);
+ when(mUserManager.isLinkedUser()).thenReturn(false);
+ when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
+
+ AccessiblePreferenceCategory preferenceGroup = mock(AccessiblePreferenceCategory.class);
+ when(preferenceGroup.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
+ when(mAccountHelper.createAccessiblePreferenceCategory(any(Context.class))).thenReturn(
+ preferenceGroup);
+
+ // First time resume will build the UI with no account
+ mController.onResume();
+
+ // Add new account
+ Account[] accounts = {new Account("Acct1", "com.acct1")};
+ when(mAccountManager.getAccountsAsUser(2)).thenReturn(accounts);
+ when(mAccountManager.getAccountsByTypeAsUser(eq("com.acct1"), any(UserHandle.class)))
+ .thenReturn(accounts);
+
+ AuthenticatorDescription[] authDescs = {
+ new AuthenticatorDescription("com.acct1", "com.android.settings",
+ R.string.account_settings_title, 0, 0, 0, false)
+ };
+ when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(authDescs);
+
+ // Resume should show the newly added account
+ mController.onResume();
+
+ verify(preferenceGroup).addPreference(argThat(new PreferenceMatcher("Acct1")));
+ }
+
+ @Test
+ @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
public void onResume_oneAccountRemoved_shouldRemoveOneAccountPreference() {
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(1, "user 1", 0));
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
index d93d3a7..cd66d5e 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
@@ -21,6 +21,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when;
import android.app.Fragment;
@@ -46,6 +47,8 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AutoSyncWorkDataPreferenceControllerTest {
+ private static int MANAGED_PROFILE_ID = 10;
+
@Mock(answer = RETURNS_DEEP_STUBS)
private UserManager mUserManager;
@Mock(answer = RETURNS_DEEP_STUBS)
@@ -80,29 +83,30 @@
@Test
public void checkIsAvailable_singleUserProfile_shouldNotDisplay() {
- final List<UserInfo> infos = new ArrayList<>();
- infos.add(new UserInfo(1, "user 1", 0));
when(mUserManager.isManagedProfile()).thenReturn(false);
when(mUserManager.isLinkedUser()).thenReturn(false);
- when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
+
+ final List<UserInfo> infos = new ArrayList<>();
+ infos.add(new UserInfo(UserHandle.USER_SYSTEM, "user 1", 0 /* flags */));
+ when(mUserManager.getProfiles(eq(UserHandle.USER_SYSTEM))).thenReturn(infos);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void multipleProfile_shouldInitWithWorkProfileUserHandle() {
- final int id1 = 1;
- final int id2 = 2;
- final UserInfo managedUser = new UserInfo(id2, "user 2", FLAG_MANAGED_PROFILE);
- final List<UserHandle> infos = new ArrayList<>();
- infos.add(new UserHandle(id1));
- infos.add(new UserHandle(id2));
- when(mUserManager.getUserProfiles()).thenReturn(infos);
- when(mUserManager.getUserHandle()).thenReturn(id1);
- when(mUserManager.getUserInfo(id2)).thenReturn(managedUser);
+ when(mUserManager.isManagedProfile()).thenReturn(false);
+ when(mUserManager.isLinkedUser()).thenReturn(false);
+
+ final List<UserInfo> infos = new ArrayList<>();
+ infos.add(new UserInfo(UserHandle.USER_SYSTEM, "user 1", 0 /* flags */));
+ infos.add(new UserInfo(
+ MANAGED_PROFILE_ID, "work profile", UserInfo.FLAG_MANAGED_PROFILE));
+ when(mUserManager.getProfiles(eq(UserHandle.USER_SYSTEM))).thenReturn(infos);
mController = new AutoSyncWorkDataPreferenceController(mContext, mFragment);
- assertThat(mController.mUserHandle.getIdentifier()).isEqualTo(id2);
+ assertThat(mController.mUserHandle.getIdentifier()).isEqualTo(MANAGED_PROFILE_ID);
+ assertThat(mController.isAvailable()).isTrue();
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
index 36d78c1..e302edd 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
@@ -14,11 +14,9 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import com.android.settings.R;
import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
@@ -82,15 +80,15 @@
when(result.getCodeBytes()).thenReturn(1L);
when(result.getCacheBytes()).thenReturn(10L);
when(result.getDataBytes()).thenReturn(100L);
- when(result.getTotalBytes()).thenReturn(111L);
+ when(result.getTotalBytes()).thenReturn(101L);
mController.setResult(result);
mController.updateUi(mContext);
assertThat(mAppPreference.getSummary()).isEqualTo("1.00B");
assertThat(mCachePreference.getSummary()).isEqualTo("10.00B");
- assertThat(mDataPreference.getSummary()).isEqualTo("100B");
- assertThat(mTotalPreference.getSummary()).isEqualTo("111B");
+ assertThat(mDataPreference.getSummary()).isEqualTo("90.00B");
+ assertThat(mTotalPreference.getSummary()).isEqualTo("101B");
}
@Test
@@ -99,7 +97,7 @@
when(result.getCodeBytes()).thenReturn(1L);
when(result.getCacheBytes()).thenReturn(10L);
when(result.getDataBytes()).thenReturn(100L);
- when(result.getTotalBytes()).thenReturn(111L);
+ when(result.getTotalBytes()).thenReturn(101L);
mController.setResult(result);
mController.setCacheCleared(true);
@@ -107,8 +105,8 @@
assertThat(mAppPreference.getSummary()).isEqualTo("1.00B");
assertThat(mCachePreference.getSummary()).isEqualTo("0.00B");
- assertThat(mDataPreference.getSummary()).isEqualTo("100B");
- assertThat(mTotalPreference.getSummary()).isEqualTo("101B");
+ assertThat(mDataPreference.getSummary()).isEqualTo("90.00B");
+ assertThat(mTotalPreference.getSummary()).isEqualTo("91.00B");
}
@Test
@@ -117,7 +115,7 @@
when(result.getCodeBytes()).thenReturn(1L);
when(result.getCacheBytes()).thenReturn(10L);
when(result.getDataBytes()).thenReturn(100L);
- when(result.getTotalBytes()).thenReturn(111L);
+ when(result.getTotalBytes()).thenReturn(101L);
mController.setResult(result);
mController.setDataCleared(true);
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 4c4ec46..672c5b7 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -245,6 +245,12 @@
.isEqualTo(expectedManagedUserActivities);
}
+ @Test
+ public void getKeepEnabledPackages_shouldContainNothing() {
+ assertThat(mProvider.getKeepEnabledPackages())
+ .isEmpty();
+ }
+
private void setUpUsersAndInstalledApps() {
when(mUserManager.getProfiles(UserHandle.myUserId())).thenReturn(Arrays.asList(
new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN),
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
index 17910bf..2fbad13 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
@@ -16,26 +16,17 @@
package com.android.settings.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import android.app.AlertDialog;
+import android.app.LoaderManager;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
+import android.content.res.Resources;
import android.os.BatteryStats;
+import android.os.Bundle;
import android.os.UserManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceManager;
@@ -45,11 +36,14 @@
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.applications.instantapps.InstantAppButtonsController;
+import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.Utils;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
@@ -63,19 +57,40 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
import org.robolectric.util.ReflectionHelpers;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyDouble;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class InstalledAppDetailsTest {
private static final String PACKAGE_NAME = "test_package_name";
+ private static final int TARGET_UID = 111;
+ private static final int OTHER_UID = 222;
+ private static final double BATTERY_LEVEL = 60;
+ private static final String BATTERY_LEVEL_STRING = "60%";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
- @Mock
- ApplicationFeatureProvider mApplicationFeatureProvider;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private UserManager mUserManager;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -83,28 +98,42 @@
@Mock
private DevicePolicyManager mDevicePolicyManager;
@Mock
- private Preference mBatteryPreference;
- @Mock
private BatterySipper mBatterySipper;
@Mock
+ private BatterySipper mOtherBatterySipper;
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private BatteryStatsHelper mBatteryStatsHelper;
@Mock
private BatteryStats.Uid mUid;
@Mock
private PackageManager mPackageManager;
+ @Mock
+ private BatteryUtils mBatteryUtils;
+ @Mock
+ private LoaderManager mLoaderManager;
+ private FakeFeatureFactory mFeatureFactory;
private InstalledAppDetails mAppDetail;
private Context mShadowContext;
+ private Preference mBatteryPreference;
+
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
-
+ FakeFeatureFactory.setupForTest(mContext);
+ mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
mShadowContext = RuntimeEnvironment.application;
mAppDetail = spy(new InstalledAppDetails());
+ mAppDetail.mBatteryUtils = mBatteryUtils;
+
+ mBatteryPreference = new Preference(mShadowContext);
+ mAppDetail.mBatteryPreference = mBatteryPreference;
mBatterySipper.drainType = BatterySipper.DrainType.IDLE;
mBatterySipper.uidObj = mUid;
+ doReturn(TARGET_UID).when(mBatterySipper).getUid();
+ doReturn(OTHER_UID).when(mOtherBatterySipper).getUid();
doReturn(mActivity).when(mAppDetail).getActivity();
doReturn(mShadowContext).when(mAppDetail).getContext();
doReturn(mPackageManager).when(mActivity).getPackageManager();
@@ -325,15 +354,14 @@
final InstalledAppDetailsWithMockInstantButtons
fragment = new InstalledAppDetailsWithMockInstantButtons();
ReflectionHelpers.setField(fragment, "mPackageInfo", packageInfo);
+ ReflectionHelpers.setField(fragment, "mApplicationFeatureProvider",
+ mFeatureFactory.applicationFeatureProvider);
final InstantAppButtonsController buttonsController =
mock(InstantAppButtonsController.class);
when(buttonsController.setPackageName(anyString())).thenReturn(buttonsController);
- FakeFeatureFactory.setupForTest(mContext);
- FakeFeatureFactory factory =
- (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
- when(factory.applicationFeatureProvider.newInstantAppButtonsController(
+ when(mFeatureFactory.applicationFeatureProvider.newInstantAppButtonsController(
any(), any(), any())).thenReturn(buttonsController);
fragment.maybeAddInstantAppButtons();
@@ -388,4 +416,138 @@
verify(mActivity).invalidateOptionsMenu();
}
+
+ @Test
+ public void findTargetSipper_findCorrectSipper() {
+ List<BatterySipper> usageList = new ArrayList<>();
+ usageList.add(mBatterySipper);
+ usageList.add(mOtherBatterySipper);
+ doReturn(usageList).when(mBatteryStatsHelper).getUsageList();
+
+ assertThat(mAppDetail.findTargetSipper(mBatteryStatsHelper, TARGET_UID)).isEqualTo(
+ mBatterySipper);
+ }
+
+ @Test
+ public void updateBattery_noBatteryStats_summaryNo() {
+ doReturn(mShadowContext.getString(R.string.no_battery_summary)).when(mAppDetail).getString(
+ R.string.no_battery_summary);
+ mAppDetail.updateBattery();
+
+ assertThat(mBatteryPreference.getSummary()).isEqualTo(
+ "No battery use since last full charge");
+ }
+
+ @Test
+ public void updateBattery_hasBatteryStats_summaryPercent() {
+ mAppDetail.mBatteryHelper = mBatteryStatsHelper;
+ mAppDetail.mSipper = mBatterySipper;
+ doReturn(BATTERY_LEVEL).when(mBatteryUtils).calculateBatteryPercent(anyDouble(),
+ anyDouble(), anyDouble(), anyInt());
+ doReturn(mShadowContext.getString(R.string.battery_summary, BATTERY_LEVEL_STRING)).when(
+ mAppDetail).getString(R.string.battery_summary, BATTERY_LEVEL_STRING);
+ doReturn(new ArrayList<>()).when(mBatteryStatsHelper).getUsageList();
+
+ mAppDetail.updateBattery();
+
+ assertThat(mBatteryPreference.getSummary()).isEqualTo("60% use since last full charge");
+ }
+
+ @Test
+ public void isBatteryStatsAvailable_hasBatteryStatsHelperAndSipper_returnTrue() {
+ mAppDetail.mBatteryHelper = mBatteryStatsHelper;
+ mAppDetail.mSipper = mBatterySipper;
+
+ assertThat(mAppDetail.isBatteryStatsAvailable()).isTrue();
+ }
+
+ @Test
+ public void isBatteryStatsAvailable_parametersNull_returnFalse() {
+ assertThat(mAppDetail.isBatteryStatsAvailable()).isFalse();
+ }
+
+ @Test
+ public void handleDisableable_appIsHomeApp_buttonShouldNotWork() {
+ final ApplicationInfo info = new ApplicationInfo();
+ info.packageName = "pkg";
+ info.enabled = true;
+ final AppEntry appEntry = mock(AppEntry.class);
+ appEntry.info = info;
+ final HashSet<String> homePackages = new HashSet<>();
+ homePackages.add(info.packageName);
+
+ ReflectionHelpers.setField(mAppDetail, "mHomePackages", homePackages);
+ ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
+ final Button button = mock(Button.class);
+
+ assertThat(mAppDetail.handleDisableable(button)).isFalse();
+ verify(button).setText(R.string.disable_text);
+ }
+
+ @Test
+ @Config(shadows = ShadowUtils.class)
+ public void handleDisableable_appIsEnabled_buttonShouldWork() {
+ final ApplicationInfo info = new ApplicationInfo();
+ info.packageName = "pkg";
+ info.enabled = true;
+ info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+
+ final AppEntry appEntry = mock(AppEntry.class);
+ appEntry.info = info;
+ when(mFeatureFactory.applicationFeatureProvider.getKeepEnabledPackages()).thenReturn(
+ new HashSet<>());
+
+ ReflectionHelpers.setField(mAppDetail, "mApplicationFeatureProvider",
+ mFeatureFactory.applicationFeatureProvider);
+ ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
+ final Button button = mock(Button.class);
+
+ assertThat(mAppDetail.handleDisableable(button)).isTrue();
+ verify(button).setText(R.string.disable_text);
+ }
+
+ @Test
+ @Config(shadows = ShadowUtils.class)
+ public void handleDisableable_appIsEnabledAndInKeepEnabledWhitelist_buttonShouldNotWork() {
+ final ApplicationInfo info = new ApplicationInfo();
+ info.packageName = "pkg";
+ info.enabled = true;
+ info.enabledSetting = PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+
+ final AppEntry appEntry = mock(AppEntry.class);
+ appEntry.info = info;
+
+ final HashSet<String> packages = new HashSet<>();
+ packages.add(info.packageName);
+ when(mFeatureFactory.applicationFeatureProvider.getKeepEnabledPackages()).thenReturn(
+ packages);
+
+ ReflectionHelpers.setField(mAppDetail, "mApplicationFeatureProvider",
+ mFeatureFactory.applicationFeatureProvider);
+ ReflectionHelpers.setField(mAppDetail, "mAppEntry", appEntry);
+
+ final Button button = mock(Button.class);
+
+ assertThat(mAppDetail.handleDisableable(button)).isFalse();
+ verify(button).setText(R.string.disable_text);
+ }
+
+ @Test
+ public void testRestartBatteryStatsLoader() {
+ doReturn(mLoaderManager).when(mAppDetail).getLoaderManager();
+
+ mAppDetail.restartBatteryStatsLoader();
+
+ verify(mLoaderManager).restartLoader(InstalledAppDetails.LOADER_BATTERY, Bundle.EMPTY,
+ mAppDetail.mBatteryCallbacks);
+ }
+
+ @Implements(Utils.class)
+ public static class ShadowUtils {
+ @Implementation
+ public static boolean isSystemPackage(Resources resources, PackageManager pm,
+ PackageInfo pkg) {
+ return false;
+ }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
index 6440141..779e0b6 100644
--- a/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/MusicViewHolderControllerTest.java
@@ -83,7 +83,7 @@
@Test
public void storageShouldRepresentStorageStatsQuery() throws Exception {
when(mSource.getExternalStorageStats(any(String.class), any(UserHandle.class))).thenReturn(
- new StorageStatsSource.ExternalStorageStats(1, 1, 0, 0));
+ new StorageStatsSource.ExternalStorageStats(1, 1, 0, 0, 0));
mController.queryStats();
mController.setupView(mHolder);
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
index 38104a9..f425d2f 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
@@ -16,11 +16,17 @@
package com.android.settings.applications.defaultapps;
-
import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
import android.content.IntentFilter;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
+import android.os.Build;
import android.os.UserManager;
import com.android.settings.SettingsRobolectricTestRunner;
@@ -33,14 +39,22 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
+import java.util.ArrayList;
+import java.util.List;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyList;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -55,7 +69,9 @@
@Mock
private UserManager mUserManager;
@Mock
- private PackageManagerWrapper mPackageManager;
+ private PackageManagerWrapper mPackageManagerWrapper;
+ @Mock
+ private PackageManager mPackageManager;
private DefaultHomePicker mPicker;
@@ -63,28 +79,89 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+ when(mPackageManagerWrapper.getPackageManager()).thenReturn(mPackageManager);
- mPicker = new DefaultHomePicker();
+ mPicker = spy(new DefaultHomePicker());
mPicker.onAttach((Context) mActivity);
- ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
+ ReflectionHelpers.setField(mPicker, "mPm", mPackageManagerWrapper);
+ doReturn(RuntimeEnvironment.application).when(mPicker).getContext();
}
@Test
public void setDefaultAppKey_shouldUpdateDefault() {
assertThat(mPicker.setDefaultKey(TEST_APP_KEY)).isTrue();
- verify(mPackageManager).replacePreferredActivity(any(IntentFilter.class),
+ verify(mPackageManagerWrapper).replacePreferredActivity(any(IntentFilter.class),
anyInt(), any(ComponentName[].class), any(ComponentName.class));
}
@Test
public void getDefaultAppKey_shouldReturnDefault() {
final ComponentName cn = mock(ComponentName.class);
- when(mPackageManager.getHomeActivities(anyList()))
+ when(mPackageManagerWrapper.getHomeActivities(anyList()))
.thenReturn(cn);
mPicker.getDefaultKey();
verify(cn).flattenToString();
}
+ @Test
+ public void getCandidates_allLaunchersAvailableIfNoManagedProfile()
+ throws NameNotFoundException {
+ addLaunchers();
+ List<DefaultAppInfo> candidates = mPicker.getCandidates();
+ assertThat(candidates.size()).isEqualTo(2);
+ assertThat(candidates.get(0).summary).isNull();
+ assertThat(candidates.get(0).enabled).isTrue();
+ assertThat(candidates.get(1).summary).isNull();
+ assertThat(candidates.get(1).enabled).isTrue();
+ }
+
+ @Test
+ public void getCandidates_onlyLollipopPlusLaunchersAvailableIfManagedProfile()
+ throws NameNotFoundException {
+ createManagedProfile();
+ addLaunchers();
+ List<DefaultAppInfo> candidates = mPicker.getCandidates();
+ assertThat(candidates.size()).isEqualTo(2);
+ DefaultAppInfo lollipopPlusLauncher = candidates.get(0);
+ assertThat(lollipopPlusLauncher.summary).isNull();
+ assertThat(lollipopPlusLauncher.enabled).isTrue();
+
+ DefaultAppInfo preLollipopLauncher = candidates.get(1);
+ assertThat(preLollipopLauncher.summary).isNotNull();
+ assertThat(preLollipopLauncher.enabled).isFalse();
+ }
+
+ private void createManagedProfile() {
+ ArrayList<UserInfo> profiles = new ArrayList<UserInfo>();
+ profiles.add(new UserInfo(/*id=*/ 10, "TestUserName", UserInfo.FLAG_MANAGED_PROFILE));
+ when(mUserManager.getProfiles(anyInt())).thenReturn(profiles);
+ }
+
+ private ResolveInfo createLauncher(
+ String packageName, String className, int targetSdk) throws NameNotFoundException {
+ ResolveInfo launcher = new ResolveInfo();
+ launcher.activityInfo = new ActivityInfo();
+ launcher.activityInfo.packageName = packageName;
+ launcher.activityInfo.name = className;
+ ApplicationInfo launcherAppInfo = new ApplicationInfo();
+ launcherAppInfo.targetSdkVersion = targetSdk;
+ when(mPackageManager.getApplicationInfo(eq(launcher.activityInfo.packageName), anyInt()))
+ .thenReturn(launcherAppInfo);
+ return launcher;
+ }
+
+ private void addLaunchers() throws NameNotFoundException {
+ doAnswer(invocation -> {
+ // The result of this method is stored in the first parameter...
+ List<ResolveInfo> parameter = (List<ResolveInfo>) invocation.getArguments()[0];
+ parameter.add(createLauncher(
+ "package.1", "LollipopPlusLauncher", Build.VERSION_CODES.LOLLIPOP));
+ parameter.add(createLauncher(
+ "package.2", "PreLollipopLauncher", Build.VERSION_CODES.KITKAT));
+ return null;
+ })
+ .when(mPackageManagerWrapper).getHomeActivities(anyList());
+ }
}
diff --git a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
index 38a8356..399c753 100644
--- a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
@@ -22,6 +22,7 @@
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
import com.android.settings.core.lifecycle.Lifecycle;
import org.junit.Before;
@@ -50,6 +51,7 @@
private @Mock Preference mPreference;
private @Mock PreferenceScreen mScreen;
private @Mock Lifecycle mLifecycle;
+ private @Mock PreferenceAvailabilityObserver mObserver;
private boolean mIsAvailable;
private Preference mUpdatedPreference = null;
@@ -115,6 +117,21 @@
assertThat(mUpdatedPreference).isEqualTo(mPreference);
}
+ @Test
+ public void testNotifyOnAvailabilityUpdate() {
+ final DynamicAvailabilityPreferenceController controller
+ = new DynamicAvailabilityPreferenceControllerTestable(mLifecycle);
+ controller.setAvailabilityObserver(mObserver);
+ assertThat(controller.getAvailabilityObserver()).isEqualTo(mObserver);
+
+ mIsAvailable = false;
+ controller.isAvailable();
+ verify(mObserver).onPreferenceAvailabilityUpdated(PREFERENCE_KEY, false);
+
+ mIsAvailable = true;
+ controller.isAvailable();
+ verify(mObserver).onPreferenceAvailabilityUpdated(PREFERENCE_KEY, true);
+ }
private class DynamicAvailabilityPreferenceControllerTestable
extends DynamicAvailabilityPreferenceController {
@@ -124,6 +141,7 @@
@Override
public boolean isAvailable() {
+ notifyOnAvailabilityUpdate(mIsAvailable);
return mIsAvailable;
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index d7daa03..3b27cf1 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -19,16 +19,23 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Icon;
+import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout;
+import android.widget.LinearLayout;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.dashboard.conditional.Condition;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
+import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.Tile;
import org.junit.Before;
@@ -47,6 +54,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -100,6 +108,53 @@
}
@Test
+ public void testOnBindViewHolder_spacer_noSuggestions_noConditions() {
+ makeCategory();
+ DashboardAdapter.DashboardItemHolder holder = setupSpacer();
+
+ mDashboardAdapter.onBindViewHolder(holder, 0);
+
+ assertThat(holder.itemView.getBackground()).isNull();
+ }
+
+ @Test
+ public void testOnBindViewHolder_spacer_suggestion_noConditions() {
+ setupSuggestions(makeSuggestions("pkg1"));
+ makeCategory();
+ DashboardAdapter.DashboardItemHolder holder = setupSpacer();
+
+ mDashboardAdapter.onBindViewHolder(holder, 0);
+
+ assertThat(holder.itemView.getBackground()).isNotNull();
+ assertThat(holder.itemView.getBackground()).isInstanceOf(ColorDrawable.class);
+ }
+
+ @Test
+ public void testOnBindViewHolder_spacer_noSuggestion_condition() {
+ makeCondition();
+ makeCategory();
+ DashboardAdapter.DashboardItemHolder holder = setupSpacer();
+
+ mDashboardAdapter.onBindViewHolder(holder, 0);
+
+ assertThat(holder.itemView.getBackground()).isNotNull();
+ assertThat(holder.itemView.getBackground()).isInstanceOf(ColorDrawable.class);
+ }
+
+ @Test
+ public void testOnBindViewHolder_spacer_suggestion_condition() {
+ setupSuggestions(makeSuggestions("pkg1"));
+ makeCondition();
+ makeCategory();
+ DashboardAdapter.DashboardItemHolder holder = setupSpacer();
+
+ mDashboardAdapter.onBindViewHolder(holder, 0);
+
+ assertThat(holder.itemView.getBackground()).isNotNull();
+ assertThat(holder.itemView.getBackground()).isInstanceOf(ColorDrawable.class);
+ }
+
+ @Test
public void testSetConditions_AfterSetConditions_ExpandedConditionNull() {
mDashboardAdapter.onExpandClick(mView);
assertThat(mDashboardAdapter.mDashboardData.getExpandedCondition()).isEqualTo(mCondition);
@@ -109,7 +164,7 @@
@Test
public void testSuggestionsLogs_NotExpanded() {
- setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+ setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
verify(mFactory.metricsFeatureProvider, times(2)).action(
any(Context.class), mActionCategoryCaptor.capture(),
mActionPackageCaptor.capture());
@@ -124,7 +179,7 @@
@Test
public void testSuggestionsLogs_NotExpandedAndPaused() {
- setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+ setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
mDashboardAdapter.onPause();
verify(mFactory.metricsFeatureProvider, times(4)).action(
any(Context.class), mActionCategoryCaptor.capture(),
@@ -141,7 +196,7 @@
@Test
public void testSuggestionsLogs_Expanded() {
- setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+ setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
mDashboardAdapter.onBindSuggestionHeader(
mSuggestionHolder, mSuggestionHeaderData);
mSuggestionHolder.itemView.callOnClick();
@@ -160,7 +215,7 @@
@Test
public void testSuggestionsLogs_ExpandedAndPaused() {
- setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+ setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
mDashboardAdapter.onBindSuggestionHeader(
mSuggestionHolder, mSuggestionHeaderData);
mSuggestionHolder.itemView.callOnClick();
@@ -183,7 +238,7 @@
@Test
public void testSuggestionsLogs_ExpandedAfterPause() {
- setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+ setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
mDashboardAdapter.onPause();
mDashboardAdapter.onBindSuggestionHeader(
mSuggestionHolder, mSuggestionHeaderData);
@@ -208,7 +263,7 @@
@Test
public void testSuggestionsLogs_ExpandedAfterPauseAndPausedAgain() {
- setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+ setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
mDashboardAdapter.onPause();
mDashboardAdapter.onBindSuggestionHeader(
mSuggestionHolder, mSuggestionHeaderData);
@@ -237,7 +292,7 @@
@Test
public void testSuggestionsLogs_ExpandedWithLessThanDefaultShown() {
- setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+ setupSuggestions(makeSuggestions("pkg1"));
mDashboardAdapter.onBindSuggestionHeader(
mSuggestionHolder, mSuggestionHeaderData);
mSuggestionHolder.itemView.callOnClick();
@@ -254,7 +309,7 @@
@Test
public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAndPaused() {
- setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+ setupSuggestions(makeSuggestions("pkg1"));
mDashboardAdapter.onBindSuggestionHeader(
mSuggestionHolder, mSuggestionHeaderData);
mSuggestionHolder.itemView.callOnClick();
@@ -273,7 +328,7 @@
@Test
public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPause() {
- setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+ setupSuggestions(makeSuggestions("pkg1"));
mDashboardAdapter.onPause();
mDashboardAdapter.onBindSuggestionHeader(
mSuggestionHolder, mSuggestionHeaderData);
@@ -293,7 +348,7 @@
@Test
public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPauseAndPausedAgain() {
- setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+ setupSuggestions(makeSuggestions("pkg1"));
mDashboardAdapter.onPause();
mDashboardAdapter.onBindSuggestionHeader(
mSuggestionHolder, mSuggestionHeaderData);
@@ -313,7 +368,7 @@
assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
}
- private List<Tile> makeSuggestions(String[] pkgNames) {
+ private List<Tile> makeSuggestions(String... pkgNames) {
final List<Tile> suggestions = new ArrayList<>();
for (String pkgName : pkgNames) {
Tile suggestion = new Tile();
@@ -324,11 +379,31 @@
return suggestions;
}
- private void setUpSuggestions(List<Tile> suggestions) {
+ private void setupSuggestions(List<Tile> suggestions) {
mDashboardAdapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
mSuggestionHolder = mDashboardAdapter.onCreateViewHolder(
new FrameLayout(RuntimeEnvironment.application),
- mDashboardAdapter.getItemViewType(0));
+ mDashboardAdapter.getItemViewType(1));
}
+ private void makeCondition() {
+ final List<Condition> conditions = new ArrayList<>();
+ Condition condition = mock(Condition.class);
+ when(condition.shouldShow()).thenReturn(true);
+ conditions.add(condition);
+ mDashboardAdapter.setConditions(conditions);
+ }
+
+ private void makeCategory() {
+ List<DashboardCategory> categories = new ArrayList<>();
+ categories.add(new DashboardCategory());
+ mDashboardAdapter.setCategory(categories);
+ }
+
+ private DashboardAdapter.DashboardItemHolder setupSpacer() {
+ Context context = RuntimeEnvironment.application;
+ final View view = LayoutInflater.from(context)
+ .inflate(R.layout.dashboard_header_spacer, new LinearLayout(context), false);
+ return new DashboardAdapter.DashboardItemHolder(view);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
index abea565..8bbb15b 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
@@ -112,7 +112,7 @@
public void testBuildItemsData_containsAllData() {
final DashboardData.SuggestionHeaderData data =
new DashboardData.SuggestionHeaderData(false, 1, 0);
- final Object[] expectedObjects = {mTestCondition, null, data, mTestSuggestion,
+ final Object[] expectedObjects = {null, mTestCondition, null, data, mTestSuggestion,
mDashboardCategory, mTestCategoryTile};
final int expectedSize = expectedObjects.length;
@@ -171,7 +171,7 @@
@Test
public void testDiffUtil_DataEqual_noResultData() {
List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
- testDiffUtil(mDashboardDataWithOneConditions,
+ testDiffUtil(mDashboardDataWithOneConditions,
mDashboardDataWithOneConditions, testResultData);
}
@@ -180,7 +180,7 @@
//Build testResultData
final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
testResultData.add(new ListUpdateResult.ResultData(
- ListUpdateResult.ResultData.TYPE_OPERATION_INSERT, 1, 1));
+ ListUpdateResult.ResultData.TYPE_OPERATION_INSERT, 2, 1));
testDiffUtil(mDashboardDataWithOneConditions,
mDashboardDataWithTwoConditions, testResultData);
@@ -191,7 +191,7 @@
//Build testResultData
final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
testResultData.add(new ListUpdateResult.ResultData(
- ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 0, 6));
+ ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 1, 6));
testDiffUtil(mDashboardDataWithOneConditions, mDashboardDataWithNoItems, testResultData);
}
@@ -203,8 +203,8 @@
mDashboardDataWithOneConditions.getItemList(),
mDashboardDataWithOneConditions.getItemList());
- // Item in position 0 is condition card, which payload should not be null
- assertThat(callback.getChangePayload(0, 0)).isNotEqualTo(null);
+ // Item in position 1 is condition card, which payload should not be null
+ assertThat(callback.getChangePayload(1, 1)).isNotNull();
}
@Test
@@ -214,9 +214,9 @@
mDashboardDataWithOneConditions.getItemList(),
mDashboardDataWithOneConditions.getItemList());
- // Only item in position 0 is condition card, so others' payload should be null
- for (int i = 1; i < mDashboardDataWithOneConditions.getItemList().size(); i++) {
- assertThat(callback.getChangePayload(i, i)).isEqualTo(null);
+ // Position 0 is spacer, 1 is condition card, so others' payload should be null
+ for (int i = 2; i < mDashboardDataWithOneConditions.getItemList().size(); i++) {
+ assertThat(callback.getChangePayload(i, i)).isNull();
}
}
@@ -356,6 +356,11 @@
return arg2 - resultData.arg2;
}
+
+ @Override
+ public String toString() {
+ return "op:" + operation + ",arg1:" + arg1 + ",arg2:" + arg2;
+ }
}
}
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
index 8d48e63..03f15bb 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
@@ -17,6 +17,7 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -31,11 +32,16 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class StorageProfileFragmentTest {
+ @Captor
+ private ArgumentCaptor<SparseArray<StorageAsyncLoader.AppsStorageResult>> mCaptor;
+
@Test
public void verifyAppSizesAreZeroedOut() {
StorageItemPreferenceController controller = mock(StorageItemPreferenceController.class);
@@ -45,18 +51,17 @@
result.otherAppsSize = 200;
result.gamesSize = 300;
result.videoAppsSize = 400;
- result.externalStats = new StorageStatsSource.ExternalStorageStats(6, 1, 2, 3);
+ result.externalStats = new StorageStatsSource.ExternalStorageStats(6, 1, 2, 3, 0);
SparseArray<StorageAsyncLoader.AppsStorageResult> resultsArray = new SparseArray<>();
resultsArray.put(0, result);
fragment.setPreferenceController(controller);
fragment.onLoadFinished(null, resultsArray);
- ArgumentCaptor<StorageAsyncLoader.AppsStorageResult> resultCaptor = ArgumentCaptor.forClass(
- StorageAsyncLoader.AppsStorageResult.class);
- verify(controller).onLoadFinished(resultCaptor.capture());
+ MockitoAnnotations.initMocks(this);
+ verify(controller).onLoadFinished(mCaptor.capture(), anyInt());
- StorageAsyncLoader.AppsStorageResult extractedResult = resultCaptor.getValue();
+ StorageAsyncLoader.AppsStorageResult extractedResult = mCaptor.getValue().get(0);
assertThat(extractedResult.musicAppsSize).isEqualTo(0);
assertThat(extractedResult.videoAppsSize).isEqualTo(0);
assertThat(extractedResult.otherAppsSize).isEqualTo(0);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
index 32def69..dc1c286 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
@@ -168,7 +168,7 @@
MEGABYTE_IN_BYTES * 30,
MEGABYTE_IN_BYTES * 10,
MEGABYTE_IN_BYTES * 10,
- MEGABYTE_IN_BYTES * 10);
+ MEGABYTE_IN_BYTES * 10, 0);
result.put(10, userResult);
mController.handleResult(result);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index e8057a6..3ad3783 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -28,7 +28,6 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-
import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
@@ -36,6 +35,7 @@
import android.os.UserHandle;
import android.os.storage.VolumeInfo;
import android.support.v7.preference.PreferenceScreen;
+import android.util.SparseArray;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;
@@ -275,22 +275,22 @@
result.videoAppsSize = MEGABYTE_IN_BYTES * 160;
result.musicAppsSize = MEGABYTE_IN_BYTES * 40;
result.otherAppsSize = MEGABYTE_IN_BYTES * 90;
- result.systemSize = MEGABYTE_IN_BYTES * 100; // This value is ignored and overridden now.
result.externalStats =
new StorageStatsSource.ExternalStorageStats(
MEGABYTE_IN_BYTES * 500, // total
MEGABYTE_IN_BYTES * 100, // audio
MEGABYTE_IN_BYTES * 150, // video
- MEGABYTE_IN_BYTES * 200); // image
+ MEGABYTE_IN_BYTES * 200, 0); // image
- mController.onLoadFinished(result);
+ SparseArray<StorageAsyncLoader.AppsStorageResult> results = new SparseArray<>();
+ results.put(0, result);
+ mController.onLoadFinished(results, 0);
assertThat(audio.getSummary().toString()).isEqualTo("0.14GB");
assertThat(image.getSummary().toString()).isEqualTo("0.35GB");
assertThat(games.getSummary().toString()).isEqualTo("0.08GB");
assertThat(movies.getSummary().toString()).isEqualTo("0.16GB");
assertThat(apps.getSummary().toString()).isEqualTo("0.09GB");
- assertThat(system.getSummary().toString()).isEqualTo("0.10GB");
assertThat(files.getSummary().toString()).isEqualTo("0.05GB");
}
@@ -488,4 +488,4 @@
verify(screen).addPreference(files);
}
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
index 8b7110d..2199824 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
@@ -114,7 +114,7 @@
99 * MEGABYTE_IN_BYTES,
33 * MEGABYTE_IN_BYTES,
33 * MEGABYTE_IN_BYTES,
- 33 * MEGABYTE_IN_BYTES);
+ 33 * MEGABYTE_IN_BYTES, 0);
result.put(10, userResult);
mController.handleResult(result);
@@ -141,4 +141,4 @@
Preference preference = argumentCaptor.getValue();
assertThat(preference.getIcon()).isEqualTo(drawable);
}
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
index 96ce081..c1a3143 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
@@ -21,6 +21,7 @@
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.core.PreferenceAvailabilityObserver;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
@@ -32,9 +33,12 @@
import org.mockito.stubbing.Answer;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
@@ -48,6 +52,7 @@
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
protected Context mContext;
private FakeFeatureFactory mFeatureFactory;
+ @Mock private PreferenceAvailabilityObserver mObserver;
protected AdminGrantedPermissionsPreferenceControllerBase mController;
@@ -64,6 +69,12 @@
FakeFeatureFactory.setupForTest(mContext);
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
mController = createController(true /* async */);
+ mController.setAvailabilityObserver(mObserver);
+ }
+
+ @Test
+ public void testGetAvailabilityObserver() {
+ assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
}
private void setNumberOfPackagesWithAdminGrantedPermissions(int number, boolean async) {
@@ -85,6 +96,7 @@
setNumberOfPackagesWithAdminGrantedPermissions(0, true /* async */);
mController.updateState(preference);
assertThat(preference.isVisible()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(mKey, false);
setNumberOfPackagesWithAdminGrantedPermissions(20, true /* async */);
when(mContext.getResources().getQuantityString(
@@ -93,27 +105,33 @@
mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");
assertThat(preference.isVisible()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(mKey, true);
}
@Test
public void testIsAvailableSync() {
final AdminGrantedPermissionsPreferenceControllerBase controller
= createController(false /* async */);
+ controller.setAvailabilityObserver(mObserver);
setNumberOfPackagesWithAdminGrantedPermissions(0, false /* async */);
assertThat(controller.isAvailable()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(mKey, false);
setNumberOfPackagesWithAdminGrantedPermissions(20, false /* async */);
assertThat(controller.isAvailable()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(mKey, true);
}
@Test
public void testIsAvailableAsync() {
setNumberOfPackagesWithAdminGrantedPermissions(0, true /* async */);
assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver, never()).onPreferenceAvailabilityUpdated(eq(mKey), anyBoolean());
setNumberOfPackagesWithAdminGrantedPermissions(20, true /* async */);
assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver, never()).onPreferenceAvailabilityUpdated(eq(mKey), anyBoolean());
}
@Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
index 9d1bd58..51c8a7b 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
@@ -22,6 +22,7 @@
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
@@ -33,6 +34,7 @@
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
@@ -42,12 +44,14 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class AlwaysOnVpnCurrentUserPreferenceControllerTest {
- private final String VPN_SET_DEVICE = "VPN set";
- private final String VPN_SET_PERSONAL = "VPN set in personal profile";
+ private static final String VPN_SET_DEVICE = "VPN set";
+ private static final String VPN_SET_PERSONAL = "VPN set in personal profile";
+ private static final String KEY_ALWAYS_ON_VPN_PRIMARY_USER = "always_on_vpn_primary_user";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
+ @Mock private PreferenceAvailabilityObserver mObserver;
private AlwaysOnVpnCurrentUserPreferenceController mController;
@@ -62,6 +66,12 @@
.thenReturn(VPN_SET_DEVICE);
when(mContext.getString(R.string.enterprise_privacy_always_on_vpn_personal))
.thenReturn(VPN_SET_PERSONAL);
+ mController.setAvailabilityObserver(mObserver);
+ }
+
+ @Test
+ public void testGetAvailabilityObserver() {
+ assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
}
@Test
@@ -85,10 +95,12 @@
when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInCurrentUser())
.thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_PRIMARY_USER, false);
when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInCurrentUser())
.thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_PRIMARY_USER, true);
}
@Test
@@ -99,6 +111,6 @@
@Test
public void testGetPreferenceKey() {
- assertThat(mController.getPreferenceKey()).isEqualTo("always_on_vpn_primary_user");
+ assertThat(mController.getPreferenceKey()).isEqualTo(KEY_ALWAYS_ON_VPN_PRIMARY_USER);
}
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
index 8ac10d1..4562711 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
@@ -21,6 +21,7 @@
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
@@ -32,6 +33,7 @@
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
@@ -41,9 +43,12 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class AlwaysOnVpnManagedProfilePreferenceControllerTest {
+ private static final String KEY_ALWAYS_ON_VPN_MANAGED_PROFILE = "always_on_vpn_managed_profile";
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
+ @Mock private PreferenceAvailabilityObserver mObserver;
private AlwaysOnVpnManagedProfilePreferenceController mController;
@@ -54,6 +59,12 @@
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
mController = new AlwaysOnVpnManagedProfilePreferenceController(mContext,
null /* lifecycle */);
+ mController.setAvailabilityObserver(mObserver);
+ }
+
+ @Test
+ public void testGetAvailabilityObserver() {
+ assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
}
@Test
@@ -61,10 +72,12 @@
when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInManagedProfile())
.thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_MANAGED_PROFILE, false);
when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInManagedProfile())
.thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_MANAGED_PROFILE, true);
}
@Test
@@ -75,6 +88,6 @@
@Test
public void testGetPreferenceKey() {
- assertThat(mController.getPreferenceKey()).isEqualTo("always_on_vpn_managed_profile");
+ assertThat(mController.getPreferenceKey()).isEqualTo(KEY_ALWAYS_ON_VPN_MANAGED_PROFILE);
}
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
index fef2e0f..2c0e320 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
@@ -23,6 +23,7 @@
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
@@ -34,6 +35,7 @@
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
@@ -43,9 +45,12 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class CaCertsPreferenceControllerTest {
+ private static final String KEY_CA_CERTS = "ca_certs";
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
+ @Mock private PreferenceAvailabilityObserver mObserver;
private CaCertsPreferenceController mController;
@@ -55,6 +60,12 @@
FakeFeatureFactory.setupForTest(mContext);
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
mController = new CaCertsPreferenceController(mContext, null /* lifecycle */);
+ mController.setAvailabilityObserver(mObserver);
+ }
+
+ @Test
+ public void testGetAvailabilityObserver() {
+ assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
}
@Test
@@ -74,10 +85,12 @@
when(mFeatureFactory.enterprisePrivacyFeatureProvider
.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()).thenReturn(0);
assertThat(mController.isAvailable()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_CA_CERTS, false);
when(mFeatureFactory.enterprisePrivacyFeatureProvider
.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()).thenReturn(10);
assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_CA_CERTS, true);
}
@Test
@@ -88,6 +101,6 @@
@Test
public void testGetPreferenceKey() {
- assertThat(mController.getPreferenceKey()).isEqualTo("ca_certs");
+ assertThat(mController.getPreferenceKey()).isEqualTo(KEY_CA_CERTS);
}
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
index 4255d96..cf54bb0 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
@@ -24,6 +24,7 @@
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.core.PreferenceAvailabilityObserver;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
@@ -37,9 +38,12 @@
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.anyObject;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
@@ -49,9 +53,13 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class EnterpriseInstalledPackagesPreferenceControllerTest {
+ private static final String KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES
+ = "number_enterprise_installed_packages";
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
+ @Mock private PreferenceAvailabilityObserver mObserver;
private EnterpriseInstalledPackagesPreferenceController mController;
@@ -62,6 +70,12 @@
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
mController = new EnterpriseInstalledPackagesPreferenceController(mContext,
null /* lifecycle */, true /* async */);
+ mController.setAvailabilityObserver(mObserver);
+ }
+
+ @Test
+ public void testGetAvailabilityObserver() {
+ assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
}
private void setNumberOfEnterpriseInstalledPackages(int number, boolean async) {
@@ -82,6 +96,8 @@
setNumberOfEnterpriseInstalledPackages(0, true /* async */);
mController.updateState(preference);
assertThat(preference.isVisible()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES,
+ false);
setNumberOfEnterpriseInstalledPackages(20, true /* async */);
when(mContext.getResources().getQuantityString(
@@ -90,6 +106,8 @@
mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");
assertThat(preference.isVisible()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES,
+ true);
}
@Test
@@ -97,21 +115,30 @@
final EnterpriseInstalledPackagesPreferenceController controller
= new EnterpriseInstalledPackagesPreferenceController(mContext,
null /* lifecycle */, false /* async */);
+ controller.setAvailabilityObserver(mObserver);
setNumberOfEnterpriseInstalledPackages(0, false /* async */);
assertThat(controller.isAvailable()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(
+ KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES, false);
setNumberOfEnterpriseInstalledPackages(20, false /* async */);
assertThat(controller.isAvailable()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(
+ KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES, true);
}
@Test
public void testIsAvailableAsync() {
setNumberOfEnterpriseInstalledPackages(0, true /* async */);
assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+ eq(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES), anyBoolean());
setNumberOfEnterpriseInstalledPackages(20, true /* async */);
assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+ eq(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES), anyBoolean());
}
@Test
@@ -123,6 +150,6 @@
@Test
public void testGetPreferenceKey() {
assertThat(mController.getPreferenceKey())
- .isEqualTo("number_enterprise_installed_packages");
+ .isEqualTo(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES);
}
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
index fe48347..101a45a 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
@@ -23,6 +23,7 @@
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
@@ -34,6 +35,7 @@
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
@@ -43,13 +45,15 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class EnterprisePrivacyPreferenceControllerTest {
- private final String MANAGED_GENERIC = "managed by organization";
- private final String MANAGED_WITH_NAME = "managed by Foo, Inc.";
- private final String MANAGING_ORGANIZATION = "Foo, Inc.";
+ private static final String MANAGED_GENERIC = "managed by organization";
+ private static final String MANAGED_WITH_NAME = "managed by Foo, Inc.";
+ private static final String MANAGING_ORGANIZATION = "Foo, Inc.";
+ private static final String KEY_ENTERPRISE_PRIVACY = "enterprise_privacy";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
+ @Mock private PreferenceAvailabilityObserver mObserver;
private EnterprisePrivacyPreferenceController mController;
@@ -59,6 +63,12 @@
FakeFeatureFactory.setupForTest(mContext);
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
mController = new EnterprisePrivacyPreferenceController(mContext, null /* lifecycle */);
+ mController.setAvailabilityObserver(mObserver);
+ }
+
+ @Test
+ public void testGetAvailabilityObserver() {
+ assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
}
@Test
@@ -85,10 +95,11 @@
public void testIsAvailable() {
when(mFeatureFactory.enterprisePrivacyFeatureProvider.hasDeviceOwner()).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ENTERPRISE_PRIVACY, false);
when(mFeatureFactory.enterprisePrivacyFeatureProvider.hasDeviceOwner()).thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
-
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ENTERPRISE_PRIVACY, true);
}
@Test
@@ -99,6 +110,6 @@
@Test
public void testGetPreferenceKey() {
- assertThat(mController.getPreferenceKey()).isEqualTo("enterprise_privacy");
+ assertThat(mController.getPreferenceKey()).isEqualTo(KEY_ENTERPRISE_PRIVACY);
}
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
index d41be75..16fa5ba 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
@@ -16,12 +16,16 @@
package com.android.settings.enterprise;
+import android.app.Application;
import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.XmlResourceParser;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.core.DynamicAvailabilityPreferenceController;
import com.android.settings.core.PreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -31,10 +35,14 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
+import org.xmlpull.v1.XmlPullParser;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
@@ -46,6 +54,9 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class EnterprisePrivacySettingsTest {
+ private final static String RESOURCES_NAMESPACE = "http://schemas.android.com/apk/res/android";
+ private final static String ATTR_KEY = "key";
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
@@ -101,23 +112,24 @@
}
@Test
- public void getPreferenceControllers() {
+ public void getPreferenceControllers() throws Exception {
final List<PreferenceController> controllers = mSettings.getPreferenceControllers(
ShadowApplication.getInstance().getApplicationContext());
verifyPreferenceControllers(controllers);
}
@Test
- public void getSearchIndexProviderPreferenceControllers() {
+ public void getSearchIndexProviderPreferenceControllers() throws Exception {
final List<PreferenceController> controllers
= EnterprisePrivacySettings.SEARCH_INDEX_DATA_PROVIDER.getPreferenceControllers(
ShadowApplication.getInstance().getApplicationContext());
verifyPreferenceControllers(controllers);
}
- private void verifyPreferenceControllers(List<PreferenceController> controllers) {
+ private void verifyPreferenceControllers(List<PreferenceController> controllers)
+ throws Exception {
assertThat(controllers).isNotNull();
- assertThat(controllers.size()).isEqualTo(15);
+ assertThat(controllers.size()).isEqualTo(16);
int position = 0;
assertThat(controllers.get(position++)).isInstanceOf(NetworkLogsPreferenceController.class);
assertThat(controllers.get(position++)).isInstanceOf(BugReportsPreferenceController.class);
@@ -137,14 +149,71 @@
AlwaysOnVpnCurrentUserPreferenceController.class);
assertThat(controllers.get(position++)).isInstanceOf(
AlwaysOnVpnManagedProfilePreferenceController.class);
+ assertThat(controllers.get(position++)).isInstanceOf(ImePreferenceController.class);
assertThat(controllers.get(position++)).isInstanceOf(
GlobalHttpProxyPreferenceController.class);
assertThat(controllers.get(position++)).isInstanceOf(
CaCertsPreferenceController.class);
+ final PreferenceController exposureChangesCategoryController = controllers.get(position);
+ final int exposureChangesCategoryControllerIndex = position;
+ assertThat(controllers.get(position++)).isInstanceOf(
+ ExposureChangesCategoryPreferenceController.class);
assertThat(controllers.get(position++)).isInstanceOf(
FailedPasswordWipeCurrentUserPreferenceController.class);
assertThat(controllers.get(position++)).isInstanceOf(
FailedPasswordWipeManagedProfilePreferenceController.class);
- assertThat(controllers.get(position++)).isInstanceOf(ImePreferenceController.class);
+
+ // The "Changes made by your organization's admin" category is hidden when all Preferences
+ // inside it become unavailable. To do this correctly, the category's controller must:
+ // a) Observe the availability of all Preferences in the category and
+ // b) Be listed after those Preferences' controllers, so that availability is updated in
+ // the correct order
+
+ // Find all Preferences in the category.
+ final XmlResourceParser parser = RuntimeEnvironment.application.getResources().getXml(
+ R.xml.enterprise_privacy_settings);
+ boolean done = false;
+ int type;
+ final Set<String> expectedObserved = new HashSet<>();
+ while (!done && (type = parser.next()) != XmlPullParser.END_DOCUMENT) {
+ if (type != XmlPullParser.START_TAG || !"exposure_changes_category".equals(
+ parser.getAttributeValue(RESOURCES_NAMESPACE, ATTR_KEY))) {
+ continue;
+ }
+ int depth = 1;
+ while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) {
+ if (type == XmlPullParser.START_TAG) {
+ final String key = parser.getAttributeValue(RESOURCES_NAMESPACE, ATTR_KEY);
+ if (key != null) {
+ expectedObserved.add(key);
+ }
+ depth++;
+ } else if (type == XmlPullParser.END_TAG) {
+ depth--;
+ if (depth == 0) {
+ done = true;
+ break;
+ }
+ }
+ }
+ }
+
+ // Find all Preferences the category's controller is observing.
+ final Set<String> actualObserved = new HashSet<>();
+ int maxObservedIndex = -1;
+ for (int i = 0; i < controllers.size(); i++) {
+ final PreferenceController controller = controllers.get(i);
+ if (controller instanceof DynamicAvailabilityPreferenceController &&
+ ((DynamicAvailabilityPreferenceController) controller).getAvailabilityObserver()
+ == exposureChangesCategoryController) {
+ actualObserved.add(controller.getPreferenceKey());
+ maxObservedIndex = i;
+ }
+ }
+
+ // Verify that the category's controller is observing the Preferences inside it.
+ assertThat(actualObserved).isEqualTo(expectedObserved);
+ // Verify that the category's controller is listed after the Preferences' controllers.
+ assertThat(maxObservedIndex).isLessThan(exposureChangesCategoryControllerIndex);
}
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
index 34d9b24..5eb59e7 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
@@ -29,6 +29,7 @@
import com.android.settings.TestConfig;
import com.android.settings.applications.EnterpriseDefaultApps;
import com.android.settings.applications.UserAppInfo;
+import com.android.settings.core.PreferenceAvailabilityObserver;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
@@ -48,6 +49,7 @@
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
@@ -57,11 +59,14 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class EnterpriseSetDefaultAppsPreferenceControllerTest {
+ private static final String KEY_DEFAULT_APPS = "number_enterprise_set_default_apps";
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private UserManager mUm;
private FakeFeatureFactory mFeatureFactory;
+ @Mock private PreferenceAvailabilityObserver mObserver;
private EnterpriseSetDefaultAppsPreferenceController mController;
@@ -72,6 +77,12 @@
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
mController = new EnterpriseSetDefaultAppsPreferenceController(mContext,
null /* lifecycle */);
+ mController.setAvailabilityObserver(mObserver);
+ }
+
+ @Test
+ public void testGetAvailabilityObserver() {
+ assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
}
private void setEnterpriseSetDefaultApps(Intent[] intents, int number) {
@@ -118,10 +129,12 @@
when(mFeatureFactory.applicationFeatureProvider.findPersistentPreferredActivities(anyInt(),
anyObject())).thenReturn(new ArrayList<UserAppInfo>());
assertThat(mController.isAvailable()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_DEFAULT_APPS, false);
setEnterpriseSetDefaultApps(EnterpriseDefaultApps.BROWSER.getIntents(), 1);
configureUsers(1);
assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_DEFAULT_APPS, true);
}
@Test
@@ -132,8 +145,7 @@
@Test
public void testGetPreferenceKey() {
- assertThat(mController.getPreferenceKey())
- .isEqualTo("number_enterprise_set_default_apps");
+ assertThat(mController.getPreferenceKey()).isEqualTo(KEY_DEFAULT_APPS);
}
private static class MatchesIntents extends ArgumentMatcher<Intent[]> {
diff --git a/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
new file mode 100644
index 0000000..1c92ea5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2017 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.enterprise;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceAvailabilityObserver;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Tests for {@link ExposureChangesCategoryPreferenceController}.
+ */
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class ExposureChangesCategoryPreferenceControllerTest {
+
+ private static final String KEY_1 = "key_1";
+ private static final String KEY_2 = "key_2";
+ private static final String KEY_EXPOSURE_CHANGES_CATEGORY = "exposure_changes_category";
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private Context mContext;
+ private List<DynamicAvailabilityPreferenceController> mControllers;
+ private ExposureChangesCategoryPreferenceController mController;
+ @Mock private PreferenceAvailabilityObserver mObserver;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mControllers = Arrays.asList(mock(DynamicAvailabilityPreferenceController.class),
+ mock(DynamicAvailabilityPreferenceController.class));
+ mController = new ExposureChangesCategoryPreferenceController(mContext,
+ null /* lifecycle */, mControllers, true /* controllingUi */);
+ mController.setAvailabilityObserver(mObserver);
+ }
+
+ @Test
+ public void testInitialization() {
+ verify(mControllers.get(0)).setAvailabilityObserver(mController);
+ verify(mControllers.get(1)).setAvailabilityObserver(mController);
+ }
+
+ @Test
+ public void testGetAvailabilityObserver() {
+ assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
+ }
+
+ @Test
+ public void testOnPreferenceAvailabilityUpdated() {
+ final Preference preference = new Preference(mContext, null, 0, 0);
+ preference.setVisible(true);
+
+ mController.updateState(preference);
+ assertThat(preference.isVisible()).isFalse();
+
+ mController.onPreferenceAvailabilityUpdated(KEY_1, true);
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
+ assertThat(preference.isVisible()).isTrue();
+ reset(mObserver);
+
+ mController.onPreferenceAvailabilityUpdated(KEY_2, true);
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
+ assertThat(preference.isVisible()).isTrue();
+ reset(mObserver);
+
+ mController.onPreferenceAvailabilityUpdated(KEY_1, false);
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
+ assertThat(preference.isVisible()).isTrue();
+ reset(mObserver);
+
+ mController.onPreferenceAvailabilityUpdated(KEY_2, false);
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, false);
+ assertThat(preference.isVisible()).isFalse();
+ }
+
+ @Test
+ public void testUpdateState() {
+ final Preference preference = new Preference(mContext, null, 0, 0);
+ preference.setVisible(false);
+
+ mController.onPreferenceAvailabilityUpdated(KEY_1, true);
+ mController.updateState(preference);
+ assertThat(preference.isVisible()).isTrue();
+ }
+
+ @Test
+ public void testIsAvailableForUi() {
+ assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+ eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+
+ mController.onPreferenceAvailabilityUpdated(KEY_1, true);
+ reset(mObserver);
+ assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+ eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+
+ mController.onPreferenceAvailabilityUpdated(KEY_1, false);
+ reset(mObserver);
+ assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+ eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+ }
+
+ @Test
+ public void testIsAvailableForSearch() {
+ final ExposureChangesCategoryPreferenceController controller
+ = new ExposureChangesCategoryPreferenceController(mContext, null /* lifecycle */,
+ mControllers, false /* controllingUi */);
+ controller.setAvailabilityObserver(mObserver);
+ verify(mControllers.get(0)).setAvailabilityObserver(controller);
+ verify(mControllers.get(1)).setAvailabilityObserver(controller);
+
+ assertThat(controller.isAvailable()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, false);
+ reset(mObserver);
+
+ controller.onPreferenceAvailabilityUpdated(KEY_1, true);
+ verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+ eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+ assertThat(controller.isAvailable()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
+ reset(mObserver);
+
+ controller.onPreferenceAvailabilityUpdated(KEY_2, true);
+ verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+ eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+ assertThat(controller.isAvailable()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
+ reset(mObserver);
+
+ controller.onPreferenceAvailabilityUpdated(KEY_1, false);
+ verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+ eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+ assertThat(controller.isAvailable()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
+ reset(mObserver);
+
+ controller.onPreferenceAvailabilityUpdated(KEY_2, false);
+ verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+ eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+ assertThat(controller.isAvailable()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, false);
+ }
+
+ @Test
+ public void testHandlePreferenceTreeClick() {
+ assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
+ .isFalse();
+ }
+
+ @Test
+ public void testGetPreferenceKey() {
+ assertThat(mController.getPreferenceKey()).isEqualTo(KEY_EXPOSURE_CHANGES_CATEGORY);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
index c14b71e..cbc220f 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
@@ -21,6 +21,7 @@
import android.support.v7.preference.Preference;
import com.android.settings.R;
+import com.android.settings.core.PreferenceAvailabilityObserver;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
@@ -30,6 +31,7 @@
import org.mockito.MockitoAnnotations;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
@@ -42,6 +44,7 @@
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
protected Context mContext;
protected FakeFeatureFactory mFeatureFactory;
+ @Mock private PreferenceAvailabilityObserver mObserver;
protected FailedPasswordWipePreferenceControllerBase mController;
@@ -56,6 +59,12 @@
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
}
+ @Test
+ public void testGetAvailabilityObserver() {
+ mController.setAvailabilityObserver(mObserver);
+ assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
+ }
+
public abstract void setMaximumFailedPasswordsBeforeWipe(int maximum);
@Test
@@ -72,11 +81,15 @@
@Test
public void testIsAvailable() {
+ mController.setAvailabilityObserver(mObserver);
+
setMaximumFailedPasswordsBeforeWipe(0);
assertThat(mController.isAvailable()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(mKey, false);
setMaximumFailedPasswordsBeforeWipe(10);
assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(mKey, true);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
index a0bc9ee..016d970 100644
--- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
@@ -21,6 +21,7 @@
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
@@ -32,6 +33,7 @@
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
@@ -40,9 +42,13 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class GlobalHttpProxyPreferenceControllerTest {
+
+ private static final String KEY_GLOBAL_HTTP_PROXY = "global_http_proxy";
+
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
+ @Mock private PreferenceAvailabilityObserver mObserver;
private GlobalHttpProxyPreferenceController mController;
@@ -52,6 +58,12 @@
FakeFeatureFactory.setupForTest(mContext);
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
mController = new GlobalHttpProxyPreferenceController(mContext, null /* lifecycle */);
+ mController.setAvailabilityObserver(mObserver);
+ }
+
+ @Test
+ public void testGetAvailabilityObserver() {
+ assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
}
@Test
@@ -59,10 +71,12 @@
when(mFeatureFactory.enterprisePrivacyFeatureProvider.isGlobalHttpProxySet())
.thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_GLOBAL_HTTP_PROXY, false);
when(mFeatureFactory.enterprisePrivacyFeatureProvider.isGlobalHttpProxySet())
.thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_GLOBAL_HTTP_PROXY, true);
}
@Test
@@ -73,6 +87,6 @@
@Test
public void testGetPreferenceKey() {
- assertThat(mController.getPreferenceKey()).isEqualTo("global_http_proxy");
+ assertThat(mController.getPreferenceKey()).isEqualTo(KEY_GLOBAL_HTTP_PROXY);
}
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
index 05d0535..3304b44 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
@@ -23,6 +23,7 @@
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
@@ -34,6 +35,7 @@
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
@@ -43,12 +45,14 @@
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class ImePreferenceControllerTest {
- private final String DEFAULT_IME_LABEL = "Test IME";
- private final String DEFAULT_IME_TEXT = "Set to Test IME";
+ private static final String DEFAULT_IME_LABEL = "Test IME";
+ private static final String DEFAULT_IME_TEXT = "Set to Test IME";
+ private static final String KEY_INPUT_METHOD = "input_method";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
+ @Mock private PreferenceAvailabilityObserver mObserver;
private ImePreferenceController mController;
@@ -60,6 +64,12 @@
mController = new ImePreferenceController(mContext, null /* lifecycle */);
when(mContext.getResources().getString(R.string.enterprise_privacy_input_method_name,
DEFAULT_IME_LABEL)).thenReturn(DEFAULT_IME_TEXT);
+ mController.setAvailabilityObserver(mObserver);
+ }
+
+ @Test
+ public void testGetAvailabilityObserver() {
+ assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
}
@Test
@@ -77,10 +87,12 @@
when(mFeatureFactory.enterprisePrivacyFeatureProvider.getImeLabelIfOwnerSet())
.thenReturn(null);
assertThat(mController.isAvailable()).isFalse();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_INPUT_METHOD, false);
when(mFeatureFactory.enterprisePrivacyFeatureProvider.getImeLabelIfOwnerSet())
.thenReturn(DEFAULT_IME_LABEL);
assertThat(mController.isAvailable()).isTrue();
+ verify(mObserver).onPreferenceAvailabilityUpdated(KEY_INPUT_METHOD, true);
}
@Test
@@ -91,6 +103,6 @@
@Test
public void testGetPreferenceKey() {
- assertThat(mController.getPreferenceKey()).isEqualTo("input_method");
+ assertThat(mController.getPreferenceKey()).isEqualTo(KEY_INPUT_METHOD);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 69bd767..d6b758c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -28,6 +28,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.app.Activity;
import android.app.Fragment;
@@ -37,6 +38,7 @@
import android.graphics.drawable.Drawable;
import android.os.BatteryStats;
import android.os.Bundle;
+import android.os.UserHandle;
import android.view.View;
import com.android.internal.os.BatterySipper;
@@ -62,6 +64,8 @@
import org.mockito.stubbing.Answer;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -261,4 +265,37 @@
assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_ICON_ID)).isEqualTo(ICON_ID);
assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(null);
}
+
+ @Test
+ public void testStartBatteryDetailPage_WorkApp() {
+ final int appUid = 1010019;
+ mBatterySipper.mPackages = PACKAGE_NAME;
+ doReturn(appUid).when(mBatterySipper).getUid();
+ AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
+ mBatteryEntry, USAGE_PERCENT);
+
+ verify(mTestActivity).startPreferencePanelAsUser(
+ any(), anyString(), any(), anyInt(), any(), eq(new UserHandle(10)));
+ }
+
+ @Test
+ public void testStartBatteryDetailPage_noBatteryUsage_hasBasicData() {
+ final ArgumentCaptor<Bundle> captor = ArgumentCaptor.forClass(Bundle.class);
+ Answer<Void> callable = new Answer<Void>() {
+ @Override
+ public Void answer(InvocationOnMock invocation) throws Exception {
+ mBundle = captor.getValue();
+ return null;
+ }
+ };
+ doAnswer(callable).when(mTestActivity).startPreferencePanelAsUser(any(), anyString(),
+ captor.capture(), anyInt(), any(), any());
+
+ AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, PACKAGE_NAME[0]);
+
+ assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
+ PACKAGE_NAME[0]);
+ assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
+ "0%");
+ }
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
index a341d83..b40cb9e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
@@ -344,6 +344,14 @@
assertThat(controllable).isTrue();
}
+ @Test
+ public void testRefreshUi_packageNull_shouldNotCrash() {
+ mController.mPackageName = null;
+
+ // Should not crash in this method
+ assertThat(mController.refreshUi()).isFalse();
+ }
+
/**
* The test fragment which implements
* {@link ButtonActionDialogFragment.AppButtonsDialogListener}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
new file mode 100644
index 0000000..04bb2cf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2017 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.fuelgauge;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.BatteryManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
+import com.android.settingslib.BatteryInfo;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+ sdk = TestConfig.SDK_VERSION,
+ shadows = {
+ SettingsShadowResources.class,
+ SettingsShadowResources.SettingsShadowTheme.class,
+ ShadowDynamicIndexableContentMonitor.class
+ })
+public class BatteryHeaderPreferenceControllerTest {
+ private static final int BATTERY_LEVEL = 60;
+ private static final String TIME_LEFT = "2h30min";
+ private static final String BATTERY_STATUS = "Charging";
+
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+ @Mock
+ private BatteryInfo mBatteryInfo;
+ private BatteryHeaderPreferenceController mController;
+ private Context mContext;
+ private BatteryMeterView mBatteryMeterView;
+ private TextView mTimeText;
+ private TextView mSummary;
+ private LayoutPreference mBatteryLayoutPref;
+ private Intent mBatteryIntent;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ mBatteryMeterView = new BatteryMeterView(mContext);
+ mTimeText = new TextView(mContext);
+ mSummary = new TextView(mContext);
+
+ mBatteryIntent = new Intent();
+ mBatteryIntent.putExtra(BatteryManager.EXTRA_LEVEL, BATTERY_LEVEL);
+ mBatteryIntent.putExtra(BatteryManager.EXTRA_SCALE, 100);
+ doReturn(mBatteryIntent).when(mContext).registerReceiver(any(), any());
+
+ mBatteryLayoutPref = new LayoutPreference(mContext, R.layout.battery_header);
+ doReturn(mBatteryLayoutPref).when(mPreferenceScreen).findPreference(
+ BatteryHeaderPreferenceController.KEY_BATTERY_HEADER);
+
+ mBatteryInfo.batteryLevel = BATTERY_LEVEL;
+
+ mController = new BatteryHeaderPreferenceController(mContext);
+ mController.mBatteryMeterView = mBatteryMeterView;
+ mController.mTimeText = mTimeText;
+ mController.mSummary = mSummary;
+ }
+
+ @Test
+ public void testDisplayPreference_displayBatteryLevel() {
+ mController.displayPreference(mPreferenceScreen);
+
+ assertThat(((BatteryMeterView) mBatteryLayoutPref.findViewById(
+ R.id.battery_header_icon)).getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
+ assertThat(((TextView) mBatteryLayoutPref.findViewById(
+ R.id.battery_percent)).getText()).isEqualTo("60%");
+ }
+
+ @Test
+ public void testUpdatePreference_hasRemainingTime_showRemainingLabel() {
+ mBatteryInfo.remainingLabel = TIME_LEFT;
+
+ mController.updateHeaderPreference(mBatteryInfo);
+
+ assertThat(mSummary.getText()).isEqualTo(mBatteryInfo.remainingLabel);
+ }
+
+ @Test
+ public void testUpdatePreference_updateBatteryInfo() {
+ mBatteryInfo.remainingLabel = TIME_LEFT;
+ mBatteryInfo.batteryLevel = BATTERY_LEVEL;
+ mBatteryInfo.discharging = true;
+
+ mController.updateHeaderPreference(mBatteryInfo);
+
+ assertThat(mBatteryMeterView.mDrawable.getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
+ assertThat(mBatteryMeterView.mDrawable.getCharging()).isEqualTo(false);
+ }
+
+ @Test
+ public void testUpdatePreference_noRemainingTime_showStatusLabel() {
+ mBatteryInfo.remainingLabel = null;
+ mBatteryInfo.statusLabel = BATTERY_STATUS;
+
+ mController.updateHeaderPreference(mBatteryInfo);
+
+ assertThat(mSummary.getText()).isEqualTo(BATTERY_STATUS);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index 03759ec..495410d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -21,6 +21,7 @@
import android.text.format.DateUtils;
import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -68,6 +69,7 @@
private static final long TIME_STATE_BACKGROUND = 6000 * UNIT;
private static final long TIME_FOREGROUND_ACTIVITY_ZERO = 0;
private static final long TIME_FOREGROUND_ACTIVITY = 100 * DateUtils.MINUTE_IN_MILLIS;
+ private static final long TIME_SINCE_LAST_FULL_CHARGE_MS = 120 * 60 * 1000;
private static final int UID = 123;
private static final long TIME_EXPECTED_FOREGROUND = 1500;
@@ -100,6 +102,8 @@
private BatterySipper mCellBatterySipper;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private BatteryStatsHelper mBatteryStatsHelper;
private BatteryUtils mBatteryUtils;
private FakeFeatureFactory mFeatureFactory;
private PowerUsageFeatureProvider mProvider;
@@ -278,6 +282,29 @@
BATTERY_APP_USAGE + BATTERY_SCREEN_USAGE);
}
+ @Test
+ public void testSortUsageList() {
+ final List<BatterySipper> sippers = new ArrayList<>();
+ sippers.add(mNormalBatterySipper);
+ sippers.add(mScreenBatterySipper);
+ sippers.add(mSystemBatterySipper);
+
+ mBatteryUtils.sortUsageList(sippers);
+
+ assertThat(sippers).containsExactly(mNormalBatterySipper, mSystemBatterySipper,
+ mScreenBatterySipper);
+ }
+
+ @Test
+ public void testCalculateLastFullChargeTime() {
+ final long currentTimeMs = System.currentTimeMillis();
+ when(mBatteryStatsHelper.getStats().getStartClockTime()).thenReturn(
+ currentTimeMs - TIME_SINCE_LAST_FULL_CHARGE_MS);
+
+ assertThat(mBatteryUtils.calculateLastFullChargeTime(
+ mBatteryStatsHelper, currentTimeMs)).isEqualTo(TIME_SINCE_LAST_FULL_CHARGE_MS);
+ }
+
private BatterySipper createTestSmearBatterySipper(long activityTime, double totalPowerMah,
int uidCode, boolean isUidNull) {
final BatterySipper sipper = mock(BatterySipper.class);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index f32ea7a..8e9febe 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -125,4 +125,14 @@
assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isFalse();
}
+
+ @Test
+ public void testIsAdvancedUiEnabled_returnTrue() {
+ assertThat(mPowerFeatureProvider.isAdvancedUiEnabled()).isTrue();
+ }
+
+ @Test
+ public void testIsPowerAccountingToggleEnabled_returnTrue() {
+ assertThat(mPowerFeatureProvider.isPowerAccountingToggleEnabled()).isTrue();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index ed78783..ea6c7e6 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -17,7 +17,6 @@
import android.content.Context;
import android.content.Intent;
-import android.os.Bundle;
import android.os.PowerManager;
import android.os.Process;
import android.text.TextUtils;
@@ -89,12 +88,9 @@
})
public class PowerUsageSummaryTest {
private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"};
- private static final String TIME_LEFT = "2h30min";
private static final String STUB_STRING = "stub_string";
- private static final int BATTERY_LEVEL = 55;
private static final int UID = 123;
private static final int POWER_MAH = 100;
- private static final long REMAINING_TIME_US = 100000;
private static final long TIME_SINCE_LAST_FULL_CHARGE_MS = 120 * 60 * 1000;
private static final long TIME_SINCE_LAST_FULL_CHARGE_US =
TIME_SINCE_LAST_FULL_CHARGE_MS * 1000;
@@ -130,9 +126,9 @@
@Mock
private LayoutPreference mBatteryLayoutPref;
@Mock
- private TextView mSummary1;
+ private TextView mBatteryPercentText;
@Mock
- private BatteryInfo mBatteryInfo;
+ private TextView mSummary1;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private BatteryStatsHelper mBatteryHelper;
@Mock
@@ -140,7 +136,6 @@
@Mock
private SettingsActivity mSettingsActivity;
- private TextView mBatteryPercentText;
private List<BatterySipper> mUsageList;
private Context mRealContext;
private TestFragment mFragment;
@@ -164,7 +159,7 @@
mLastFullChargePref = new PowerGaugePreference(mRealContext);
mFragment = spy(new TestFragment(mContext));
mFragment.initFeatureProvider();
- mBatteryMeterView = spy(new BatteryMeterView(mRealContext));
+ mBatteryMeterView = new BatteryMeterView(mRealContext);
mBatteryMeterView.mDrawable = new BatteryMeterView.BatteryMeterDrawable(mRealContext, 0);
doNothing().when(mFragment).restartBatteryStatsLoader();
@@ -187,7 +182,6 @@
mCellBatterySipper.drainType = BatterySipper.DrainType.CELL;
mCellBatterySipper.totalPowerMah = POWER_MAH;
- mBatteryPercentText = new TextView(mRealContext);
when(mBatteryLayoutPref.findViewById(R.id.summary1)).thenReturn(mSummary1);
when(mBatteryLayoutPref.findViewById(R.id.battery_percent)).thenReturn(mBatteryPercentText);
when(mBatteryLayoutPref.findViewById(R.id.battery_header_icon))
@@ -207,8 +201,6 @@
mFragment.mScreenUsagePref = mScreenUsagePref;
mFragment.mLastFullChargePref = mLastFullChargePref;
mFragment.mBatteryUtils = spy(new BatteryUtils(mRealContext));
-
- mBatteryInfo.batteryLevel = BATTERY_LEVEL;
}
@Test
@@ -281,50 +273,6 @@
}
@Test
- public void testInitHeaderPreference_initCorrectly() {
- mFragment.mBatteryLevel = 100;
-
- mFragment.initHeaderPreference();
-
- assertThat(mBatteryMeterView.getBatteryLevel()).isEqualTo(100);
- assertThat(mBatteryPercentText.getText().toString()).isEqualTo("100%");
- }
-
- @Test
- public void testStartBatteryHeaderAnimationIfNecessary_batteryLevelChanged_animationStarted() {
- final int prevLevel = 100;
- final int curLevel = 80;
-
- mFragment.startBatteryHeaderAnimationIfNecessary(mBatteryMeterView, mBatteryPercentText,
- prevLevel, curLevel);
-
- assertThat(mBatteryMeterView.getBatteryLevel()).isEqualTo(curLevel);
- assertThat(mBatteryPercentText.getText().toString()).isEqualTo("80%");
- }
-
- @Test
- public void testOnSaveInstanceState_saveBatteryLevel() {
- Bundle bundle = new Bundle();
- mFragment.mBatteryLevel = BATTERY_LEVEL;
- // mock it to stop crash in getPreferenceScreen
- doReturn(null).when(mFragment).getPreferenceScreen();
-
- mFragment.onSaveInstanceState(bundle);
-
- assertThat(bundle.getInt(PowerUsageSummary.ARG_BATTERY_LEVEL)).isEqualTo(BATTERY_LEVEL);
- }
-
- @Test
- public void testOnActivityCreated_setBatteryLevel() {
- Bundle bundle = new Bundle();
- bundle.putInt(PowerUsageSummary.ARG_BATTERY_LEVEL, BATTERY_LEVEL);
-
- mFragment.onActivityCreated(bundle);
-
- assertThat(mFragment.mBatteryLevel).isEqualTo(BATTERY_LEVEL);
- }
-
- @Test
public void testExtractKeyFromSipper_typeAPPUidObjectNull_returnPackageNames() {
mNormalBatterySipper.uidObj = null;
mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
@@ -372,45 +320,6 @@
assertThat(mPreference.getSummary().toString()).isEqualTo(expectedSummary);
}
- @Test
- public void testUpdatePreference_hasRemainingTime_showRemainingLabel() {
- mBatteryInfo.remainingLabel = TIME_LEFT;
-
- mFragment.updateHeaderPreference(mBatteryInfo);
-
- verify(mSummary1).setText(mBatteryInfo.remainingLabel);
- }
-
- @Test
- public void testUpdatePreference_updateBatteryInfo() {
- mBatteryInfo.remainingLabel = TIME_LEFT;
- mBatteryInfo.batteryLevel = BATTERY_LEVEL;
- mBatteryInfo.discharging = true;
-
- mFragment.updateHeaderPreference(mBatteryInfo);
-
- assertThat(mBatteryMeterView.mDrawable.getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
- assertThat(mBatteryMeterView.mDrawable.getCharging()).isEqualTo(false);
- }
-
- @Test
- public void testUpdatePreference_noRemainingTime_showStatusLabel() {
- mBatteryInfo.remainingLabel = null;
-
- mFragment.updateHeaderPreference(mBatteryInfo);
-
- verify(mSummary1).setText(mBatteryInfo.statusLabel);
- }
-
- @Test
- public void testUpdateHeaderPreference_asyncUpdate_shouldNotCrash() {
- when(mFragment.getContext()).thenReturn(null);
- mBatteryInfo.remainingTimeUs = REMAINING_TIME_US;
-
- //Should not crash
- mFragment.updateHeaderPreference(mBatteryInfo);
- }
-
private void testToggleAllApps(final boolean isShowApps) {
mFragment.mShowAllApps = isShowApps;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
index 8393fc3..7caf3fc 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
@@ -19,13 +19,14 @@
import android.content.Context;
import android.hardware.Sensor;
import android.hardware.SensorManager;
+import android.os.UserManager;
import android.provider.Settings;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,7 +42,9 @@
import static android.provider.Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -58,9 +61,15 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mock(UserManager.class));
mController = new DoubleTwistPreferenceController(mContext, null, KEY_DOUBLE_TWIST);
}
+ @After
+ public void tearDown() {
+ ShadowSecureSettings.clear();
+ }
+
@Test
public void isAvailable_hasSensor_shouldReturnTrue() {
// Mock sensors
@@ -94,6 +103,27 @@
}
@Test
+ @Config(shadows = {ShadowSecureSettings.class})
+ public void onPreferenceChange_hasWorkProfile_shouldUpdateSettingForWorkProfileUser() {
+ final int managedId = 2;
+ ShadowSecureSettings.putIntForUser(
+ null, CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0, managedId);
+ DoubleTwistPreferenceController controller =
+ spy(new DoubleTwistPreferenceController(mContext, null, KEY_DOUBLE_TWIST));
+ doReturn(managedId).when(controller).getManagedProfileUserId();
+
+ // enable the gesture
+ controller.onPreferenceChange(null, true);
+ assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
+ CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0, managedId)).isEqualTo(1);
+
+ // disable the gesture
+ controller.onPreferenceChange(null, false);
+ assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
+ CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1, managedId)).isEqualTo(0);
+ }
+
+ @Test
public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
// Set the setting to be enabled.
final Context context = ShadowApplication.getInstance().getApplicationContext();
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index 7e92bc5..cecc910 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -20,7 +20,10 @@
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothPan;
import android.bluetooth.BluetoothProfile;
+import android.content.ContentResolver;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.database.ContentObserver;
import android.net.ConnectivityManager;
import android.provider.Settings;
@@ -41,6 +44,7 @@
import java.util.concurrent.atomic.AtomicReference;
+import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -150,4 +154,36 @@
verify(mPreference).setSummary(R.string.switch_off_text);
}
+ @Test
+ public void onResume_shouldRegisterTetherReceiver() {
+ when(mContext.getContentResolver()).thenReturn(mock(ContentResolver.class));
+
+ mController.onResume();
+
+ verify(mContext).registerReceiver(
+ any(TetherPreferenceController.TetherBroadcastReceiver.class), any(IntentFilter.class));
+ }
+
+ @Test
+ public void onPause_shouldUnregisterTetherReceiver() {
+ when(mContext.getContentResolver()).thenReturn(mock(ContentResolver.class));
+ mController.onResume();
+
+ mController.onPause();
+
+ verify(mContext).unregisterReceiver(
+ any(TetherPreferenceController.TetherBroadcastReceiver.class));
+ }
+
+ @Test
+ public void tetherStatesChanged_shouldUpdateSummary() {
+ final Context context = RuntimeEnvironment.application;
+ ReflectionHelpers.setField(mController, "mContext", context);
+ mController.onResume();
+
+ context.sendBroadcast(new Intent(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
+
+ verify(mController).updateSummary();
+ }
+
}
diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefTest.java
new file mode 100644
index 0000000..39f1377
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/SettingPrefTest.java
@@ -0,0 +1,67 @@
+package com.android.settings.notification;
+
+import android.content.res.Resources;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v7.preference.DropDownPreference;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SettingPrefTest {
+
+ @Test
+ public void update_setsDropDownSummaryText() {
+ Context context = RuntimeEnvironment.application;
+ String testSetting = "test_setting";
+ int[] values = new int[] {1,2,3};
+ String[] entries = new String[] {"one", "two", "three"};
+ SettingPref settingPref =
+ spy(new SettingPref(SettingPref.TYPE_GLOBAL, "key", testSetting, 0, values) {
+ @Override
+ protected String getCaption(Resources res, int value) {
+ return "temp";
+ }
+ });
+ DropDownPreference dropdownPref = spy(new DropDownPreference(context));
+ dropdownPref.setEntries(entries);
+ settingPref.mDropDown = dropdownPref;
+ Settings.Global.putInt(context.getContentResolver(), testSetting, values[2]);
+
+ settingPref.update(context);
+
+ assertThat(settingPref.mDropDown.getSummary()).isEqualTo(entries[2]);
+ }
+
+ @Test
+ public void update_setsDropDownSummaryText_noMatch_noError() {
+ Context context = RuntimeEnvironment.application;
+ String testSetting = "test_setting";
+ int[] values = new int[] {1,2,3};
+ String[] entries = new String[] {"one", "two", "three"};
+ SettingPref settingPref =
+ spy(new SettingPref(SettingPref.TYPE_GLOBAL, "key", testSetting, 0, values) {
+ @Override
+ protected String getCaption(Resources res, int value) {
+ return "temp";
+ }
+ });
+ DropDownPreference dropdownPref = spy(new DropDownPreference(context));
+ dropdownPref.setEntries(entries);
+ settingPref.mDropDown = dropdownPref;
+ Settings.Global.putInt(context.getContentResolver(), testSetting, -1);
+
+ settingPref.update(context);
+
+ assertThat(settingPref.mDropDown.getSummary()).isNull();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java b/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
index 8b97a91..862db32 100644
--- a/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
@@ -379,6 +379,47 @@
}
@Test
+ public void testDeDupe_threeDuplicates_onlyOneStays() {
+ /*
+ * Create a list as follows:
+ * (3) Intent One
+ * (2) Intent One
+ * (1) Intent One
+ *
+ * After removing duplicates:
+ * (1) Intent One
+ */
+ List<SearchResult> results = new ArrayList();
+ IntentPayload intentPayload = new IntentPayload(new Intent());
+
+ SearchResult.Builder builder = new SearchResult.Builder();
+ // Intent One
+ builder.addTitle(titleOne)
+ .addSummary(summaryOne)
+ .addPayload(intentPayload);
+ SearchResult resultOne = builder.build();
+ results.add(resultOne);
+
+ // Intent Two
+ builder.addTitle(titleOne)
+ .addSummary(summaryOne)
+ .addPayload(intentPayload);
+ SearchResult resultTwo = builder.build();
+ results.add(resultTwo);
+
+ // Intent Three
+ builder.addTitle(titleOne)
+ .addSummary(summaryOne)
+ .addPayload(intentPayload);
+ SearchResult resultThree = builder.build();
+ results.add(resultThree);
+
+ loader = new DatabaseResultLoader(mContext, "", null);
+ loader.removeDuplicates(results);
+ assertThat(results.size()).isEqualTo(1);
+ }
+
+ @Test
public void testSpecialCaseTwoWords_firstWordMatches_ranksHigher() {
final String caseOne = "Apple pear";
final String caseTwo = "Banana apple";
diff --git a/tests/robotests/src/com/android/settings/search2/HeaderDecoratorTest.java b/tests/robotests/src/com/android/settings/search2/HeaderDecoratorTest.java
new file mode 100644
index 0000000..4fdf44c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search2/HeaderDecoratorTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2017 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.search2;
+
+import android.app.LoaderManager;
+import android.content.Context;
+import android.content.Loader;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.search.IndexingCallback;
+import com.android.settings.testutils.FakeFeatureFactory;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ActivityController;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class HeaderDecoratorTest {
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private View mView;
+ @Mock
+ private RecyclerView mRecyclerView;
+ @Mock
+ private RecyclerView.LayoutParams mLayoutParams;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ when(mView.getLayoutParams()).thenReturn(mLayoutParams);
+ }
+
+ @Test
+ public void testgetItemOffsets_positionZero_headerAdded() {
+ HeaderDecorator decorator = new HeaderDecorator();
+ Rect outRect = new Rect();
+ when(mRecyclerView.getChildAdapterPosition(any(View.class))).thenReturn(0);
+ when(mView.getContext().obtainStyledAttributes(any(int[].class))
+ .getDimensionPixelSize(0, 0)).thenReturn(20);
+ when(mView.getContext().getResources().getDimensionPixelSize(R.dimen.search_bar_margin))
+ .thenReturn(5);
+
+ decorator.getItemOffsets(outRect, mView, mRecyclerView, null);
+
+ assertThat(outRect).isEqualTo(new Rect(0, 30, 0, 0));
+ }
+
+ @Test
+ public void testgetItemOffsets_positionGreaterThanZero_noDecoration() {
+ HeaderDecorator decorator = new HeaderDecorator();
+ Rect outRect = new Rect();
+ when(mRecyclerView.getChildAdapterPosition(any(View.class))).thenReturn(1);
+
+ decorator.getItemOffsets(outRect, mView, mRecyclerView, null);
+
+ assertThat(outRect).isEqualTo(new Rect(0, 0, 0, 0));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
new file mode 100644
index 0000000..c6a0e53
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2017 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.security;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.XmlTestUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class LockscreenDashboardFragmentTest {
+
+ private LockscreenDashboardFragment mFragment;
+
+ @Test
+ public void containsNotificationSettingsForPrimaryUserAndWorkProfile() {
+ mFragment = new LockscreenDashboardFragment();
+
+ List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(RuntimeEnvironment.application,
+ mFragment.getPreferenceScreenResId());
+
+ assertThat(keys).containsAllOf(LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON,
+ LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE,
+ LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
index 1d15b42..bf0005c 100644
--- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
@@ -22,10 +22,14 @@
import android.accounts.AccountManager;
import android.content.Context;
import android.os.UserManager;
+import android.provider.Settings;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
+import com.android.settings.testutils.shadow.ShadowUtils;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,7 +37,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class FactoryResetPreferenceControllerTest {
@@ -57,6 +60,11 @@
mController = new FactoryResetPreferenceController(mContext);
}
+ @After
+ public void tearDown() {
+ ShadowUtils.reset();
+ }
+
@Test
public void isAvailable_systemUser() {
when(mUserManager.isAdminUser()).thenReturn(true);
@@ -65,13 +73,29 @@
}
@Test
+ @Config(shadows = { ShadowSecureSettings.class, ShadowUtils.class })
public void isAvailable_nonSystemUser() {
when(mUserManager.isAdminUser()).thenReturn(false);
+ ShadowUtils.setIsCarrierDemoUser(false);
assertThat(mController.isAvailable()).isFalse();
}
@Test
+ @Config(shadows = { ShadowSecureSettings.class, ShadowUtils.class })
+ public void isAvailable_carrierDemoUser() {
+ when(mUserManager.isAdminUser()).thenReturn(false);
+ ShadowUtils.setIsCarrierDemoUser(true);
+
+ final String carrierDemoModeSetting = "carrier_demo_mode";
+ when(mContext.getString(com.android.internal.R.string.config_carrierDemoModeSetting))
+ .thenReturn(carrierDemoModeSetting);
+ Settings.Secure.putInt(null, carrierDemoModeSetting, 1);
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
public void getPreferenceKey() {
assertThat(mController.getPreferenceKey()).isEqualTo(FACTORY_RESET_KEY);
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
new file mode 100644
index 0000000..b1419ba
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2017 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.testutils.shadow;
+
+import com.android.internal.widget.LockPatternUtils;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(LockPatternUtils.class)
+public class ShadowLockPatternUtils {
+
+ @Implementation
+ public boolean isSecure(int id) {
+ return true;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
index fd4d0d2..64e188e 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
@@ -68,4 +68,8 @@
Integer value = (Integer) mValueMap.get(name);
return value == null ? defaultValue : value;
}
+
+ public static void clear() {
+ mValueMap.clear();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
index 87b9103..208fae3 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
@@ -28,6 +28,7 @@
public class ShadowUtils {
private static IFingerprintManager sFingerprintManager = null;
+ private static boolean sIsCarrierDemoUser;
@Implementation
public static int enforceSameOwner(Context context, int userId) {
@@ -45,10 +46,20 @@
public static void reset() {
sFingerprintManager = null;
+ sIsCarrierDemoUser = false;
}
@Implementation
public static boolean isWifiOnly(Context context) {
return true;
}
+
+ public static void setIsCarrierDemoUser(boolean isCarrierDemoUser) {
+ sIsCarrierDemoUser = isCarrierDemoUser;
+ }
+
+ @Implementation
+ public static boolean isCarrierDemoUser(Context context) {
+ return sIsCarrierDemoUser;
+ }
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
new file mode 100644
index 0000000..5646470
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2017 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.wifi;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.widget.SwitchWidgetController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WifiEnablerTest {
+
+ @Mock
+ private Context mContext;
+ @Mock
+ private WifiManager mWifiManager;
+ @Mock
+ private ConnectivityManagerWrapper mConnectivityManager;
+
+ private WifiEnabler mEnabler;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+ mEnabler = new WifiEnabler(mContext, mock(SwitchWidgetController.class),
+ mock(MetricsFeatureProvider.class), mConnectivityManager);
+ }
+
+ @Test
+ public void onSwitchToggled_avoidBadWifiConfigIsFalse_shouldReturnTrue() {
+ when(mWifiManager.setWifiEnabled(true)).thenReturn(true);
+ when(mWifiManager.getWifiApState()).thenReturn(WifiManager.WIFI_AP_STATE_ENABLED);
+
+ mEnabler.onSwitchToggled(true);
+
+ verify(mConnectivityManager).stopTethering(ConnectivityManager.TETHERING_WIFI);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
index 208c157..18cfa4e 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
@@ -75,9 +75,13 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -89,9 +93,6 @@
private static final String MAC_ADDRESS = WifiInfo.DEFAULT_MAC_ADDRESS;
private static final String SECURITY = "None";
- private InetAddress mIpv4Address;
- private Inet6Address mIpv6Address;
-
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PreferenceScreen mockScreen;
@@ -120,35 +121,76 @@
@Mock private WifiDetailPreference mockSubnetPref;
@Mock private WifiDetailPreference mockDnsPref;
@Mock private Button mockForgetButton;
- @Mock private PreferenceCategory mockIpv6AddressCategory;
+ @Mock private PreferenceCategory mockIpv6Category;
+ @Mock private WifiDetailPreference mockIpv6AddressesPref;
@Captor private ArgumentCaptor<NetworkCallback> mCallbackCaptor;
@Captor private ArgumentCaptor<View.OnClickListener> mForgetClickListener;
+ @Captor private ArgumentCaptor<Preference> mIpv6AddressCaptor;
private Context mContext = RuntimeEnvironment.application;
private Lifecycle mLifecycle;
private LinkProperties mLinkProperties;
private WifiDetailPreferenceController mController;
+ // This class exists so that these values can be made static final. They can't be static final
+ // members of the test class, because any attempt to call IpPrefix or RouteInfo constructors
+ // during static initialization of the test class results in NoSuchMethorError being thrown
+ // when the test is run.
+ private static class Constants {
+ static final int IPV4_PREFIXLEN = 25;
+ static final LinkAddress IPV4_ADDR;
+ static final Inet4Address IPV4_GATEWAY;
+ static final RouteInfo IPV4_DEFAULT;
+ static final RouteInfo IPV4_SUBNET;
+ static final LinkAddress IPV6_LINKLOCAL;
+ static final LinkAddress IPV6_GLOBAL1;
+ static final LinkAddress IPV6_GLOBAL2;
+ static final InetAddress IPV4_DNS1;
+ static final InetAddress IPV4_DNS2;
+ static final InetAddress IPV6_DNS;
+
+ private static LinkAddress ipv6LinkAddress(String addr) throws UnknownHostException {
+ return new LinkAddress(InetAddress.getByName(addr), 64);
+ }
+
+ private static LinkAddress ipv4LinkAddress(String addr, int prefixlen)
+ throws UnknownHostException {
+ return new LinkAddress(InetAddress.getByName(addr), prefixlen);
+ }
+
+ static {
+ try {
+ // We create our test constants in these roundabout ways because the robolectric
+ // shadows don't contain NetworkUtils.parseNumericAddress and other utility methods,
+ // so the easy ways to do things fail with NoSuchMethodError.
+ IPV4_ADDR = ipv4LinkAddress("192.0.2.2", IPV4_PREFIXLEN);
+ IPV4_GATEWAY = (Inet4Address) InetAddress.getByName("192.0.2.127");
+
+ final Inet4Address any4 = (Inet4Address) InetAddress.getByName("0.0.0.0");
+ IpPrefix subnet = new IpPrefix(IPV4_ADDR.getAddress(), IPV4_PREFIXLEN);
+ IPV4_SUBNET = new RouteInfo(subnet, any4);
+ IPV4_DEFAULT = new RouteInfo(new IpPrefix(any4, 0), IPV4_GATEWAY);
+
+ IPV6_LINKLOCAL = ipv6LinkAddress("fe80::211:25ff:fef8:7cb2%1");
+ IPV6_GLOBAL1 = ipv6LinkAddress("2001:db8:1::211:25ff:fef8:7cb2");
+ IPV6_GLOBAL2 = ipv6LinkAddress("2001:db8:1::3dfe:8902:f98f:739d");
+
+ IPV4_DNS1 = InetAddress.getByName("8.8.8.8");
+ IPV4_DNS2 = InetAddress.getByName("8.8.4.4");
+ IPV6_DNS = InetAddress.getByName("2001:4860:4860::64");
+ } catch (UnknownHostException e) {
+ throw new RuntimeException("Invalid hardcoded IP addresss: " + e);
+ }
+ }
+ }
+
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mLifecycle = new Lifecycle();
- try {
- mIpv4Address = InetAddress.getByAddress(
- new byte[] { (byte) 255, (byte) 255, (byte) 255, (byte) 255 });
- mIpv6Address = Inet6Address.getByAddress(
- "123", /* host */
- new byte[] {
- (byte) 0xFE, (byte) 0x80, 0, 0, 0, 0, 0, 0, 0x02, 0x11, 0x25,
- (byte) 0xFF, (byte) 0xFE, (byte) 0xF8, (byte) 0x7C, (byte) 0xB2},
- 1 /*scope id */);
- } catch (UnknownHostException e) {
- throw new RuntimeException(e);
- }
-
when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfig);
when(mockAccessPoint.getLevel()).thenReturn(LEVEL);
when(mockAccessPoint.getSecurityString(false)).thenReturn(SECURITY);
@@ -195,9 +237,9 @@
.thenReturn(mockConnectionDetailPref);
when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_BUTTONS_PREF))
.thenReturn(mockButtonsPref);
- when(mockButtonsPref.findViewById(R.id.left_button))
+ when(mockButtonsPref.findViewById(R.id.forget_button))
.thenReturn(mockForgetButton);
- when(mockButtonsPref.findViewById(R.id.right_button))
+ when(mockButtonsPref.findViewById(R.id.signin_button))
.thenReturn(mockSignInButton);
when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SIGNAL_STRENGTH_PREF))
.thenReturn(mockSignalStrengthPref);
@@ -217,8 +259,10 @@
.thenReturn(mockSubnetPref);
when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_DNS_PREF))
.thenReturn(mockDnsPref);
- when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_IPV6_ADDRESS_CATEGORY))
- .thenReturn(mockIpv6AddressCategory);
+ when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_IPV6_CATEGORY))
+ .thenReturn(mockIpv6Category);
+ when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_IPV6_ADDRESSES_PREF))
+ .thenReturn(mockIpv6AddressesPref);
}
@Test
@@ -330,26 +374,23 @@
@Test
public void ipAddressPref_shouldHaveDetailTextSet() {
- LinkAddress ipv4Address = new LinkAddress(mIpv4Address, 32);
-
- mLinkProperties.addLinkAddress(ipv4Address);
+ mLinkProperties.addLinkAddress(Constants.IPV4_ADDR);
mController.displayPreference(mockScreen);
- verify(mockIpAddressPref).setDetailText(mIpv4Address.getHostAddress());
+ verify(mockIpAddressPref).setDetailText(Constants.IPV4_ADDR.getAddress().getHostAddress());
}
@Test
public void gatewayAndSubnet_shouldHaveDetailTextSet() {
- int prefixLength = 24;
- IpPrefix subnet = new IpPrefix(mIpv4Address, prefixLength);
- InetAddress gateway = mIpv4Address;
- mLinkProperties.addRoute(new RouteInfo(subnet, gateway));
+ mLinkProperties.addLinkAddress(Constants.IPV4_ADDR);
+ mLinkProperties.addRoute(Constants.IPV4_DEFAULT);
+ mLinkProperties.addRoute(Constants.IPV4_SUBNET);
mController.displayPreference(mockScreen);
- verify(mockSubnetPref).setDetailText("255.255.255.0");
- verify(mockGatewayPref).setDetailText(mIpv4Address.getHostAddress());
+ verify(mockSubnetPref).setDetailText("255.255.255.128");
+ verify(mockGatewayPref).setDetailText("192.0.2.127");
}
@Test
@@ -376,23 +417,146 @@
@Test
public void noLinkProperties_allIpDetailsHidden() {
when(mockConnectivityManager.getLinkProperties(mockNetwork)).thenReturn(null);
- reset(mockIpv6AddressCategory, mockIpAddressPref, mockSubnetPref, mockGatewayPref,
+ reset(mockIpv6Category, mockIpAddressPref, mockSubnetPref, mockGatewayPref,
mockDnsPref);
mController.displayPreference(mockScreen);
- verify(mockIpv6AddressCategory).setVisible(false);
+ verify(mockIpv6Category).setVisible(false);
verify(mockIpAddressPref).setVisible(false);
verify(mockSubnetPref).setVisible(false);
verify(mockGatewayPref).setVisible(false);
verify(mockDnsPref).setVisible(false);
- verify(mockIpv6AddressCategory, never()).setVisible(true);
+ verify(mockIpv6Category, never()).setVisible(true);
verify(mockIpAddressPref, never()).setVisible(true);
verify(mockSubnetPref, never()).setVisible(true);
verify(mockGatewayPref, never()).setVisible(true);
verify(mockDnsPref, never()).setVisible(true);
}
+ // Convenience method to convert a LinkAddress to a string without a prefix length.
+ private String asString(LinkAddress l) {
+ return l.getAddress().getHostAddress();
+ }
+
+ // Pretend that the NetworkCallback was triggered with a new copy of lp. We need to create a
+ // new copy because the code only updates if !mLinkProperties.equals(lp).
+ private void updateLinkProperties(LinkProperties lp) {
+ mCallbackCaptor.getValue().onLinkPropertiesChanged(mockNetwork, new LinkProperties(lp));
+ }
+
+ private void updateNetworkCapabilities(NetworkCapabilities nc) {
+ mCallbackCaptor.getValue().onCapabilitiesChanged(mockNetwork, new NetworkCapabilities(nc));
+ }
+
+ private NetworkCapabilities makeNetworkCapabilities() {
+ NetworkCapabilities nc = new NetworkCapabilities();
+ nc.clearAll();
+ nc.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
+ return nc;
+ }
+
+ private void verifyDisplayedIpv6Addresses(InOrder inOrder, LinkAddress... addresses) {
+ String text = Arrays.stream(addresses)
+ .map(address -> asString(address))
+ .collect(Collectors.joining("\n"));
+ inOrder.verify(mockIpv6AddressesPref).setSummary(text);
+ }
+
+ @Test
+ public void onLinkPropertiesChanged_updatesFields() {
+ mController.displayPreference(mockScreen);
+ mController.onResume();
+
+ InOrder inOrder = inOrder(mockIpAddressPref, mockGatewayPref, mockSubnetPref,
+ mockDnsPref, mockIpv6Category, mockIpv6AddressesPref);
+
+ LinkProperties lp = new LinkProperties();
+
+ lp.addLinkAddress(Constants.IPV6_LINKLOCAL);
+ updateLinkProperties(lp);
+ verifyDisplayedIpv6Addresses(inOrder, Constants.IPV6_LINKLOCAL);
+ inOrder.verify(mockIpv6Category).setVisible(true);
+
+ lp.addRoute(Constants.IPV4_DEFAULT);
+ updateLinkProperties(lp);
+ inOrder.verify(mockGatewayPref).setDetailText(Constants.IPV4_GATEWAY.getHostAddress());
+ inOrder.verify(mockGatewayPref).setVisible(true);
+
+ lp.addLinkAddress(Constants.IPV4_ADDR);
+ lp.addRoute(Constants.IPV4_SUBNET);
+ updateLinkProperties(lp);
+ inOrder.verify(mockIpAddressPref).setDetailText(asString(Constants.IPV4_ADDR));
+ inOrder.verify(mockIpAddressPref).setVisible(true);
+ inOrder.verify(mockSubnetPref).setDetailText("255.255.255.128");
+ inOrder.verify(mockSubnetPref).setVisible(true);
+
+ lp.addLinkAddress(Constants.IPV6_GLOBAL1);
+ lp.addLinkAddress(Constants.IPV6_GLOBAL2);
+ updateLinkProperties(lp);
+ verifyDisplayedIpv6Addresses(inOrder,
+ Constants.IPV6_LINKLOCAL,
+ Constants.IPV6_GLOBAL1,
+ Constants.IPV6_GLOBAL2);
+
+ lp.removeLinkAddress(Constants.IPV6_GLOBAL1);
+ updateLinkProperties(lp);
+ verifyDisplayedIpv6Addresses(inOrder,
+ Constants.IPV6_LINKLOCAL,
+ Constants.IPV6_GLOBAL2);
+
+ lp.addDnsServer(Constants.IPV6_DNS);
+ updateLinkProperties(lp);
+ inOrder.verify(mockDnsPref, never()).setVisible(true);
+
+ lp.addDnsServer(Constants.IPV4_DNS1);
+ lp.addDnsServer(Constants.IPV4_DNS2);
+ updateLinkProperties(lp);
+ inOrder.verify(mockDnsPref).setDetailText(
+ Constants.IPV4_DNS1.getHostAddress() + "," +
+ Constants.IPV4_DNS2.getHostAddress());
+ inOrder.verify(mockDnsPref).setVisible(true);
+ }
+
+ @Test
+ public void onCapabilitiesChanged_callsRefreshIfNecessary() {
+ NetworkCapabilities nc = makeNetworkCapabilities();
+ when(mockConnectivityManager.getNetworkCapabilities(mockNetwork))
+ .thenReturn(new NetworkCapabilities(nc));
+
+ String summary = "Connected, no Internet";
+ when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
+
+ InOrder inOrder = inOrder(mockConnectionDetailPref);
+ mController.displayPreference(mockScreen);
+ mController.onResume();
+ inOrder.verify(mockConnectionDetailPref).setTitle(summary);
+
+ // Check that an irrelevant capability update does not update the access point summary, as
+ // doing so could cause unnecessary jank...
+ summary = "Connected";
+ when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
+ updateNetworkCapabilities(nc);
+ inOrder.verify(mockConnectionDetailPref, never()).setTitle(any());
+
+ // ... but that if the network validates, then we do refresh.
+ nc.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
+ updateNetworkCapabilities(nc);
+ inOrder.verify(mockConnectionDetailPref).setTitle(summary);
+
+ summary = "Connected, no Internet";
+ when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
+
+ // Another irrelevant update won't cause the UI to refresh...
+ updateNetworkCapabilities(nc);
+ inOrder.verify(mockConnectionDetailPref, never()).setTitle(any());
+
+ // ... but if the network is no longer validated, then we display "connected, no Internet".
+ nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
+ updateNetworkCapabilities(nc);
+ inOrder.verify(mockConnectionDetailPref).setTitle(summary);
+ }
+
@Test
public void canForgetNetwork_noNetwork() {
when(mockAccessPoint.getConfig()).thenReturn(null);
@@ -475,7 +639,7 @@
}
@Test
- public void networkDisconnectdState_shouldFinishActivity() {
+ public void networkDisconnectedState_shouldFinishActivity() {
mController.onResume();
when(mockConnectivityManager.getNetworkInfo(any(Network.class))).thenReturn(null);
@@ -496,28 +660,29 @@
@Test
public void ipv6AddressPref_shouldHaveHostAddressTextSet() {
- LinkAddress ipv6Address = new LinkAddress(mIpv6Address, 128);
-
- mLinkProperties.addLinkAddress(ipv6Address);
+ mLinkProperties.addLinkAddress(Constants.IPV6_LINKLOCAL);
+ mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL1);
+ mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL2);
mController.displayPreference(mockScreen);
- ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(Preference.class);
- verify(mockIpv6AddressCategory).addPreference(preferenceCaptor.capture());
- assertThat(preferenceCaptor.getValue().getTitle()).isEqualTo(mIpv6Address.getHostAddress());
+ List <Preference> addrs = mIpv6AddressCaptor.getAllValues();
+
+ String expectedAddresses = String.join("\n",
+ asString(Constants.IPV6_LINKLOCAL),
+ asString(Constants.IPV6_GLOBAL1),
+ asString(Constants.IPV6_GLOBAL2));
+
+ verify(mockIpv6AddressesPref).setSummary(expectedAddresses);
}
@Test
public void ipv6AddressPref_shouldNotBeSelectable() {
- LinkAddress ipv6Address = new LinkAddress(mIpv6Address, 128);
-
- mLinkProperties.addLinkAddress(ipv6Address);
+ mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL2);
mController.displayPreference(mockScreen);
- ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(Preference.class);
- verify(mockIpv6AddressCategory).addPreference(preferenceCaptor.capture());
- assertThat(preferenceCaptor.getValue().isSelectable()).isFalse();
+ assertThat(mockIpv6AddressesPref.isSelectable()).isFalse();
}
@Test
@@ -529,22 +694,16 @@
inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
- NetworkCapabilities nc = new NetworkCapabilities();
- nc.clearAll();
- nc.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
-
- NetworkCallback callback = mCallbackCaptor.getValue();
- callback.onCapabilitiesChanged(mockNetwork, nc);
+ NetworkCapabilities nc = makeNetworkCapabilities();
+ updateNetworkCapabilities(nc);
inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
- nc = new NetworkCapabilities(nc);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
- callback.onCapabilitiesChanged(mockNetwork, nc);
+ updateNetworkCapabilities(nc);
inOrder.verify(mockSignInButton).setVisibility(View.VISIBLE);
- nc = new NetworkCapabilities(nc);
nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
- callback.onCapabilitiesChanged(mockNetwork, nc);
+ updateNetworkCapabilities(nc);
inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
}
diff --git a/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java b/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java
index 92e556e..d207701 100644
--- a/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java
+++ b/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java
@@ -22,16 +22,20 @@
import android.content.pm.ApplicationInfo;
+import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppFilter;
+import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
+import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
+import java.lang.reflect.Field;
import org.junit.Test;
public class ManageApplicationsTest {
@Test
- public void getOverrideFilter_filtersVolumeForAudio() {
+ public void getCompositeFilter_filtersVolumeForAudio() {
AppFilter filter =
- ManageApplications.getOverrideFilter(
+ ManageApplications.getCompositeFilter(
ManageApplications.LIST_TYPE_STORAGE,
ManageApplications.STORAGE_TYPE_MUSIC,
"uuid");
@@ -45,9 +49,9 @@
}
@Test
- public void getOverrideFilter_filtersVolumeForVideo() {
+ public void getCompositeFilter_filtersVolumeForVideo() {
AppFilter filter =
- ManageApplications.getOverrideFilter(
+ ManageApplications.getCompositeFilter(
ManageApplications.LIST_TYPE_MOVIES,
ManageApplications.STORAGE_TYPE_DEFAULT,
"uuid");
@@ -61,9 +65,9 @@
}
@Test
- public void getOverrideFilter_filtersVolumeForGames() {
+ public void getCompositeFilter_filtersVolumeForGames() {
ApplicationsState.AppFilter filter =
- ManageApplications.getOverrideFilter(
+ ManageApplications.getCompositeFilter(
ManageApplications.LIST_TYPE_GAMES,
ManageApplications.STORAGE_TYPE_DEFAULT,
"uuid");
@@ -77,12 +81,35 @@
}
@Test
- public void getOverrideFilter_isEmptyNormally() {
+ public void getCompositeFilter_isEmptyNormally() {
ApplicationsState.AppFilter filter =
- ManageApplications.getOverrideFilter(
+ ManageApplications.getCompositeFilter(
ManageApplications.LIST_TYPE_MAIN,
ManageApplications.STORAGE_TYPE_DEFAULT,
"uuid");
assertThat(filter).isNull();
}
+
+ @Test
+ public void getCompositeFilter_worksWithInstantApps() throws Exception {
+ Field field = AppUtils.class.getDeclaredField("sInstantAppDataProvider");
+ field.setAccessible(true);
+ field.set(AppUtils.class, (InstantAppDataProvider) (i -> true));
+
+ AppFilter filter =
+ ManageApplications.getCompositeFilter(
+ ManageApplications.LIST_TYPE_STORAGE,
+ ManageApplications.STORAGE_TYPE_MUSIC,
+ "uuid");
+ AppFilter composedFilter = new CompoundFilter(ApplicationsState.FILTER_INSTANT, filter);
+
+ final ApplicationInfo info = new ApplicationInfo();
+ info.volumeUuid = "uuid";
+ info.category = ApplicationInfo.CATEGORY_AUDIO;
+ info.privateFlags = ApplicationInfo.PRIVATE_FLAG_INSTANT;
+ final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+ appEntry.info = info;
+
+ assertThat(composedFilter.filterApp(appEntry)).isTrue();
+ }
}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
index 546ea4b..79a4595 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/storage/StorageAsyncLoaderTest.java
@@ -133,9 +133,9 @@
info.id = SECONDARY_USER_ID;
mUsers.add(info);
when(mSource.getExternalStorageStats(anyString(), eq(UserHandle.SYSTEM)))
- .thenReturn(new StorageStatsSource.ExternalStorageStats(9, 2, 3, 4));
+ .thenReturn(new StorageStatsSource.ExternalStorageStats(9, 2, 3, 4, 0));
when(mSource.getExternalStorageStats(anyString(), eq(new UserHandle(SECONDARY_USER_ID))))
- .thenReturn(new StorageStatsSource.ExternalStorageStats(10, 3, 3, 4));
+ .thenReturn(new StorageStatsSource.ExternalStorageStats(10, 3, 3, 4, 0));
SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
@@ -145,19 +145,6 @@
}
@Test
- public void testSystemAppsBaseSizeIsAddedToSystem() throws Exception {
- ApplicationInfo systemApp =
- addPackage(PACKAGE_NAME_1, 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);
- systemApp.flags = ApplicationInfo.FLAG_SYSTEM;
-
- SparseArray<StorageAsyncLoader.AppsStorageResult> result = mLoader.loadInBackground();
-
- assertThat(result.size()).isEqualTo(1);
- assertThat(result.get(PRIMARY_USER_ID).otherAppsSize).isEqualTo(10L);
- assertThat(result.get(PRIMARY_USER_ID).systemSize).isEqualTo(1L);
- }
-
- @Test
public void testUpdatedSystemAppCodeSizeIsCounted() throws Exception {
ApplicationInfo systemApp =
addPackage(PACKAGE_NAME_1, 100, 1, 10, ApplicationInfo.CATEGORY_UNDEFINED);