Merge "Prevent unnecessary reconnection for wifi privacy" into main
diff --git a/Android.bp b/Android.bp
index 8c50ed5..a56cc19 100644
--- a/Android.bp
+++ b/Android.bp
@@ -103,7 +103,6 @@
"securebox",
"settings-logtags",
"statslog-settings",
- "zxing-core-1.7",
"android.hardware.dumpstate-V1.0-java",
"android.hardware.dumpstate-V1.1-java",
"android.hardware.dumpstate-V1-java",
@@ -118,11 +117,17 @@
"factory_reset_flags_lib",
"android.content.pm.flags-aconfig-java",
"FingerprintManagerInteractor",
+ "notification_flags_lib",
],
- plugins: [
- "androidx.room_room-compiler-plugin",
- ],
+ plugins: ["androidx.room_room-compiler-plugin"],
+
+ errorprone: {
+ extra_check_modules: ["//external/nullaway:nullaway_plugin"],
+ javacflags: [
+ "-XepOpt:NullAway:AnnotatedPackages=com.android.settings",
+ ],
+ },
libs: [
"telephony-common",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 31f4768..9e33467 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3198,6 +3198,7 @@
<action android:name="android.intent.action.BOOT_COMPLETED"/>
<action android:name="com.google.android.setupwizard.SETUP_WIZARD_FINISHED"/>
<action android:name="com.android.settings.battery.action.PERIODIC_JOB_RECHECK"/>
+ <action android:name="android.intent.action.TIME_SET"/>
</intent-filter>
</receiver>
diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index 57b7476..6daa90c 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -9,7 +9,7 @@
"settings_accessibility_flag_declarations.aconfig",
"settings_connecteddevice_flag_declarations.aconfig",
"settings_globalintl_flag_declarations.aconfig",
- "settings_apn_flag_declarations.aconfig",
+ "settings_experience_flag_declarations.aconfig",
"settings_onboarding_experience_flag_declarations.aconfig",
"settings_telephony_flag_declarations.aconfig",
],
@@ -29,4 +29,4 @@
java_aconfig_library {
name: "factory_reset_flags_lib",
aconfig_declarations: "factory_reset_flags",
-}
\ No newline at end of file
+}
diff --git a/aconfig/settings_apn_flag_declarations.aconfig b/aconfig/settings_experience_flag_declarations.aconfig
similarity index 79%
rename from aconfig/settings_apn_flag_declarations.aconfig
rename to aconfig/settings_experience_flag_declarations.aconfig
index bca3183..7642734 100644
--- a/aconfig/settings_apn_flag_declarations.aconfig
+++ b/aconfig/settings_experience_flag_declarations.aconfig
@@ -2,7 +2,7 @@
flag {
name: "new_apn_page_enabled"
- namespace: "settings_apn"
+ namespace: "settings_experience"
description: "Change to the new APN page."
bug: "298906796"
-}
\ No newline at end of file
+}
diff --git a/aconfig/settings_globalintl_flag_declarations.aconfig b/aconfig/settings_globalintl_flag_declarations.aconfig
index 3740dd3..68662d0 100644
--- a/aconfig/settings_globalintl_flag_declarations.aconfig
+++ b/aconfig/settings_globalintl_flag_declarations.aconfig
@@ -2,14 +2,14 @@
flag {
name: "terms_of_address_enabled"
- namespace: "settings_globalintl"
+ namespace: "globalintl"
description: "Feature flag for Terms of Address"
bug: "297798866"
}
flag {
name: "locale_notification_enabled"
- namespace: "settings_globalintl"
+ namespace: "globalintl"
description: "Feature flag for locale notification"
- bug: "248514263"
+ bug: "301380610"
}
diff --git a/res-product/values-de/strings.xml b/res-product/values-de/strings.xml
index d8c5bc9..408ebcc 100644
--- a/res-product/values-de/strings.xml
+++ b/res-product/values-de/strings.xml
@@ -356,10 +356,7 @@
<string name="auto_rotate_summary_a11y" product="tablet" msgid="4708833814245913981">"Wenn du das Tablet drehst"</string>
<string name="daltonizer_feature_summary" product="default" msgid="3940653889277283702">"Hier kannst du anpassen, wie Farben auf deinem Smartphone dargestellt werden"</string>
<string name="daltonizer_feature_summary" product="tablet" msgid="4006596881671077623">"Hier kannst du anpassen, wie Farben auf deinem Tablet dargestellt werden"</string>
- <!-- no translation found for spatial_audio_speaker (7148176677982615792) -->
- <skip />
- <!-- no translation found for spatial_audio_speaker (5452617980485166854) -->
- <skip />
- <!-- no translation found for spatial_audio_speaker (6204289590128303795) -->
- <skip />
+ <string name="spatial_audio_speaker" product="default" msgid="7148176677982615792">"Smartphone-Lautsprecher"</string>
+ <string name="spatial_audio_speaker" product="tablet" msgid="5452617980485166854">"Tablet-Lautsprecher"</string>
+ <string name="spatial_audio_speaker" product="device" msgid="6204289590128303795">"Gerätelautsprecher"</string>
</resources>
diff --git a/res-product/values-es-rUS/strings.xml b/res-product/values-es-rUS/strings.xml
index 00e7331..2a4ad45 100644
--- a/res-product/values-es-rUS/strings.xml
+++ b/res-product/values-es-rUS/strings.xml
@@ -357,6 +357,6 @@
<string name="daltonizer_feature_summary" product="default" msgid="3940653889277283702">"Ajusta cómo se muestran los colores en tu teléfono"</string>
<string name="daltonizer_feature_summary" product="tablet" msgid="4006596881671077623">"Ajusta cómo se muestran los colores en tu tablet"</string>
<string name="spatial_audio_speaker" product="default" msgid="7148176677982615792">"Altavoces del teléfono"</string>
- <string name="spatial_audio_speaker" product="tablet" msgid="5452617980485166854">"Altavoces de la tablet"</string>
+ <string name="spatial_audio_speaker" product="tablet" msgid="5452617980485166854">"Bocinas de la tablet"</string>
<string name="spatial_audio_speaker" product="device" msgid="6204289590128303795">"Altavoces del dispositivo"</string>
</resources>
diff --git a/res-product/values-fr-rCA/strings.xml b/res-product/values-fr-rCA/strings.xml
index 31a479c..9b9a2f7 100644
--- a/res-product/values-fr-rCA/strings.xml
+++ b/res-product/values-fr-rCA/strings.xml
@@ -356,10 +356,7 @@
<string name="auto_rotate_summary_a11y" product="tablet" msgid="4708833814245913981">"Lorsque vous orientez votre tablette entre les modes portrait et paysage"</string>
<string name="daltonizer_feature_summary" product="default" msgid="3940653889277283702">"Ajustez l\'affichage des couleurs sur votre téléphone"</string>
<string name="daltonizer_feature_summary" product="tablet" msgid="4006596881671077623">"Ajustez l\'affichage des couleurs sur votre tablette"</string>
- <!-- no translation found for spatial_audio_speaker (7148176677982615792) -->
- <skip />
- <!-- no translation found for spatial_audio_speaker (5452617980485166854) -->
- <skip />
- <!-- no translation found for spatial_audio_speaker (6204289590128303795) -->
- <skip />
+ <string name="spatial_audio_speaker" product="default" msgid="7148176677982615792">"Haut-parleurs du téléphone"</string>
+ <string name="spatial_audio_speaker" product="tablet" msgid="5452617980485166854">"Haut-parleurs de la tablette"</string>
+ <string name="spatial_audio_speaker" product="device" msgid="6204289590128303795">"Haut-parleurs de l\'appareil"</string>
</resources>
diff --git a/res/drawable/ic_battery_uninstalled.xml b/res/drawable/ic_battery_uninstalled.xml
new file mode 100644
index 0000000..2d8ea86
--- /dev/null
+++ b/res/drawable/ic_battery_uninstalled.xml
@@ -0,0 +1,33 @@
+<!--
+ Copyright (C) 2023 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.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24.0dp"
+ android:height="24.0dp"
+ android:tint="@color/battery_usage_system_icon_color"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z" />
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M9,8h2v9h-2z" />
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M13,8h2v9h-2z" />
+</vector>
diff --git a/res/layout/fingerprint_v2_enroll_introduction.xml b/res/layout/fingerprint_v2_enroll_introduction.xml
index e9dd08a..2fd1f9c 100644
--- a/res/layout/fingerprint_v2_enroll_introduction.xml
+++ b/res/layout/fingerprint_v2_enroll_introduction.xml
@@ -16,199 +16,210 @@
-->
<com.google.android.setupdesign.GlifLayout
-xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:app="http://schemas.android.com/apk/res-auto"
-style="?attr/fingerprint_layout_theme"
-android:id="@+id/setup_wizard_layout"
-android:layout_width="match_parent"
-android:layout_height="match_parent">
-
-<LinearLayout
- style="@style/SudContentFrame"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/setup_wizard_layout"
+ style="?attr/fingerprint_layout_theme"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:clipChildren="false"
- android:clipToPadding="false"
- android:orientation="vertical">
+ android:layout_height="match_parent">
- <com.google.android.setupdesign.view.RichTextView
- android:id="@+id/error_text"
- style="@style/SudDescription.Glif"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <ImageView
- style="@style/SudContentIllustration"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:contentDescription="@null"
- android:src="@drawable/fingerprint_enroll_introduction" />
-
- </FrameLayout>
-
- <!-- Contains the extra information text at the bottom -->
<LinearLayout
+ style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:clipChildren="false"
+ android:clipToPadding="false"
android:orientation="vertical">
- <!-- How it works -->
- <TextView
+ <com.google.android.setupdesign.view.RichTextView
+ android:id="@+id/error_text"
+ style="@style/SudDescription.Glif"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/BiometricEnrollIntroTitle"
- android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_title_2" />
+ android:layout_height="wrap_content" />
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <ImageView
+ style="@style/SudContentIllustration"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:contentDescription="@null"
+ android:src="@drawable/fingerprint_enroll_introduction" />
+
+ </FrameLayout>
+
+ <!-- Contains the extra information text at the bottom -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
+ android:orientation="vertical">
- <ImageView
- android:id="@+id/icon_fingerprint"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@null"
- android:src="@drawable/ic_fingerprint_24dp"/>
- <Space
- android:layout_width="16dp"
- android:layout_height="wrap_content"/>
+ <!-- How it works -->
<TextView
- android:id="@+id/footer_message_2"
+ style="@style/BiometricEnrollIntroTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/BiometricEnrollIntroMessage" />
- </LinearLayout>
+ android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_title_2" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@+id/icon_device_locked"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@null"
- android:src="@drawable/ic_lock_24dp"/>
- <Space
- android:layout_width="16dp"
- android:layout_height="wrap_content"/>
- <TextView
- android:id="@+id/footer_message_3"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/BiometricEnrollIntroMessage" />
- </LinearLayout>
+ android:orientation="horizontal">
- <!-- You're in control -->
- <TextView
- android:id="@+id/footer_title_1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/BiometricEnrollIntroTitle" />
+ <ImageView
+ android:id="@+id/icon_fingerprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_fingerprint_24dp" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
+ <Space
+ android:layout_width="16dp"
+ android:layout_height="wrap_content" />
- <ImageView
- android:id="@+id/icon_trash_can"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@null"
- android:src="@drawable/ic_trash_can"/>
- <Space
- android:layout_width="16dp"
- android:layout_height="wrap_content"/>
- <TextView
- android:id="@+id/footer_message_4"
+ <TextView
+ android:id="@+id/footer_message_2"
+ style="@style/BiometricEnrollIntroMessage"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
+
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/BiometricEnrollIntroMessage" />
- </LinearLayout>
+ android:orientation="horizontal">
- <!-- Keep in mind -->
- <TextView
- android:id="@+id/footer_title_2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/BiometricEnrollIntroTitle"
- android:text="@string/security_settings_face_enroll_introduction_info_title"/>
+ <ImageView
+ android:id="@+id/icon_device_locked"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_lock_24dp" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
+ <Space
+ android:layout_width="16dp"
+ android:layout_height="wrap_content" />
- <ImageView
- android:id="@+id/icon_info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@null"
- android:src="@drawable/ic_info_outline_24dp"/>
- <Space
- android:layout_width="16dp"
- android:layout_height="wrap_content"/>
+ <TextView
+ android:id="@+id/footer_message_3"
+ style="@style/BiometricEnrollIntroMessage"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
+
+ <!-- You're in control -->
<TextView
- android:id="@+id/footer_message_5"
+ android:id="@+id/footer_title_1"
+ style="@style/BiometricEnrollIntroTitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/BiometricEnrollIntroMessage" />
- </LinearLayout>
+ android:orientation="horizontal">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
+ <ImageView
+ android:id="@+id/icon_trash_can"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_trash_can" />
- <ImageView
- android:id="@+id/icon_shield"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@null"
- android:src="@drawable/ic_guarantee"/>
- <Space
- android:layout_width="16dp"
- android:layout_height="wrap_content"/>
+ <Space
+ android:layout_width="16dp"
+ android:layout_height="wrap_content" />
+
+ <TextView
+ android:id="@+id/footer_message_4"
+ style="@style/BiometricEnrollIntroMessage"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
+
+ <!-- Keep in mind -->
<TextView
- android:id="@+id/footer_message_6"
+ android:id="@+id/footer_title_2"
+ style="@style/BiometricEnrollIntroTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/BiometricEnrollIntroMessage" />
- </LinearLayout>
+ android:text="@string/security_settings_face_enroll_introduction_info_title" />
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@+id/icon_link"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@null"
- android:src="@drawable/ic_link_24dp"/>
- <Space
- android:layout_width="16dp"
- android:layout_height="wrap_content"/>
- <TextView
- android:id="@+id/footer_learn_more"
- android:linksClickable="true"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/BiometricEnrollIntroMessage"
- android:paddingBottom="0dp"
- android:text="@string/security_settings_fingerprint_v2_enroll_introduction_message_learn_more" />
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/icon_info"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_info_outline_24dp" />
+
+ <Space
+ android:layout_width="16dp"
+ android:layout_height="wrap_content" />
+
+ <TextView
+ android:id="@+id/footer_message_5"
+ style="@style/BiometricEnrollIntroMessage"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/icon_shield"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_guarantee" />
+
+ <Space
+ android:layout_width="16dp"
+ android:layout_height="wrap_content" />
+
+ <TextView
+ android:id="@+id/footer_message_6"
+ style="@style/BiometricEnrollIntroMessage"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/icon_link"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_link_24dp" />
+
+ <Space
+ android:layout_width="16dp"
+ android:layout_height="wrap_content" />
+
+ <TextView
+ android:id="@+id/footer_learn_more"
+ style="@style/BiometricEnrollIntroMessage"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:linksClickable="true"
+ android:paddingBottom="0dp"
+ android:text="@string/security_settings_fingerprint_v2_enroll_introduction_message_learn_more" />
+ </LinearLayout>
+
</LinearLayout>
</LinearLayout>
-</LinearLayout>
-
</com.google.android.setupdesign.GlifLayout>
\ No newline at end of file
diff --git a/res/layout/preference_icon_credman.xml b/res/layout/preference_icon_credman.xml
new file mode 100644
index 0000000..3db0c3b
--- /dev/null
+++ b/res/layout/preference_icon_credman.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 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.
+ -->
+
+<!-- Based off preference_material_settings.xml except that ripple on only on the left side. -->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:gravity="center_vertical"
+ android:background="@android:color/transparent"
+ android:clipToPadding="false">
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="?android:attr/selectableItemBackground"
+ android:gravity="start|center_vertical"
+ android:clipToPadding="false"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+ <LinearLayout
+ android:id="@+id/icon_frame"
+ android:layout_width="48dp"
+ android:layout_height="40dp"
+ android:gravity="start|center_vertical"
+ android:minWidth="56dp"
+ android:orientation="horizontal"
+ android:clipToPadding="false"
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp">
+ <androidx.preference.internal.PreferenceImageView
+ android:id="@android:id/icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ settings:maxWidth="32dp"
+ settings:maxHeight="32dp" />
+ </LinearLayout>
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp">
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceListItem"
+ android:ellipsize="marquee" />
+
+ <TextView
+ android:id="@android:id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@android:id/title"
+ android:layout_alignStart="@android:id/title"
+ android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+ android:textColor="?android:attr/textColorSecondary"
+ android:maxLines="10" />
+
+ </RelativeLayout>
+
+ </LinearLayout>
+
+ <include layout="@layout/preference_two_target_divider" />
+
+ <!-- Preference should place its actual preference widget here. -->
+ <LinearLayout
+ android:id="@android:id/widget_frame"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingEnd="16dp"
+ android:minWidth="61dp"
+ android:gravity="center"
+ android:orientation="vertical" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 267ce8e..eff870c 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> oor"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> tot gelaai"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Skermtyd"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Agtergrondtyd"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Lae battery"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Laat die program toe om in die agtergrond te loop"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Beperk agtergrondaktiwiteit?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"As jy agtergrondaktiwiteit vir \'n program beperk, kan dit verkeerd werk"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Hierdie program is nie gestel om batterykrag te optimeer nie en daarom kan jy dit nie beperk nie.\n\nOm die program te beperk, moet jy eers batterykrag-optimering aanskakel."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Bestuur batterygebruik"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Onbeperk"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Geoptimeer"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Beperk"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: minder as \'n min."</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Agtergrond: minder as \'n min."</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Skermtyd: minder as een min."</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Minder as ’n minuut"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Totaal: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Agtergrond: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Skermtyd: • <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, toegangsleutel, wagwoord"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"outo, vul, outovul, data, toegangsleutel, wagwoord"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Maak seker dat jy hierdie program vertrou</b> <br/> <br/> <xliff:g id=app_name example=Google Outovul>%1$s</xliff:g> gebruik wat op jou skerm is om te bepaal wat outomaties ingevul kan word."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Gebruik <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Nuwe wagwoorde, toegangsleutels en ander inligting sal van nou af hier gestoor word. <xliff:g id=app_name example=Provider>%1$s</xliff:g> kan dalk gebruik wat op jou skerm is om te bepaal wat outomaties ingevul kan word."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Wagwoorde, toegangsleutels en datadienste"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Skakel %1$s af?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Skakel hierdie diens af?</b> <br/> <br/> Gestoorde inligting soos wagwoorde, toegangsleutels, betaalmetodes en ander inligting sal nie ingevul word wanneer jy aanmeld nie. Kies ’n wagwoord, toegangsleutel of datadiens om jou gestoorde inligting te gebruik."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ff3a89c..883b6be 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> ይቀራል"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"ለመሙላት <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ይቀረዋል"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"የማያ ገፅ ጊዜ"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"የዳራ ጊዜ"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"ዝቅተኛ ባትሪ"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"መተግበሪያው በበስተጀርባ እንዲሄድ ይፍቀዱለት።"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"የጀርባ እንቅስቃሴ ይገደብ?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"የአንድ መተግበሪያ የጀርባ እንቅስቃሴን ከገደቡ ያልተገባ ባህሪ ሊያሳይ ይችላል"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ይህ መተግበሪያ ባትሪን ለማላቅ አልተቀናበረም፣ ሊገድቡት አይችሉም።\n\nመተግበሪያውን ለመገደብ፣ የባትሪ ማላቅን በመጀመሪያ ያብሩ።"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"የባትሪ አጠቃቀምን ያስተዳድሩ"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"ያልተገደበ"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"እንዲተባ ተደርጓል"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"ተገድቧል"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"ጠቅላላ፦ ከአንድ ደቂቃ በታች"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ዳራ፦ ከአንድ ደቂቃ በታች"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"የማያ ገፅ ጊዜ፦ ከአንድ ደቂቃ ያነሰ"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"ከአንድ ደቂቃ ያነሰ"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"ጠቅላላ፦ <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"ዳራ፦ <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"የማያ ገፅ ጊዜ፦ <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"ውሂብ፣ የይለፍ ቁልፍ፣ የይለፍ ቃል"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"ራስ ሰር፣ ሙላ፣ ውሂብ፣ የይለፍ ቁልፍ፣ የይለፍ ቃል"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>ይህን መተግበሪያ የሚያምኑት መሆንዎን ያረጋግጡ</b> <br/> <br/> <xliff:g id=app_name example=Google ራስ-ሙላ>%1$s</xliff:g> ምን በራስ መሞላት እንደሚችል ለማወቅ በማያ ገጽዎ ላይ ያለውን ነገር ይጠቀማል።"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> አዳዲስ የይለፍ ቃሎች፣ የይለፍ ቁልፎች እና ሌላ መረጃ ከአሁን በኋላ እዚህ ይቀመጣሉ። <xliff:g id=app_name example=Provider>%1$s</xliff:g> ምን በራስ-ሙላ ሊሆን እንደሚችል ለማወቅ በማያ ገፅዎ ላይ ያለውን ነገር ይጠቀማል።"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"የይለፍ ቃላት፣ የይለፍ ቁልፎች እና የውሂብ አገልግሎቶች"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s ይጥፋ?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>ይህ አገልግሎት ይጥፋ?</b> <br/> <br/> እንደ ይለፍ ቃላት፣ ይለፍ ቁልፎች፣ የመክፈያ ዘዴዎች እና ሌሎች መረጃዎች ያለ የተቀመጠ መረጃ በመለያ በሚገቡበት ጊዜ አይሞሉም። የእርስዎን የተቀመጠ መረጃ ለመጠቀም የይለፍ ቃል፣ የይለፍ ቁልፍ ወይም የውሂብ አገልግሎት ይምረጡ።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 369c84c..70463f6 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"الوقت المتبقي: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> للشحن"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"مدّة الاستخدام في المقدّمة"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"مدّة الاستخدام في الخلفية"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"طاقة البطارية منخفضة"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"السماح بتشغيل التطبيق في الخلفية"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"هل تريد وضع حد لنشاط التطبيق في الخلفية؟"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"قد يتأثر أداء أحد التطبيقات سلبًا في حالة وضع حد لنشاطه في الخلفية"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"نظرًا لعدم تعيين هذا التطبيق للعمل على تحسين البطارية، فلا يمكنك تقييده.\n\nلتقييد التطبيق، فعِّل ميزة تحسين البطارية أولاً."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"إدارة استخدام البطارية"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"الاستخدام غير المحدّد بقيود"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"الاستخدام المحسَّن"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"الاستخدام المحدّد بقيود"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"مدة الاستخدام الإجمالي: أقل من دقيقة"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"مدة استخدام البطارية في الخلفية: أقل من دقيقة"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"مدّة النظر إلى الشاشة: أقل من دقيقة"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"أقل من دقيقة واحدة"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"مدة الاستخدام الإجمالي: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"مدة استخدام البطارية في الخلفية: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"مدّة النظر إلى الشاشة: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"البيانات، مفتاح المرور، كلمة المرور"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"تلقائي، ملء، ملء تلقائي، بيانات، مفتاح مرور، كلمة مرور"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>تأكّد من أنك تثق بهذا التطبيق</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> تستخدم البيانات المعروضة على الشاشة لتحديد ما يمكن ملؤه تلقائيًا."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> سيتم حفظ مفاتيح المرور وكلمات المرور الجديدة والمعلومات الأخرى هنا من الآن فصاعدًا. قد يستخدم تطبيق <xliff:g id=app_name example=Provider>%1$s</xliff:g> المحتوى الذي يظهر على شاشتك لتحديد ما يمكن ملؤه تلقائيًا."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"كلمات المرور ومفاتيح المرور وخدمات البيانات"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"هل تريد إيقاف %1$s؟"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>هل تريد إيقاف هذه الخدمة؟</b> <br/> <br/> لن يتم ملء المعلومات المحفوظة، مثل كلمات المرور ومفاتيح المرور وطرق الدفع والمعلومات الأخرى عند تسجيل الدخول. لاستخدام معلوماتك المحفوظة، اختَر كلمة مرور أو مفتاح مرور أو خدمة بيانات."</string>
@@ -4235,7 +4230,7 @@
<!-- no translation found for graphics_driver_app_preference_values:2 (5391218026495225599) -->
<!-- no translation found for graphics_driver_app_preference_values:3 (2586045835780389650) -->
<string name="enable_angle_as_system_driver" msgid="4648827560023949786">"ميزة تجريبية: تفعيل محرِّك ANGLE"</string>
- <string name="enable_angle_as_system_driver_summary" msgid="2170215556348477481">"تحذير: سيتم تفعيل محرّك ANGLE على أنّه برنامج التشغيل التلقائي OpenGL ES. هذه الميزة تجريبية وقد لا تكون متوافقة مع بعض تطبيقات الكاميرا والفيديو."</string>
+ <string name="enable_angle_as_system_driver_summary" msgid="2170215556348477481">"تحذير: عليك تفعيل محرِّك ANGLE على أنّه برنامج التشغيل التلقائي OpenGL ES. هذه الميزة تجريبية وقد لا تكون متوافقة مع بعض تطبيقات الكاميرا والفيديو."</string>
<string name="reboot_dialog_enable_angle_as_system_driver" msgid="2619263039763150810">"يجب إعادة التشغيل لتغيير برنامج تشغيل OpenGL ES الخاص بالنظام."</string>
<string name="platform_compat_dashboard_title" msgid="1323980546791790236">"التغييرات في توافق التطبيقات"</string>
<string name="platform_compat_dashboard_summary" msgid="4036546607938791337">"التبديل بين تغييرات توافق التطبيقات"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 5404e30..82b078f 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> বাকী আছে"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"চাৰ্জ হ\'বলৈ <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"ডিভাইচত অতিবাহিত কৰা সময়"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"নেপথ্যৰ সময়"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"বেটাৰী কমিছে"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"এই এপ্টো নেপথ্যত চলিবলৈ অনুমতি দিয়ক"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"নেপথ্যৰ কাৰ্যকলাপ সীমিত কৰিবনে?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"আপুনি এটা এপৰ নেপথ্য কাৰ্যকলাপ সীমিত কৰিলে ই অস্বাভাৱিক আচৰণ কৰিব পাৰে"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"যিহেতু এই এপ্টো বেটাৰী অপ্টিমাইজ কৰিবলৈ ছেট কৰি থোৱা হোৱা নাই, সেয়ে ইয়াক আপুনি সীমিত কৰিব নোৱাৰে।\n\nএপ্টো সীমিত কৰিবলৈ প্ৰথমে বেটাৰী অপ্টিমাইজেশ্বন অন কৰক।"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"বেটাৰীৰ ব্যৱহাৰ পৰিচালনা কৰক"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"বাধাহীন"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"অপ্টিমাইজ কৰা"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"সীমিত"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"মুঠ: এক মিনিটতকৈ কম"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"নেপথ্য: এক মিনিটতকৈ কম"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"ডিভাইচত অতিবাহিত কৰা সময়: এক মিনিটতকৈ কম"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"এক মিনিটতকৈ কম"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"মুঠ: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"নেপথ্য: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"ডিভাইচত অতিবাহিত কৰা সময়: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"ডেটা, পাছকী, পাছৱৰ্ড"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"স্বয়ংক্রিয়, পূৰ হোৱা, স্বয়ংক্রিয়ভাৱে পূৰ হোৱাৰ সুবিধা, ডেটা, পাছকী, পাছৱৰ্ড"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>আপুনি এই এপ্টোক বিশ্বাস কৰাটো নিশ্চিত কৰক</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> এ স্বয়ংপূৰ্তিৰ বাবে নিৰ্ধাৰণ কৰিবলৈ আপোনাৰ স্ক্ৰীনত দেখা দিয়া বস্তুবোৰ ব্যৱহাৰ কৰে।"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g> ব্যৱহাৰ কৰিবনে?</b> <br/> <br/> এতিয়াৰ পৰা ইয়াত নতুন পাছৱৰ্ড, পাছকী আৰু অন্য তথ্য ছেভ কৰা হ’ব। <xliff:g id=app_name example=Provider>%1$s</xliff:g>এ কি স্বয়ংক্ৰিয়ভাৱে পূৰ কৰা হ’ব সেয়া নিৰ্ধাৰণ কৰিবলৈ আপোনাৰ স্ক্ৰীনত প্ৰদৰ্শিত সমল ব্যৱহাৰ কৰিব পাৰে।"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"পাছৱৰ্ড, পাছকী আৰু ডেটা সেৱা"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s অফ কৰিবনে?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>এই সেৱাটো অফ কৰিব নেকি?</b> <br/> <br/> আপুনি ছাইন ইন কৰিলে পাছৱৰ্ড, পাছকী, পৰিশোধ পদ্ধতিৰ দৰে ছেভ কৰি থোৱা তথ্য আৰু অন্য তথ্য পূৰ কৰা নহ’ব। আপোনাৰ ছেভ হৈ থকা তথ্য ব্যৱহাৰ কৰিবলৈ, এটা পাছৱৰ্ড, পাছকী অথবা ডেটা সেৱা বাছনি কৰক।"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 0bd7e2d..ad2aa9c 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> qalır"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Şarjın bitməsinə var: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Ekran vaxtı"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Arxa fon vaxtı"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Enerji azdır"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Tətbiqin arxa fonda işləməsinə icazə verin"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Arxa fon fəaliyyəti məhdudlaşdırılsın?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Tətbiqin arxa fon fəaliyyətini məhdudlaşdırsanız, o səhv işləyə bilər"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Bu tətbiq üçün enerji qənaəti aktiv deyil.\n\nMəhdudiyyət tətbiq etmək üçün onu aktivləşdirin."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Batareya istifadəsini idarə edin"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Məhdudiyyətsiz"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimal"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Məhdud"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Cəmi: bir dəqiqədən az"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Arxa fon: bir dəqiqədən az"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Ekran vaxtı: bir dəqiqədən az"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Bir dəqiqədən az"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Cəmi: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Arxa fon: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Ekran vaxtı: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, giriş açarı, parol"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"avto, doldurma, avto doldurma, data, giriş açarı, parol"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Bu tətbiqə inana biləcəyinizi dəqiqləşdirin</b> <br/> <br/> <xliff:g id=app_name example=Google Avtodoldurma>%1$s</xliff:g> ekranı analiz edərək avtomatik doldurula bilən sahələri tapır."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g> istifadə edilsin?</b> <br/> <br/> Yeni parol, giriş açarı və digər məlumatlar burada yadda saxlanacaq. <xliff:g id=app_name example=Provider>%1$s</xliff:g> avtomatik doldurulacaq məlumatı müəyyənləşdirmək üçün ekrandakı kontentdən istifadə edə bilər."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Parol, giriş açarı və data xidmətləri"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s deaktiv edilsin?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Bu xidmət deaktiv edilsin?</b> <br/> <br/> Daxil olduqda parol, giriş açarı, ödəniş metodu və s. kimi saxlanmış məlumatlar doldurulmayacaq. Saxlanmış məlumatdan istifadə etmək üçün parol, giriş açarı və ya data xidməti seçin."</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index ee11a75..c3c4fde 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Još <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Puni se još <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Vreme na ekranu"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Vreme u pozadini"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Nizak nivo baterije"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Dozvolite aplikaciji da se pokreće u pozadini"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Želite li da ograničite aktivnosti u pozadini?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ako ograničite aktivnosti aplikacije u pozadini, možda će se ponašati neočekivano."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Apl. nije podešena za optimizaciju baterije, pa ne možete da je ograničite. \n\nZa ogr. apl. uključite optimizaciju baterije."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Upravljajte potrošnjom baterije"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Neograničeno"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimizovano"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Ograničeno"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Ukupno: manje od minut"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Pozadina: manje od minut"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Vreme ispred ekrana: manje od minuta"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Manje od minuta"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Ukupno: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Pozadina: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Vreme ispred ekrana: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"podaci, pristupni kôd, lozinka"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatski, popunjavanje, automatsko popunjavanje, podaci, pristupni ključ, lozinka"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Uverite se da je ova aplikacija pouzdana</b> <br/> <br/> <xliff:g id=app_name example=Google automatsko popunjavanje>%1$s</xliff:g> koristi sadržaj ekrana za utvrđivanje podataka koji mogu automatski da se popune."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Koristite <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Nove lozinke, pristupni ključevi i drugi podaci će se od sada čuvati ovde. <xliff:g id=app_name example=Provider>%1$s</xliff:g> može da koristi ono što je na ekranu radi određivanja šta može automatski da se popuni."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Usluge za lozinke, pristupne kodove i podatke"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Želite da isključite: %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Želite da isključite ovu uslugu?</b> <br/> <br/> Sačuvane informacije kao što su lozinke, pristupni ključevi, načini plaćanja i drugi podaci se neće popunjavati kada ste prijavljeni. Da biste koristili sačuvane informacije, odaberite uslugu za lozinke, pristupne ključeve ili podatke."</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 1eb2f97..163254e 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Застаецца <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Да поўнай зарадкі засталося <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Час выкарыстання"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Час у фонавым рэжыме"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Нізкі зарад акумулятара"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Дазволіць праграме працаваць у фонавым рэжыме"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Абмежаваць фонавую дзейнасць?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Абмежаванне фонавай дзейнасці праграмы можа прывесці да збояў"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Паколькі ў гэтай праграме не наладжана аптымізацыя выкарыстання зараду акумулятара, вы не можаце абмежаваць яе працу. \n\n Для гэтага спачатку ўключыце аптымізацыю акумулятара."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Кіраваць выкарыстаннем зараду"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Без абмежаванняў"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Аптымізавана"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"З абмежаваннямі"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Усяго: менш адной хвіліны"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"У фонавым рэжыме: менш адной хвіліны"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Час карыстання прыладай: менш за хвіліну"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Менш за хвіліну"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Усяго: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"У фонавым рэжыме: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Час карыстання прыладай: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"даныя, ключ доступу, пароль"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"аўта, запаўненне, аўтазапаўненне, даныя, ключ доступу, пароль"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Упэўніцеся, што давяраеце гэтай праграме</b> <br/> <br/> <xliff:g id=app_name example=Аўтазапаўненне Google>%1$s</xliff:g> выкарыстоўвае тое, што знаходзіцца на вашым экране, каб вызначыць, што можна запоўніць аўтаматычна."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Выкарыстоўваць праграму \"<xliff:g id=app_name example=Provider>%1$s</xliff:g>\"?</b> <br/> <br/> Новыя паролі, ключы доступу і іншыя даныя будуць захоўвацца ў ёй. <xliff:g id=app_name example=Provider>%1$s</xliff:g> можа аналізаваць змесціва экрана, каб выявіць палі для аўтазапаўнення."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Сэрвісы для захоўвання пароляў, ключоў доступу і даных"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Выключыць %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Адключыць гэты сэрвіс?</b> <br/> <br/> Паролі, ключы доступу, спосабы аплаты і іншая захаваная інфармацыя не будуць аўтаматычна падстаўляцца пры ўваходзе. Каб выкарыстоўваць захаваную інфармацыю, выберыце пароль, ключ доступу або сэрвіс перадачы даных."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8db8931..596933c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Остава: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> до зареждане"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Време на ползване"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Време на заден план"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Изтощена батерия"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Разрешаване приложението да се изпълнява на заден план"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Да се ограничи ли активността на заден план?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ако ограничите активността на заден за дадено приложение, то може да не функционира правилно"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Тъй като прил. не е зададено да оптимизира батерията, можете да го ограничите.\n\nЗа тази цел първо включете оптим. на батерията."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Управление на използването на батерията"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Неограничено"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Оптимизирано"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Ограничено"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Общо: По-малко от една минута"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"На заден план: По-малко от една минута"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Време на ползване: по-малко от минута"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"По-малко от минута"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Общо: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"На заден план: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Време на ползване: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"данни, код за достъп, парола"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"автоматично, попълване, автоматично попълване, данни, ключ за достъп, парола"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Уверете се, че имате доверие на това приложение</b> <br/> <br/> <xliff:g id=app_name example=Функцията на Google за автоматично попълване>%1$s</xliff:g> използва това, което е на екрана ви, за да определи какво може да се попълни автоматично."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Да се използва ли <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> От сега нататък тук ще се запазват новите пароли, ключове за достъп и друга информация. <xliff:g id=app_name example=Provider>%1$s</xliff:g> може да използва съдържанието на екрана ви, за да определи какво може да бъде попълнено автоматично."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Пароли, ключове за достъп и услуги за данни"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Искате ли да изключите %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Искате ли да изключите тази услуга?</b> <br/> <br/> Запазената информация, като например пароли, ключове за достъп, начини на плащане и други данни, няма да се попълва автоматично, когато влизате в даден профил. За да използвате запазената си информация, изберете услуга за пароли, ключове за достъп или данни."</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index e4ab80f..6d78341 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> অবশিষ্ট রয়েছে"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> চার্জ করা বাকি"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"স্ক্রিন টাইম"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"ব্যাকগ্রাউন্ড টাইম"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"চার্জ কম আছে"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"অ্যাপটি পটভূমিতে চলতে দিন"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ব্যাকগ্রাউন্ড অ্যাক্টিভিটি সীমিত করবেন?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"কোনও অ্যাপের ব্যাকগ্রাউন্ড অ্যাক্টিভিটি সীমিত করলে তা সঠিক ভাবে কাজ নাও করতে পারে"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"যেহেতু এই অ্যাপটিকে ব্যাটারি অপ্টিমাইজ করার জন্য সেট করা হয়নি, তাই আপনি এটির অ্যাক্টিভিটি সীমিত করতে পারবেন না।\n\nঅ্যাপের অ্যাক্টিভিটি সীমিত করতে আগে ব্যাটারি অপ্টিমাইজেশন চালু করুন।"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"ব্যাটারির ব্যবহার ম্যানেজ করুন"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"সীমিত নয়"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"অপ্টিমাইজ করা আছে"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"সীমিত"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"মোট: এক মিনিটের থেকে কম"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ব্যাকগ্রাউন্ড: এক মিনিটের থেকে কম"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"স্ক্রিন টাইম: এক মিনিটের থেকে কম"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"এক মিনিটেরও কম"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"মোট: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"ব্যাকগ্রাউন্ড: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"স্ক্রিন টাইম: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"ডেটা, পাসকী, পাসওয়ার্ড"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"অটো, ফিল, অটো-ফিল ফিচার, ডেটা, পাসকি, পাসওয়ার্ড"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>নিশ্চিত করুন যে এই অ্যাপটি বিশ্বাসযোগ্য</b> <br/> <br/> কোনও তথ্য নিজে থেকে পূরণ করা যাবে কিনা, তা নির্ণয় করতে <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> অ্যাপটি আপনার স্ক্রিনে যা দেখা যাচ্ছে সেই অনুযায়ী সিদ্ধান্ত নেয়।"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> এখন থেকে নতুন পাসওয়ার্ড, পাসকী ও অন্যান্য তথ্য এখানে সেভ করা হবে। কী কী অটোফিল করা যেতে পারে তা নির্ধারণ করতে, আপনার স্ক্রিনে দেখানো বিষয় <xliff:g id=app_name example=Provider>%1$s</xliff:g> ব্যবহার করতে পারে।"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"পাসওয়ার্ড, পাসকী ও ডেটা পরিষেবা"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s বন্ধ করবেন?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>এই পরিষেবা বন্ধ করবেন?</b> <br/> <br/> পাসওয়ার্ড, \'পাসকী\', পেমেন্ট পদ্ধতির মতো তথ্য ও অন্যান্য সেভ করে রাখা তথ্য, আপনি সাইন-ইন করার সময় উপলভ্য হবে না। আপনার সেভ করে রাখা তথ্য ব্যবহার করতে, একটি পাসওয়ার্ড, \'পাসকী\' বা ডেটা পরিষেবা বেছে নিন।"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 7a28413..c87d902 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Preostalo <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do pune baterije"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Vrijeme korištenja uređaja"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Vrijeme u pozadini"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Baterija je slaba"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Dopustite aplikaciji da radi u pozadini"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Ograničiti aktivnost u pozadini?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ako aplikaciji ograničite aktivnost u pozadini, može raditi nepravilno"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikaciju ne možete ograničiti jer nije postavljena optimizacija baterije.\n\nDa je ograničite prvo uključite optimizaciju."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Upravljajte potrošnjom baterije"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Neograničeno"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimizirano"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Ograničeno"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Ukupno: manje od minute"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Pozadina: manje od minute"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Vrijeme korištenja uređaja: manje od jedne minute"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Manje od jedne minute"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Ukupno: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Pozadina: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Vrijeme korištenja uređaja: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"podaci, pristupni ključ, lozinka"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatski, popuniti, automatsko popunjavanje, podaci, pristupni ključ, lozinka"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Provjerite je li ova aplikacija pouzdana</b> <br/> <br/> <xliff:g id=app_name example=Google Automatsko popunjavanje>%1$s</xliff:g> koristi sadržaj na vašem ekranu da odredi šta se može automatski popuniti."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Koristite aplikaciju <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Nove lozinke, pristupni ključevi i druge informacije će se odsad pohranjivati ovdje. <xliff:g id=app_name example=Provider>%1$s</xliff:g> može koristiti ono što je na ekranu da utvrdi šta se može automatski popuniti."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Usluge za lozinke, pristupne ključeve i podatke"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Isključiti %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Isključiti uslugu?</b> <br/> <br/> Sačuvane informacije kao što su lozinke, pristupni ključevi, načini plaćanja i druge informacije se neće popunjavati prilikom prijave. Da koristite sačuvane informacije, odaberite lozinku, pristupni ključ ili uslugu za podatke."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index dc8c10c..6ccb928 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Temps restant: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> per completar la càrrega"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Temps de connexió"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Temps en segon pla"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Bateria baixa"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Permet que l\'aplicació s\'executi en segon pla"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vols limitar l\'activitat en segon pla?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si limites l\'activitat en segon pla d\'una aplicació, és possible que no funcioni correctament"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Com que aquesta aplicació no s\'ha configurat per optimitzar la bateria, no pots restringir-la.\n\nPer restringir l\'aplicació, activa l\'optimització de la bateria."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Gestiona l\'ús de la bateria"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Sense restriccions"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimitzat"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Restringit"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menys d\'un minut"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"En segon pla: menys d\'un minut"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Temps de connexió: menys d\'un minut"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Menys d\'un minut"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"En segon pla: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Temps de connexió: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"dades, clau d\'accés, contrasenya"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"auto, emplena, emplenament automàtic, dades, clau d\'accés, contrasenya"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Assegura\'t que confies en aquesta aplicació</b> <br/> <br/> <xliff:g id=app_name example=Emplenament automàtic amb Google>%1$s</xliff:g> utilitza el contingut que es mostra a la pantalla per determinar què es pot emplenar automàticament."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Utilitza <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Les noves contrasenyes, claus d\'accés i altres dades es desaran aquí a partir d\'ara. <xliff:g id=app_name example=Provider>%1$s</xliff:g> pot fer servir el que es mostra a la pantalla per determinar què es pot emplenar automàticament."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Contrasenyes, claus d\'accés i serveis de dades"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Vols desactivar %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Vols desactivar aquest servei?</b> <br/> <br/> La informació desada, com ara contrasenyes, claus d\'accés i formes de pagament, entre d\'altres, no s\'emplenarà quan iniciïs la sessió. Per utilitzar la teva informació desada, tria una contrasenya, una clau d\'accés o un servei de dades."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a1a15eb..f19a495 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Zbývá <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do nabití"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Doba na obrazovce"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Doba běhu na pozadí"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Slabá baterie"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Povolit aplikaci spouštění na pozadí"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Omezit aktivitu na pozadí?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Pokud u aplikace omezíte aktivitu na pozadí, může dojít k nepředvídatelnému chování"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikace není nastavena k optimalizaci baterie, nelze ji tedy omezit.\n\nChcete-li ji omezit, nejprve zapněte optimalizaci."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Správa využití baterie"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Neomezeno"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimalizováno"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Omezeno"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Celkem: méně než minuta"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Na pozadí: méně než minuta"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Doba používání: méně než minuta"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Méně než minuta"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Celkem: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Na pozadí: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Doba používání: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, přístupový klíč, heslo"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatické, vyplňování, automatické vyplňování, údaje, přístupový klíč, heslo"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Zkontrolujte, zda se jedná o důvěryhodnou aplikaci</b> <br/> <br/> <xliff:g id=app_name example=Automatické doplňování Google>%1$s</xliff:g> určuje, co lze automaticky vyplnit, na základě obsahu obrazovky."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Používat aplikaci <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Nová hesla, přístupové klíče a další informace se budou od této chvíle ukládat sem. Aplikace <xliff:g id=app_name example=Provider>%1$s</xliff:g> může používat obsah obrazovky k určení, co lze automaticky vyplnit."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Hesla, přístupové klíče a datové služby"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Vypnout poskytovatele %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Vypnout tuto službu?</b> <br/> <br/> Při přihlášení se nebudou vyplňovat uložené údaje, jako jsou hesla, přístupové klíče, platební metody a podobně. Pokud chcete používat uložené údaje, zvolte heslo, přístupový klíč nebo datovou službu."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 1386410..a59dc23 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> tilbage"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> til batteriet er opladt"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Skærmtid"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Tid i baggrunden"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Lavt batteriniveau"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Giv appen tilladelse til at køre i baggrunden"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vil du begrænse baggrundsaktiviteten?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Hvis du begrænser en apps baggrundsaktivitet, kan det medføre, at den ikke fungerer korrekt"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Appen kan ikke begrænses, da batterioptimering er deaktiveret.\n\nAktivér batterioptimering for at begrænse appen."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Administrer batteriforbrug"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Ubegrænset"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimeret"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Begrænset"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"I alt: Under et minut"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Baggrund: Under et minut"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Skærmtid: Under et minut"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Mindre end et minut"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"I alt: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Baggrund: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Skærmtid: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, adgangsnøgle, adgangskode"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatisk, udfyldning, autofyld, data, adgangsnøgle, adgangskode"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Sørg for, at du har tillid til denne app</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> anvender indholdet af din skærm til at fastslå, hvad der kan udfyldes automatisk."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Brug <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Fra nu af gemmes nye adgangskoder, adgangsnøgler og andre oplysninger her. <xliff:g id=app_name example=Provider>%1$s</xliff:g> kan bruge, hvad der er på din skærm, til at vurdere, hvad der kan udfyldes automatisk."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Adgangskoder, adgangsnøgler og datatjenester"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Vil du deaktivere %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Vil du deaktivere denne tjeneste?</b> <br/> <br/> Gemte oplysninger som f.eks. adgangskoder, adgangsnøgler, betalingsmetoder og andre oplysninger udfyldes ikke, når du logger ind. Hvis du vil bruge dine gemte oplysninger, skal du vælge en adgangskode, en adgangsnøgle eller en datatjeneste."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e3a1a22..ba95c11 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Noch <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Verbleibende Ladezeit: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Bildschirmzeit"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Hintergrundzeit"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Niedriger Akkustand"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"App darf im Hintergrund ausgeführt werden"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Hintergrundaktivität einschränken?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Wenn du die Hintergrundaktivität einer App einschränkst, kann dies zu unerwünschtem Verhalten führen"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Da bei dieser App die Akkunutzung nicht optimiert wird, kannst du sie nicht einschränken.\n\nDu musst du zunächst die Akkuoptimierung aktivieren."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Akkunutzung verwalten"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Uneingeschränkt"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimiert"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Eingeschränkt"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Gesamt: weniger als eine Minute"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Hintergrund: weniger als eine Minute"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Bildschirmzeit: weniger als eine Minute"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Weniger als eine Minute"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Gesamt: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Hintergrund: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Bildschirmzeit: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"Daten, Passkey, Passwort"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatisch, ausfüllen, Autofill, Daten, Passkey, Passwort"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Nur für vertrauenswürdige Apps</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> greift auf die Displayanzeige zu, um zu bestimmen, welche Felder automatisch ausgefüllt werden können. Die Funktion sollte daher nur für vertrauenswürdige Apps zugelassen werden."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Soll <xliff:g id=app_name example=Provider>%1$s</xliff:g> verwendet werden?</b> <br/> <br/> Neue Passwörter, Passkeys und weitere Informationen werden ab sofort hier gespeichert. <xliff:g id=app_name example=Provider>%1$s</xliff:g> kann anhand dessen, was auf deinem Bildschirm zu sehen ist, bestimmen, was automatisch ausgefüllt werden kann."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Passwörter, Passkeys und Datendienste"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s deaktivieren?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Diesen Dienst deaktivieren?</b> <br/> <br/> Gespeicherte Daten wie Passwörter, Passkeys, Zahlungsmethoden usw. werden beim Anmelden nicht eingetragen. Wenn du deine gespeicherten Daten verwenden möchtest, nutze einen Passwort-, Passkey- oder Datendienst."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4aca720..f9fe088 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Απομένουν <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> για τη φόρτωση"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Χρόνος χρήσης"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Χρόνος στο παρασκήνιο"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Χαμηλή ισχύς μπαταρίας"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Να επιτρέπεται στην εφαρμογή να εκτελείται στο παρασκήνιο"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Να περιοριστεί η δραστηριότητα στο παρασκήνιο;"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Εάν περιορίσετε τη δραστηριότητα στο παρασκήνιο για μια εφαρμογή, μπορεί να μην λειτουργήσει σωστά"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Εφόσον δεν έχει οριστεί βελτιστοποίηση μπαταρίας, δεν είναι δυνατός ο περιορισμός της εφαρμογής.\n\nΓια περιορισμό, ενεργοποιήστε τη βελτιστοποίηση."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Διαχείριση χρήσης μπαταρίας"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Απεριόριστη"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Βελτιστοποιημένη"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Περιορισμένη"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Σύνολο: λιγότερο από ένα λεπτό"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Παρασκήνιο: λιγότερο από ένα λεπτό"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Χρόνος χρήσης: λιγότερο από ένα λεπτό"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Λιγότερο από ένα λεπτό"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Σύνολο: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Παρασκήνιο: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Χρόνος χρήσης: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"δεδομένα, κλειδί πρόσβασης, κωδικός πρόσβασης"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"αυτόματη, συμπλήρωση, αυτόματη συμπλήρωση, δεδομένα, κλειδί πρόσβασης, κωδικός πρόσβασης"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Βεβαιωθείτε ότι εμπιστεύεστε αυτή την εφαρμογή</b><br/> <br/> <xliff:g Το id=app_name example=Google Autofill>%1$s</xliff:g> χρησιμοποιεί το περιεχόμενο της οθόνης σας για να διαπιστώσει τι μπορεί να συμπληρωθεί αυτόματα."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Χρήση του <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Από εδώ και στο εξής, οι νέοι κωδικοί πρόσβασης, τα κλειδιά πρόσβασης και άλλες πληροφορίες θα αποθηκεύονται εδώ. Το <xliff:g id=app_name example=Provider>%1$s</xliff:g> ενδέχεται να χρησιμοποιεί το περιεχόμενο που εμφανίζεται στην οθόνη σας για να προσδιορίσει πού μπορεί να γίνει αυτόματη συμπλήρωση."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Κωδικοί πρόσβασης, κλειδιά πρόσβασης και υπηρεσίες δεδομένων"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Απενεργοποίηση του %1$s;"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Απενεργοποίηση αυτής της υπηρεσίας; </b> <br/> <br/> Αποθηκευμένες πληροφορίες, όπως κωδικοί πρόσβασης, κλειδιά πρόσβασης, τρόποι πληρωμής και άλλα, δεν θα συμπληρώνονται όταν είστε συνδεδεμένοι. Για να χρησιμοποιήσετε τις αποθηκευμένες πληροφορίες σας, επιλέξτε έναν κωδικό πρόσβασης, ένα κλειδί πρόσβασης ή μια υπηρεσία δεδομένων."</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 188d793..866088c 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> remaining"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> to charge"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Screen time"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Background time"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Low battery"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Allow the app to run in the background"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limit background activity?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"If you limit background activity for an app, it may misbehave"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Since this app is not set to optimise battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimisation."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Manage battery usage"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Unrestricted"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimised"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Restricted"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: less than a min."</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Background: less than a min"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Screen time: less than a min"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Less than a min"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Background: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Screen time: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, passkey, password"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"auto, fill, autofill, data, passkey, password"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Make sure that you trust this app</b> <br/> <br/> <xliff:g id=app_name example=Google Auto-fill>%1$s</xliff:g> uses what\'s on your screen to determine what can be auto-filled."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> New passwords, passkeys and other info will be saved here from now on. <xliff:g id=app_name example=Provider>%1$s</xliff:g> may use what\'s on your screen to determine what can be autofilled."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Passwords, passkeys and data services"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Turn off %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Turn off this service?</b> <br/> <br/> Saved info like passwords, passkeys, payment methods and other info won\'t be filled in when you sign in. To use your saved info, choose a password, passkey or data service."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 9fe7aa9..08fa783 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> remaining"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> to charge"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Screen time"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Background time"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Low battery"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Allow the app to run in the background"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limit background activity?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"If you limit background activity for an app, it may misbehave"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Since this app is not set to optimise battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimisation."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Manage battery usage"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Unrestricted"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimised"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Restricted"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: less than a min."</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Background: less than a min"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Screen time: less than a min"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Less than a min"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Background: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Screen time: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, passkey, password"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"auto, fill, autofill, data, passkey, password"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Make sure that you trust this app</b> <br/> <br/> <xliff:g id=app_name example=Google Auto-fill>%1$s</xliff:g> uses what\'s on your screen to determine what can be auto-filled."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> New passwords, passkeys and other info will be saved here from now on. <xliff:g id=app_name example=Provider>%1$s</xliff:g> may use what\'s on your screen to determine what can be autofilled."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Passwords, passkeys and data services"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Turn off %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Turn off this service?</b> <br/> <br/> Saved info like passwords, passkeys, payment methods and other info won\'t be filled in when you sign in. To use your saved info, choose a password, passkey or data service."</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0e61dc5..010dde5 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> remaining"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> to charge"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Screen time"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Background time"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Low battery"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Allow the app to run in the background"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limit background activity?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"If you limit background activity for an app, it may misbehave"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Since this app is not set to optimise battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimisation."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Manage battery usage"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Unrestricted"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimised"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Restricted"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: less than a min."</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Background: less than a min"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Screen time: less than a min"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Less than a min"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Background: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Screen time: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, passkey, password"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"auto, fill, autofill, data, passkey, password"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Make sure that you trust this app</b> <br/> <br/> <xliff:g id=app_name example=Google Auto-fill>%1$s</xliff:g> uses what\'s on your screen to determine what can be auto-filled."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> New passwords, passkeys and other info will be saved here from now on. <xliff:g id=app_name example=Provider>%1$s</xliff:g> may use what\'s on your screen to determine what can be autofilled."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Passwords, passkeys and data services"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Turn off %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Turn off this service?</b> <br/> <br/> Saved info like passwords, passkeys, payment methods and other info won\'t be filled in when you sign in. To use your saved info, choose a password, passkey or data service."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b1dd09c..d94cc71 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Tiempo restante: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Carga completa en <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Tiempo de uso"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Tiempo en segundo plano"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Batería baja"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Permite que la app se ejecute en segundo plano"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"¿Limitar actividad en segundo plano?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si limitas la actividad en segundo plano de una app, es posible que no funcione correctamente"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Como no se configuró la app para optimizar la batería, no puedes restringirla.\n\nPrimero, activa optimización de batería."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Administrar uso de batería"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Sin restricciones"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimizado"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Restringido"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menos de un minuto"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"En segundo plano: menos de un minuto"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Tiempo de uso: menos de un minuto"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Menos de un min"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"En segundo plano: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Tiempo de uso: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"datos, llave de acceso, contraseña"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automático, rellenar, autocompletar, datos, llave de acceso, contraseña"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Asegúrate de que esta app sea confiable</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> usa el contenido de tu pantalla para determinar qué se puede autocompletar."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>¿Quieres usar <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> A partir de ahora, las nuevas contraseñas, llaves de acceso y otros datos se guardarán aquí. Es posible que <xliff:g id=app_name example=Provider>%1$s</xliff:g> use el contenido de la pantalla para determinar lo que se puede autocompletar."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Servicios de contraseñas, llaves de acceso y datos"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"¿Quieres desactivar %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>¿Quieres desactivar este servicio?</b> <br/> <br/> La información guardada, como contraseñas, llaves de acceso, formas de pago y otros datos, no se rellenará cuando accedas. Para usar la información guardada, elige un servicio de contraseña, llave de acceso o datos."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4d69449..de0f923 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Quedan <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> para completar la carga"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Tiempo de pantalla"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Tiempo en segundo plano"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Batería baja"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Permite que la aplicación se ejecute en segundo plano"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"¿Limitar actividad en segundo plano?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si limitas la actividad en segundo plano de una aplicación, puede que no funcione correctamente"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Esta aplicación no optimiza la batería, por lo que no puedes restringirla.\n\nPara hacerlo, activa antes la optimización."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Gestionar el uso de batería"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Sin restricciones"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimizado"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Restringido"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menos de 1 minuto"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"En segundo plano: menos de 1 minuto"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Tiempo de pantalla: menos de un minuto"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Menos de un minuto"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"En segundo plano: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Tiempo de pantalla: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"datos, llave de acceso, contraseña"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automático, completar, autocompletar, datos, llave de acceso, contraseña"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Asegúrate de que confías en esta aplicación</b> <br/> <br/> <xliff:g id=app_name example=Autocompletar de Google>%1$s</xliff:g> utiliza el contenido que se muestra en la pantalla para determinar el texto que se puede autocompletar."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>¿Usar <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Las nuevas contraseñas, llaves de acceso y otra información se guardarán aquí a partir de ahora. <xliff:g id=app_name example=Provider>%1$s</xliff:g> puede usar el contenido que hay en tu pantalla para determinar qué se puede autocompletar."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Contraseñas, llaves de acceso y servicios de datos"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"¿Desactivar %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>¿Desactivar este servicio?</b> <br/> <br/> La información guardada, como contraseñas, llaves de acceso, métodos de pago y otros datos no se rellenarán cuando inicies sesión. Para usar tu información guardada, elige un servicio de contraseñas, llaves de acceso o datos."</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index af0416b..f7b07c0 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Jäänud on <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> laadimise lõpuni"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Ekraaniaeg"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Taustal veedetud aeg"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Akutase on madal"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Lubatakse rakenduse taustal käitamine"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Kas piirata taustal tegevust?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Kui piirate rakenduse tegevust taustal, võib rakendus toimida valesti."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Kuna rak. pole aku optimeerimine seadistatud, ei saa te seda piirata.\n\nRak. piiramiseks lülit. esmalt sisse aku optimeerimine."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Akukasutuse haldamine"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Piiranguteta"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimeeritud"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Piiratud"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Kokku: vähem kui minut"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Taustal: vähem kui minut"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Ekraaniaeg: vähem kui minut"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Vähem kui minut"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Kokku: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Taustal: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Ekraaniaeg: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"andmesideteenus, pääsuvõti, parool"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automaatne, täitmine, automaattäide, andmed, pääsuvõti, parool"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Veenduge, et rakendus oleks usaldusväärne</b> <br/> <br/> <xliff:g id=app_name example=Google\'i automaatne täitmine>%1$s</xliff:g> kasutab automaatse täitmise sisestuse määramiseks ekraanil kuvatut."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Uued paroolid, pääsuvõtmed ja muu teave salvestatakse edaspidi siia. <xliff:g id=app_name example=Provider>%1$s</xliff:g> võib kasutada teie ekraanil kuvatut, et otsustada, millise osa saab automaatselt täita."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Paroolid, pääsuvõtmed ja andmesideteenused"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Kas lülitada %1$s välja?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Kas lülitada see teenus välja?</b> <br/> <br/> Salvestatud teavet, nagu paroolid, pääsuvõtmed, makseviisid ja muu teave, sisselogimisel ei täideta. Salvestatud teabe kasutamiseks valige üks paroolide, pääsuvõtmete või andmete talletamise teenus."</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 79f9782..a4c9d08 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Geratzen den denbora: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Kargatu arteko denbora: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Erabilera-denbora"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Atzeko planoan igarotako denbora"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Bateria gutxi"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Eman atzeko planoan exekutatzeko baimena aplikazioari"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Atzeko planoko jarduerak mugatu nahi dituzu?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Aplikazio baten atzeko planoko jarduerak mugatzen badituzu, baliteke aplikazioak behar bezala ez funtzionatzea"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikazio hau bateria optimizatzeko konfiguratuta ez dagoenez, ezin duzu mugatu.\n\nMugatzeko, aktibatu bateriaren optimizazioa."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Kudeatu bateria-erabilera"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Mugagabea"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimizatua"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Mugatua"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Guztira: minutu bat baino gutxiago"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Atzeko planoa: minutu bat baino gutxiago"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Erabilera-denbora: minutu bat baino gutxiago"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Minutu bat baino gutxiago"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Guztira: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Atzeko planoa: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Erabilera-denbora: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"datuak, sarbide-gakoa, pasahitza"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatikoa, bete, betetze automatikoa, datuak, sarbide-gakoa, pasahitza"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Ziurtatu aplikazioa fidagarria dela</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> aplikazioak pantailan dagoena erabiltzen du automatikoki bete daitekeena zehazteko."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Erabili <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Aurrerantzean, hemen gordeko dira pasahitz, sarbide-gako eta bestelako datu berriak. <xliff:g id=app_name example=Provider>%1$s</xliff:g> agian pantailako edukian oinarrituko da automatikoki zer bete daitekeen erabakitzeko."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Pasahitzak, sarbide-gakoak eta datu-zerbitzuak"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s desaktibatu nahi duzu?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Zerbitzu hau desaktibatu nahi duzu?</b> <br/> <br/> Saioa hasita eduki arren, ez dira automatikoki beteko pasahitzak, sarbide-gakoak, ordainketa-metodoak, etab. Gordeta daukazun informazioa erabili ahal izateko, aukeratu pasahitzen, sarbide-gakoen edo datuen zerbitzu bat."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 365f51b..b535d28 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> مانده"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> مانده تا شارژ کامل"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"مدت تماشای صفحه"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"زمان در پسزمینه"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"باتری ضعیف است"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"به برنامه اجازه دهید در پسزمینه اجرا شود"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"فعالیت پسزمینه محدود شود؟"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"محدود کردن فعالیت پسزمینه برای برنامه ممکن است باعث عملکرد نادرست آن شود."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"از آنجا که این برنامه برای بهینه کردن باتری تنظیم نشده است، نمیتوانید آن را محدود کنید.\n\nبرای محدود کردن برنامه، ابتدا بهینهسازی باتری را روشن کنید."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"مدیریت مصرف باتری"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"نامحدود"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"بهینهسازیشده"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"محدودشده"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"مجموع: کمتر از یک دقیقه"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"پسزمینه: کمتر از یک دقیقه"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"مدت تماشای صفحه: کمتر از یک دقیقه"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"کمتر از یک دقیقه"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"مجموع: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"پسزمینه: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"مدت تماشای صفحه: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"داده، گذرکلید، گذرواژه"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"خودکار، تکمیل، تکمیل خودکار، داده، گذرکلید، گذرواژه"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>مطمئن شوید به این برنامه اطمینان دارید</b> <br/> <br/> <xliff:g id=app_name example=تکمیل خودکار Google>%1$s</xliff:g> برای تعیین آنچه که میتواند بهطور خودکار تکمیل شود، از آنچه روی صفحهنمایش شما است استفاده میکند."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>از <xliff:g id=app_name example=Provider>%1$s</xliff:g> استفاده شود؟</b> <br/> <br/> ازاینپس گذرواژهها، گذرکلیدها، و سایر اطلاعات جدید در اینجا ذخیره خواهد شد. <xliff:g id=app_name example=Provider>%1$s</xliff:g> ممکن است از محتوای صفحهنمایش شما استفاده کند تا تشخیص دهد چه چیزهایی را میتوان بهطور خودکار تکمیل کرد."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"گذرواژهها، گذرکلیدها، و سرویسهای داده"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s خاموش شود؟"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>این سرویس خاموش شود؟</b> <br/> <br/> با ورود به سیستم، اطلاعات ذخیرهشده مثل گذرواژهها، گذرکلیدها، روشهای پرداخت، و دیگر اطلاعات تکمیل نخواهند شد. برای استفاده از اطلاعات ذخیرهشده، گذرواژه، گذرکلید، یا سرویس دادهای را انتخاب کنید."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 304515f..f13eb55 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> jäljellä"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> latausaikaa jäljellä"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Käyttöaika"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Aika taustalla"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Virta vähissä"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Salli sovelluksen toimia taustalla"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Rajoitetaanko toimintaa taustalla?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jos rajoitat sovelluksen toimintaa taustalla, se voi alkaa toimia virheellisesti."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Sovellusta ei voi rajoittaa, koska akun optimointi ei ole käytössä.\n\nOta optimointi käyttöön rajoittamista varten."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Rajaa akunkäyttöä"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Ei rajoituksia"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimoitu"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Rajoitettu"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Yhteensä: alle minuutti"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Taustalla: alle minuutti"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Käyttöaika: alle minuutti"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Alle minuutti"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Yhteensä: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Taustalla: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Käyttöaika: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, avainkoodi, salasana"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automaattinen, täyttö, automaattinen täyttö, data, avainkoodi, salasana"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Varmista, että luotat tähän sovellukseen</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> päättelee näytöllä olevien kohteiden perusteella, mitä voidaan täyttää automaattisesti."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Palveluntarjoaja>%1$s</xliff:g>?</b> <br/> <br/> Uudet salasanat, avainkoodit ja muut tiedot tallennetaan nyt tänne. <xliff:g id=app_name example=Palveluntarjoaja>%1$s</xliff:g> voi päätellä näytön näkymän perusteella, mitä voidaan täyttää automaattisesti."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Salasanat, avainkoodit ja datapalvelut"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Laitetaanko %1$s pois päältä?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Laitetaanko tämä palvelu pois päältä?</b> <br/> <br/> Tallennettuja tietoja (esimerkiksi salasanoja, avainkoodeja ja maksutapoja) ei täytetä, kun kirjaudut sisään. Jos haluat käyttää tallennettuja tietoja, valitse salasana, avainkoodi tai datapalvelu."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index b41c8a0..0ce4fa3 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Temps restant : <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> avant le chargement complet"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Le temps d\'utilisation des écrans"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Le temps d\'utilisation en arrière-plan"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Pile faible"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Autoriser l\'application à fonctionner en arrière-plan"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limiter l\'activité en arrière-plan?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si vous limitez l\'activité en arrière-plan d\'une application, cela peut provoquer un fonctionnement instable"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Comme cette appli n\'est pas config. pour optim. la pile, vous ne pouvez pas la restr.\n\nPour la restr., activez l\'optim. de pile."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Gérer l\'utilisation de la pile"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Aucune restriction"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimisée"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Limitée"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total : moins d\'une minute"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Arrière-plan : moins d\'une minute"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Temps d\'utilisation des écrans : moins d\'une minute"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Moins d\'une min"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total : <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Arrière-plan : <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Temps d\'utilisation des écrans : <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"données, clé d\'accès, mot de passe"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatique, remplissage, remplissage automatique, données, clé d\'accès, mot de passe"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Assurez-vous de faire confiance à cette application</b> <br/> <br/> <xliff:g id=app_name example=Google Remplissage automatique>%1$s</xliff:g> utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de l\'entrée automatique."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Les nouveaux mots de passe, clés d\'accès et autres renseignements seront désormais enregistrés ici. <xliff:g id=app_name example=Provider>%1$s</xliff:g> peut utiliser ce qui se trouve à l\'écran pour déterminer les données qui peuvent être remplies automatiquement."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Services de mots de passe, de clés d\'accès et de données"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Désactiver %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Désactiver ce service?</b> <br/> <br/> Lorsque vous vous connectez, les renseignements enregistrés, comme les mots de passe, les clés d\'accès, les modes de paiement, ou tout autre renseignement, ne seront pas remplis. Pour utiliser vos renseignements enregistrés, choisissez un mot de passe, une clé d\'accès ou un service de données."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1ef9bb2..08842db 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Temps restant : <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> avant chargement complet"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Temps d\'utilisation"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Temps en arrière-plan"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Batterie faible"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Autoriser l\'application à s\'exécuter en arrière-plan"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limiter l\'activité en arrière-plan ?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si vous limitez l\'activité en arrière-plan d\'une application, cela peut provoquer son dysfonctionnement"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Cette appli n\'étant pas configurée pour optimiser batterie, vous ne pouvez pas la limiter.\n\nActivez optimisation batterie."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Gérer l\'utilisation de la batterie"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Sans restriction"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimisée"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Limitée"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total : moins d\'une min"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Arrière-plan : moins d\'une min"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Temps d\'utilisation : moins d\'une minute"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Moins d\'une minute"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total : <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Arrière-plan : <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Temps d\'utilisation : <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"données, clé d\'accès, mot de passe"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"auto, remplir, remplir automatiquement, données, clé d\'accès, mot de passe"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Assurez-vous que cette appli est fiable</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> se sert de ce qui figure à l\'écran pour déterminer ce qui peut être saisi automatiquement."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Utilisez <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Les nouveaux mots de passe, clés d\'accès et autres infos seront désormais enregistrés ici. <xliff:g id=app_name example=Provider>%1$s</xliff:g> peut utiliser ce qui est affiché à l\'écran pour déterminer ce qui peut être saisi automatiquement."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Mots de passe, clés d\'accès et services de données"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Désactiver %1$s ?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Désactiver ce service ?</b> <br/> <br/> Les infos enregistrées telles que les mots de passe, clés d\'accès, modes de paiement et autres ne seront pas renseignées quand vous vous connecterez. Pour utiliser vos infos enregistrées, choisissez un mot de passe, une clé d\'accès ou un service de données."</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 0e5216b..b33626e 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> restante(s)"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> para completar a carga"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Tempo diante da pantalla"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Tempo en segundo plano"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Pouca batería"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Permite que a aplicación se execute en segundo plano"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Queres limitar a actividade en segundo plano?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si limitas a actividade en segundo plano para unha aplicación, é posible que non funcione correctamente"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Non podes limitar a aplicación porque non se configurou para optimizar a batería.\n\nPrimeiro activa a optimización da batería."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Xestionar o uso da batería"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Sen restricións"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimizado"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Restrinxido"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menos dun minuto"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"En segundo plano: menos dun minuto"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Tempo diante da pantalla: menos dun minuto"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Menos dun minuto"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Segundo plano: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Tempo diante da pantalla: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"datos, claves de acceso, contrasinal"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automático, completar, autocompletar, datos, clave de acceso, contrasinal"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Asegúrate de que confías nesta aplicación</b> <br/> <br/> <xliff:g id=app_name example=Autocompletar de Google>%1$s</xliff:g> utiliza o contido da pantalla para determinar o que se pode completar."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Utilizas <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> A partir de agora, determinada información nova (contrasinais, claves de acceso e outros datos) gardarase aquí. <xliff:g id=app_name example=Provider>%1$s</xliff:g> pode usar o que apareza na pantalla para determinar o que se pode autocompletar."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Contrasinais, claves de acceso e servizos de datos"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Queres desactivar %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Queres desactivar este servizo?</b> <br/> <br/> A información gardada (por exemplo, contrasinais, claves de acceso, métodos de pago…) non se completará cando inicies sesión. Para usar a información gardada, escolle un servizo de contrasinais, claves de acceso ou datos."</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index bd1c976..c8ceab3 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> બાકી"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"ચાર્જ થવામાં <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"સ્ક્રીન સમય"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"બૅકગ્રાઉન્ડ સમય"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"ઓછી બૅટરી"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"ઍપ્લિકેશનને પૃષ્ઠભૂમિમાં ચાલવાની મંજૂરી આપો"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"બૅકગ્રાઉન્ડ પ્રવૃત્તિને મર્યાદિત કરીએ?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"જો તમે બૅકગ્રાઉન્ડ પ્રવૃત્તિને એક ઍપ માટે મર્યાદિત કરો છો, તો તે અયોગ્ય વર્તન કરી શકે છે"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"આ ઍપ બૅટરી ઑપ્ટિમાઇઝ કરવા સેટ નથી તેથી તમે તેને પ્રતિબંધિત કરી શકશો નહીં.\n\nએને પ્રતિબંધિત કરવા, પહેલાં બૅટરી ઑપ્ટિમાઇઝ કરવાનું ચાલુ કરો."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"બૅટરીનો વપરાશ મેનેજ કરો"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"અમર્યાદિત"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ઑપ્ટિમાઇઝ કરેલો"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"પ્રતિબંધિત"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"કુલ: એક મિનિટ કરતાં ઓછો સમય"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"બૅકગ્રાઉન્ડ: એક મિનિટ કરતાં ઓછો સમય"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"સ્ક્રીન સમય: એક મિનિટ કરતાં ઓછો"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"એક મિનિટ કરતાં ઓછો"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"કુલ: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"બૅકગ્રાઉન્ડ: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"સ્ક્રીન સમય: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"ડેટા, પાસકી, પાસવર્ડ"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"ઑટો, ભરો, ઑટોમૅટિક રીતે ભરવાની સુવિધા, ડેટા, પાસકી, પાસવર્ડ"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>ખાતરી કરો કે તમે આ ઍપનો વિશ્વાસ કરો છો</b> <br/> <br/> <xliff:g id=app_name example=Google ઑટોમૅટિક રીતે ભરવાની સુવિધા>%1$s</xliff:g> તમારી સ્ક્રીન પર શું છે તેનો ઉપયોગ એ નક્કી કરવા કરે છે કે ઑટોમૅટિક રીતે શું દાખલ થશે."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> હવેથી નવા પાસવર્ડ, પાસકી તેમજ અન્ય માહિતી અહીં સાચવવામાં આવશે. <xliff:g id=app_name example=Provider>%1$s</xliff:g> દ્વારા ઑટોમૅટિક રીતે ભરવાની માહિતી નક્કી કરવા માટે તમારી સ્ક્રીન પરની માહિતીનો ઉપયોગ કરવામાં આવી શકે છે."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"પાસવર્ડ, પાસકી, અને ડેટા સંબંધિત સેવાઓ"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$sને બંધ કરીએ?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>શું આ સેવા બંધ કરીએ?</b> <br/> <br/> જ્યારે તમે સાઇન ઇન કરશો ત્યારે પાસવર્ડ, પાસકી, ચુકવણી પદ્ધતિઓ અને અન્ય માહિતી જેવી સાચવેલી માહિતી ભરવામાં આવશે નહીં. તમારી સાચવેલી માહિતીનો ઉપયોગ કરવા માટે, કોઈ પાસવર્ડ, પાસકી કે ડેટા સેવા પસંદ કરો."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 9a327af..ff8e554 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> शेष"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"चार्ज होने में <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> शेष"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"ऐप्लिकेशन के इस्तेमाल में बीता समय"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"बैकग्राउंड में ऐप्लिकेशन चलने का समय"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"बैटरी कम है"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"ऐप्लिकेशन को बैकग्राउंड में चलने दें"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ऐप की बैकग्राउंड गतिविधि को सीमित करें?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"अगर आप ऐप की बैकग्राउंड गतिविधि को सीमित करते हैं, तो हो सकता है यह ठीक ढंग से काम न करे"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ऐप्लिकेशन पर रोक नहीं लगेगी क्योंकि यह बैटरी ऑप्टिमाइज़ नहीं कर सकता.\n\nबैटरी ऑप्टिमाइज़ेशन चालू करके ही ऐसा हो सकता है."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"बैटरी खर्च को मैनेज करें"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"कोई पाबंदी नहीं"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ऑप्टिमाइज़ की गई सेटिंग"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"पाबंदी लगी है"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"इस्तेमाल का कुल समय: एक मिनट से कम"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"बैकग्राउंड में इस्तेमाल होने का समय: एक मिनट से कम"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"किसी डिवाइस के इस्तेमाल में बीता समय: एक मिनट से कम"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"एक मिनट से कम"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"इस्तेमाल का कुल समय: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"बैकग्राउंड में इस्तेमाल होने का समय: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"किसी डिवाइस के इस्तेमाल में बीता समय: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"डेटा, पासकी, पासवर्ड"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"अपने-आप, भरना, अपने-आप भरना, डेटा, पासकी, और पासवर्ड"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>पक्का करें कि आपको इस ऐप्लिकेशन पर भरोसा है</b> <br/> <br/> <xliff:g id=app_name example=Google की मदद से, जानकारी अपने-आप भरने की सुविधा,>%1$s</xliff:g> ऑटोमैटिक भरी जा सकने वाली चीज़ें तय करने के लिए आपकी स्क्रीन पर मौजूद चीज़ों का इस्तेमाल करती है."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> नए पासवर्ड, पासकी, और अन्य जानकारी अब से यहां सेव की जाएगी. <xliff:g id=app_name example=Provider>%1$s</xliff:g> आपके डिवाइस की स्क्रीन पर दिख रहे कॉन्टेंट का इस्तेमाल करके, यह तय कर सकता है कि कौनसी जानकारी अपने-आप भरी जा सकती है."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"पासवर्ड, पासकी, और डेटा की सेवाएं"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"क्या आपको %1$s को बंद करना है?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>क्या इस सेवा को बंद करना है?</b> <br/> <br/> साइन इन करने पर, पासवर्ड, पासकी, पेमेंट का तरीका, और सेव की गई अन्य जानकारी, पहले से भरी हुई नहीं होगी. सेव की गई जानकारी इस्तेमाल करने के लिए, कोई पासवर्ड, पासकी या डेटा सेवा को चुनें."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c5eef24..c048a6f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Preostalo je <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do dovršetka punjenja"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Vrijeme upotrebe"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Vrijeme rada u pozadini"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Slaba baterija"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Dopustite rad aplikacije u pozadini"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Želite li ograničiti pozadinsku aktivnost?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ako ograničite pozadinsku aktivnost za aplikaciju, možda će se ponašati nepredviđeno"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikacija nije postavljena za optimizaciju baterije, pa je ne možete ograničiti.\n\nZa ograničenje uključite optimizaciju."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Upravljanje potrošnjom baterije"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Neograničeno"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimizirano"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Ograničeno"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Ukupno: manje od minute"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"U pozadini: manje od minute"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Vrijeme upotrebe: manje od minute"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Manje od minute"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Ukupno: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"U pozadini: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Vrijeme upotrebe: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"podaci, šifra, zaporka"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatsko, popunjavanje, automatsko popunjavanje, podaci, pristupni ključ, zaporka"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Provjerite je li ova aplikacija pouzdana</b> <br/> <br/> <xliff:g id=app_name example=Google automatsko popunjavanje>%1$s</xliff:g> upotrebljava sadržaj na zaslonu za procjenu onoga što se može automatski popuniti."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Nove zaporke, pristupni ključevi i drugi podaci odsad će se spremati ovdje. <xliff:g id=app_name example=Provider>%1$s</xliff:g> može koristiti sadržaj vašeg zaslona kako bi utvrdio što se može automatski popuniti."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Usluge za zaporke, pristupne ključeve i podatke"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Isključiti %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Želite li isključiti uslugu?</b> <br/> <br/> Spremljeni podaci, kao što su zaporke, pristupni ključevi, načini plaćanja i drugi podaci možda se neće unijeti kad se prijavite. Da biste upotrebljavali spremljene podatke, odaberite zaporku, pristupni ključ ili podatkovnu uslugu."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 76e76ed..977da59 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> -- <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> van hátra"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> a feltöltéshez"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Képernyőidő"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Háttérben töltött idő"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Alacsony töltöttség"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Az alkalmazás háttérben futásának engedélyezése"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Korlátozza a háttértevékenységet?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ha korlátozza az alkalmazások háttértevékenységét, lehetséges, hogy hibásan fognak működni"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Az alkalmazás nem korlátozható, mert nincs beállítva az akkumulátor optimalizálására.\n\nA korlátozáshoz kapcsolja be az akkumulátoroptimalizálást."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Akkumulátorhasználat kezelése"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Korlátlan"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimalizált"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Korlátozott"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Összesen: kevesebb mint egy perc"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Háttér: egy percnél kevesebb"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Képernyőidő: egy percnél kevesebb"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Kevesebb mint egy perc"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Összesen: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Háttér: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Képernyőidő: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"adat, azonosítókulcs, jelszó"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatikus, kitöltés, automatikus kitöltés, adatok, azonosítókulcs, jelszó"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Győződjön meg arról, hogy az alkalmazás megbízható.</b> <br/> <br/> A(z) <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> az Ön képernyőjén szereplő információk alapján határozza meg, hogy mit lehet automatikusan kitölteni."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Használja a(z) <xliff:g id=app_name example=Provider>%1$s</xliff:g> alkalmazást?</b> <br/> <br/> Az új jelszavakat, az azonosítókulcsokat és az egyéb információkat mostantól ide menti a rendszer. A(z) <xliff:g id=app_name example=Provider>%1$s</xliff:g> alkalmazás felhasználhatja az Ön képernyőjén megjelenő információkat az automatikusan kitölthető elemek meghatározásához."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Jelszavak, azonosítókulcsok és adatszolgáltatások"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Kikapcsolja a következőt: %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Kikapcsolja a szolgáltatást?</b> <br/> <br/> A mentett adatokat, például jelszavakat, azonosítókulcsokat, fizetési módokat és egyéb információkat a rendszer nem fogja kitölteni, amikor be van jelentkezve. A mentett adatok használatához válasszon egy jelszót, azonosítókulcsot vagy adatszolgáltatást."</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 9ddc064..6ecf06c 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"մնում է <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> մինչև լիցաքավորվելը"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Սարքի օգտագործման ժամանակը"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Ֆոնային ռեժիմում աշխատանքի ժամանակը"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Մարտկոցի լիցքը քիչ է"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Թույլ տալ հավելվածին աշխատել ֆոնային ռեժիմում"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Սահմանափակե՞լ ֆոնային գործողությունները"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Հավելվածի ֆոնային գործողությունների սահմանափակումը կարող է ազդել վերջինիս աշխատանքի վրա"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Մարտկոցի օպտիմալացումն այս հավելվածի համար կարգավորված չէ։\n\nՄիացրեք այն՝ հավելվածը սահմանափակելու համար։"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Մարտկոցի օգտագործման կառավարում"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Անսահմանափակ"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Օպտիմալացված"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Սահմանափակ"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Ընդամենը՝ մեկ րոպեից պակաս"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Ֆոնային՝ մեկ րոպեից պակաս"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Սարքի օգտագործման ժամանակը՝ ավելի քիչ քան մեկ րոպե"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Մեկ րոպեից պակաս"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Ընդամենը՝ <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Ֆոնային՝ <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Սարքի օգտագործման ժամանակը՝ <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"տվյալներ, անցաբառ, գաղտնաբառ"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"ավտոմատ, լրացնել, ինքնալրացում, տվյալներ, անցաբառ, գաղտնաբառ"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Համոզվեք, որ վստահում եք այս հավելվածին</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g>-ն օգտագործում է էկրանի բովանդակությունը՝ որոշելու, թե ինչը կարող է ինքնալրացվել:"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Օգտագործեք <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> հավելվածը <br/> <br/> Նոր գաղտնաբառերը, անցաբառերը և այլ տեղեկություններ այսուհետ կպահվեն այստեղ։ <xliff:g id=app_name example=Provider>%1$s</xliff:g> հավելվածը կարող է օգտագործել ձեր էկրանի բովանդակությունը՝ որոշելու, թե ինչ կարելի է ինքնալրացնել։"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Գաղտնաբառերի, անցաբառերի և տվյալների պահման ծառայություններ"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Անջատե՞լ %1$s ծառայությունը"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Անջատե՞լ այս ծառայությունը</b> <br/> <br/> Պահված տեղեկությունները, ինչպիսիք են գաղտնաբառերը, անցաբառերը, վճարման եղանակները և այլ տվյալներ, չեն լրացվի, երբ մուտք գործեք։ Ձեր պահված տեղեկությունները օգտագործելու համար ընտրեք գաղտնաբառ, անցաբառ կամ ծառայություն։"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 3113523..ca567a4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> tersisa"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> lagi agar terisi penuh"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Waktu pemakaian perangkat"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Waktu di latar belakang"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Baterai lemah"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Izinkan aplikasi berjalan di latar belakang"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Batasi aktivitas background?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jika aktivitas background aplikasi dibatasi, mungkin fungsinya terganggu."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Anda tidak dapat membatasi aplikasi karena tidak disetel untuk mengoptimalkan baterai.\n\nAktifkan pengoptimalan baterai untuk membatasi aplikasi."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Kelola penggunaan baterai"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Tidak dibatasi"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Dioptimalkan"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Dibatasi"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: kurang dari satu menit"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Latar belakang: kurang dari satu menit"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Waktu pemakaian perangkat: kurang dari satu menit"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Kurang dari satu menit"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Latar belakang: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Waktu pemakaian perangkat: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, kunci sandi, sandi"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"otomatis, isi, isi otomatis, data, kunci sandi, sandi"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Pastikan Anda memercayai aplikasi ini</b> <br/> <br/> <xliff:g id=app_name example=Isi Otomatis Google>%1$s</xliff:g> menggunakan item yang ada di layar untuk menentukan item apa saja yang dapat diisi otomatis."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Gunakan <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Sandi, kunci sandi, dan info baru lainnya akan disimpan di sini mulai sekarang. <xliff:g id=app_name example=Provider>%1$s</xliff:g> dapat menggunakan konten di layar untuk menentukan item yang dapat diisi otomatis."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Sandi, kunci sandi, dan layanan data"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Nonaktifkan %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Nonaktifkan layanan ini?</b> <br/> <br/> Info tersimpan seperti sandi, kunci sandi, metode pembayaran, dan info lainnya tidak akan diisikan saat Anda login. Untuk menggunakan info tersimpan, pilih sandi, kunci sandi, atau layanan data."</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 112d891..7c1520f 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> eftir"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> þar til fullri hleðslu er náð"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Skjátími"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Tími í bakgrunni"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Rafhlaða að tæmast"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Leyfa forriti að keyra í bakgrunni"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Viltu takmarka bakgrunnsvirkni?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ef þú takmarkar bakgrunnsvirkni forrits gæti það látið illa"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Forrit notar ekki fínstillingu á rafhlöðu og því er ekki hægt að takmarka það.\n\nKveiktu á fínstillingu til að takmarka."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Stjórna rafhlöðunotkun"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Ótakmörkuð"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Fínstillt"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Takmarkað"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Alls: innan við mínúta"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Í bakgrunni: innan við mínúta"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Skjátími: innan við mínúta"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Minna en mínúta"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Samtals: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Í bakgrunni: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Skjátími: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"gögn, aðgangslykill, aðgangsorð"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"sjálfvirkt, útfylling, sjálfvirk útfylling, gögn, aðgangslykill, aðgangsorð"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Gakktu úr skugga um að þú treystir þessu forriti</b> <br/> <br/> <xliff:g id=app_name example=Sjálfvirk útfylling Google>%1$s</xliff:g> notar það sem er á skjánum til að ákvarða hvað er hægt að fylla sjálfkrafa út."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Nota <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Ný aðgangsorð, aðgangslyklar og aðrar upplýsingar verða vistaðar hér framvegis. <xliff:g id=app_name example=Provider>%1$s</xliff:g> kann að nota það sem er á skjánum hjá þér til að greina hvað er hægt að fylla sjálfkrafa út."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Aðgangsorð, aðgangslyklar og gagnaþjónustur"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Viltu slökkva á %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Viltu slökkva á þessari þjónustu?</b> <br/> <br/> Vistaðar upplýsingar á borð við aðgangsorð, aðgangslykla, greiðslumáta og aðrar upplýsingar verða ekki fylltar út þegar þú skráir þig inn. Veldu aðgangsorð, aðgangslykil eða gagnaþjónustu til að nota vistuðu upplýsingarnar."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 67ad022..930fc48 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> rimanenti"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> alla ricarica"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Tempo di utilizzo"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Tempo in background"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Batteria in esaurimento"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Consenti l\'esecuzione in background dell\'app"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitare l\'attività in background?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Se limiti l\'attività in background per un\'app, tale app potrebbe funzionare in modo anomalo"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Per limitare l\'app,\n\ndevi prima attivare l\'ottimizzazione della batteria."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Gestisci l\'utilizzo della batteria"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Senza limitazioni"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Ottimizzato"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Con limitazioni"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Totale: meno di un minuto"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"In background: meno di un minuto"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Tempo di utilizzo: meno di un min"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Meno di un min"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Totale: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"In background: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Tempo di utilizzo: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"dati, passkey, password"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatica, compilazione, compilazione automatica, dati, passkey, password"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Verifica che questa app sia attendibile</b> <br/> <br/> <xliff:g id=app_name example=La Compilazione automatica di Google>%1$s</xliff:g> usa ciò che appare sullo schermo per stabilire quali contenuti possono essere compilati automaticamente."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Usa <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> D\'ora in poi, nuove password, passkey e altre informazioni verranno salvate qui. <xliff:g id=app_name example=Provider>%1$s</xliff:g> potrebbe usare i contenuti sullo schermo per stabilire quali informazioni possono essere compilate automaticamente."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Servizi per password, passkey e dati"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Vuoi disattivare %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Disattivare questo servizio?</b> <br/> <br/> Le informazioni salvate come password, passkey, metodi di pagamento e altre informazioni, non verranno inserite quando accedi. Per usare le informazioni salvate, scegli una password, una passkey o un servizio dati."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f039d6a..a5eb0dc 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"残り<xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"充電されるまで<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"フォアグラウンドの時間"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"バックグラウンドの時間"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"バッテリー残量: 少ない"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"バックグラウンドでのアプリの実行を許可"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"バックグラウンド アクティビティの制限"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"アプリのバックグラウンド アクティビティを制限すると、アプリが正常に機能しないことがあります"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"このアプリは、電池の最適化が設定されていないため、制限することはできません。\n\nこのアプリを制限するには、電池の最適化を ON にしてください。"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"バッテリー使用状況の管理"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"制限なし"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"最適化"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"制限"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"合計: 1 分未満"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"バックグラウンド: 1 分未満"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"利用時間: 1 分未満"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"1 分未満"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"合計: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"バックグラウンド: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"利用時間: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"データ, パスキー, パスワード"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"自動, 入力, 自動入力, データ, パスキー, パスワード"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>このアプリが信頼できることを確認してください</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> は画面上の内容に基づいて、自動入力可能な情報を判別します。"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g> を使用しますか？</b><br/> <br/> 今後は、新しいパスワード、パスキー、その他の情報がここに保存されます。<xliff:g id=app_name example=Provider>%1$s</xliff:g> は画面上の内容に基づいて、自動入力可能な情報を判別します。"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"パスワード、パスキー、データのサービス"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s を OFF にしますか？"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>このサービスを無効にしますか？</b> <br/> <br/>パスワード、パスキー、お支払い方法などの情報を保存しました。その他の情報はログイン時に入力されません。保存された情報を使用するには、パスワード、パスキー、またはデータのサービスを選択してください。"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 9ae47df..bb9e08c 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -273,8 +273,7 @@
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"მიმდინარეობს ჩატვირთვა…"</string>
<string name="location_settings_footer_general" msgid="1040507068701188821">"ახლომდებარე მოწყობილობების ნებართვების მქონე აპებს შეუძლია დაკავშირებული მოწყობილობების პოზიციის განსაზღვრა."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"აპებისა და სერვისების მდებარეობაზე წვდომა გამორთულია. თქვენი მოწყობილობის მდებარეობა მაინც გაიგზავნება გადაუდებელი დახმარების სამსახურში, როცა გადაუდებელი დახმარების სამსახურის ნომერზე დარეკავთ ან ტექსტურ შეტყობინებას გაგზავნით."</string>
- <!-- no translation found for location_settings_footer_learn_more_content_description (349380666660145540) -->
- <skip />
+ <string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"შეიტყვეთ მეტი მდებარეობის პარამეტრების შესახებ"</string>
<string name="account_settings_title" msgid="9138880127246241885">"ანგარიშები"</string>
<string name="security_settings_title" msgid="6710768415432791970">"უსაფრთხოება"</string>
<string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"დაშიფვრა და ავტორიზაციის მონაცემები"</string>
@@ -2245,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"დარჩენილია <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"დატენვამდე <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"ეკრანთან გატარებული დრო"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"ფონური დრო"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"ბატარეის დაბალი მუხტი"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"აპისთვის ფონურ რეჟიმში მუშაობის დაშვება"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"გსურთ ფონური აქტივობის შეზღუდვა?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"აპისთვის ფონური აქტივობის შეზღუდვის შემთხვევაში, მან შეიძლება არასათანადოდ იმუშაოს"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"რადგან ეს აპი ბატარეის ოპტიმიზებისთვის დაყენებული არაა, მას ვერ შეზღუდავთ.\n\nჩართეთ ბატარეის ოპტიმიზაცია აპის შესაზღუდავად."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"ბატარეის მოხმარების მართვა"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"შეუზღუდავი"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ოპტიმიზებული"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"შეზღუდული"</string>
@@ -2397,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"სულ: წუთზე ნაკლები"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ფონი: წუთზე ნაკლები"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"ეკრანთან გატარებული დრო: ერთ წუთზე ნაკლები"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"წუთზე ნაკლები"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"სულ: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"ფონი: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"ეკრანთან გატარებული დრო: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4180,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"მონაცემები, წვდომის გასაღები, პაროლი"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"ავტომატური, შევსება, ავტომატური შევსება, მონაცემები, წვდომის გასაღებებიწვდომის გასაღები, პაროლი"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>დარწმუნდით, რომ ენდობით ამ აპს</b> <br/> <br/> <xliff:g id=app_name example=Google-ის ავტომატური შევსება>%1$s</xliff:g> იყენებს თქვენს ეკრანზე არსებულ კონტენტს, რათა გაარკვიოს, რა შეიძლება შეივსოს ავტომატურად."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> ახალი პაროლები, წვდომის გასაღებები და სხვა ინფორმაცია ამიერიდან აქ შეინახება. <xliff:g id=app_name example=Provider>%1$s</xliff:g> შეძლებს იმის გამოყენებას, რაც თქვენს ეკრანზეა, იმის განსაზღვრისთვის, თუ რის ავტომატური შევსებაა შესაძლებელი."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"პაროლები, წვდომის გასაღებები და მონაცემთა სერვისები"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"გამოირთოს %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>ამ სერვისის გამორთვა?</b> <br/> <br/> შენახული ინფორმაცია, როგორიცაა პაროლები, წვდომის გასაღებები, გადახდის მეთოდები და სხვა ინფორმაცია, არ შეივსება სისტემაში შესვლისას. შენახული ინფორმაციის გამოსაყენებლად აირჩიეთ პაროლი, წვდომის გასაღები ან მონაცემთა სერვისი."</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 489a58f..f1b2121 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> қалды"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Зарядталғанша <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Пайдалану уақыты"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Фонда пайдалану уақыты"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Батарея заряды аз."</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Қолданбаға фондық режимде іске қосылуға рұқсат беру"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Фондық режимдегі әрекет шектелсін бе?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Қолданбаның фондық режимдегі әрекетін шектесеңіз, күтпеген әрекет көрсетуі мүмкін."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Бұл қолданба батареяны оңтайландыруға реттелмегендіктен, оны шектей алмайсыз. \n\nБұл үшін батареяны оңтайландыруды қосыңыз."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Батарея шығынын қадағалау"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Шектелмеген"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Оңтайландырылған"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Шектелген"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Барлығы: бір минуттан аз"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Фондық режимде: бір минуттан аз"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Пайдалану уақыты: бір минуттан аз"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Бір минуттан аз"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Барлығы: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Фондық режимде: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Пайдалану уақыты: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"деректер, кіру кілті, құпия сөз"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"авто, толтыру, автотолтыру, дерек, кіру кілті, құпия сөз"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Осы қолданбаның қауіпсіз екеніне көз жеткізіңіз</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> экранда көрсетілгенді пайдаланып, нені автоматты түрде толтыруға болатынын анықтайды."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g>? қолданбасын пайдалану</b> <br/> <br/> Енді жаңа құпия сөздер, кіру кілттері мен басқа да ақпарат осы жерде сақталады. <xliff:g id=app_name example=Provider>%1$s</xliff:g> қолданбасы нені автотолтыруға болатынын анықтау үшін экраныңыздағы деректерді пайдалана алады."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Құпия сөздер, кіру кілттері мен дерек қызметтері"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s мәліметтерін өшіру керек пе?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Бұл қызметті өшіру керек пе?</b> <br/> <br/> Құпия сөздер, кіру кілттері, төлеу әдістері сияқты сақталған ақпарат пен басқа ақпарат аккаунтқа кіру кезінде толтырылмайды. Сақталған ақпаратыңызды пайдалану үшін құпия сөзді, кіру кілтін немесе дерек қызметін таңдаңыз."</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 56948cc..9b32f0f 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"នៅសល់ <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ដើម្បីបញ្ចូលថ្ម"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"រយៈពេលប្រើប្រាស់"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"រយៈពេលនៅផ្ទៃខាងក្រោយ"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"ជិតអស់ថ្មហើយ"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"អនុញ្ញាតឲ្យកម្មវិធីនេះដំណើរការនៅផ្ទៃខាងក្រោយ"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ដាក់កម្រិតលើសកម្មភាពផ្ទៃខាងក្រោយ?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ប្រសិនបើអ្នកដាក់កម្រិតលើសកម្មភាពផ្ទៃខាងក្រោយសម្រាប់កម្មវិធី វាអាចនឹងដំណើរការខុសប្រក្រតី"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ដោយសារកម្មវិធីនេះមិនត្រូវបានកំណត់ ដើម្បីបង្កើនប្រសិទ្ធភាពថ្ម អ្នកមិនអាចដាក់កំហិតវាបានទេ។\n\nដើម្បីដាក់កំហិតកម្មវិធី សូមបើកការបង្កើនប្រសិទ្ធភាពថ្មជាមុនសិន។"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"គ្រប់គ្រងការប្រើប្រាស់ថ្ម"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"គ្មានការដាក់កំហិត"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"បង្កើនប្រសិទ្ធភាព"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"ដាក់កំហិត"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"សរុប៖ តិចជាងមួយនាទី"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ផ្ទៃខាងក្រោយ៖ តិចជាងមួយនាទី"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"រយៈពេលប្រើប្រាស់៖ តិចជាងមួយនាទី"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"តិចជាងមួយនាទី"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"សរុប៖ <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"ផ្ទៃខាងក្រោយ៖ <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"រយៈពេលប្រើប្រាស់៖ <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"ទិន្នន័យ, កូដសម្ងាត់, ពាក្យសម្ងាត់"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"ស្វ័យប្រវត្តិ, បំពេញ, បំពេញស្វ័យប្រវត្តិ, ទិន្នន័យ, កូដសម្ងាត់, ពាក្យសម្ងាត់"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>ត្រូវប្រាកដថាអ្នកទុកចិត្តកម្មវិធីនេះ</b> <br/> <br/> <xliff:g id=app_name example=Google បំពេញស្វ័យប្រវត្តិ>%1$s</xliff:g> ប្រើប្រាស់អ្វីដែលមាននៅលើអេក្រង់របស់អ្នក ដើម្បីកំណត់អ្វីដែលអាចបំពេញដោយស្វ័យប្រវត្តិ។"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>ប្រើ <xliff:g id=app_name example=Provider>%1$s</xliff:g> ឬ?</b> <br/> <br/> ពាក្យសម្ងាត់ កូដសម្ងាត់ថ្មីៗ និងព័ត៌មានផ្សេងទៀតនឹងត្រូវបានរក្សាទុកនៅទីនេះចាប់ពីពេលនេះតទៅ។ <xliff:g id=app_name example=Provider>%1$s</xliff:g> អាចនឹងប្រើប្រាស់អ្វីដែលមាននៅលើអេក្រង់របស់អ្នក ដើម្បីកំណត់ថាអាចបំពេញអ្វីខ្លះដោយស្វ័យប្រវត្តិ។"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"ពាក្យសម្ងាត់ កូដសម្ងាត់ និងសេវាកម្មទិន្នន័យ"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"បិទ %1$s ឬ?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>បិទសេវាកម្មនេះឬ?</b> <br/> <br/> ព័ត៌មានដែលបានរក្សាទុកដូចជា ពាក្យសម្ងាត់ កូដសម្ងាត់ វិធីបង់ប្រាក់ និងព័ត៌មានផ្សេងទៀតនឹងមិនត្រូវបានបំពេញទេ ពេលអ្នកចូលគណនី។ ដើម្បីប្រើព័ត៌មានដែលអ្នកបានរក្សាទុក សូមជ្រើសរើសសេវាកម្មទិន្នន័យ ពាក្យសម្ងាត់ ឬកូដសម្ងាត់។"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 94d1cc8..4319e71 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> ಉಳಿದಿದೆ"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"ಚಾರ್ಜ್ ಮಾಡಲು <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"ವೀಕ್ಷಣಾ ಅವಧಿ"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"ಹಿನ್ನೆಲೆ ಸಮಯ"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"ಬ್ಯಾಟರಿ ಕಡಿಮೆಯಿದೆ"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿ ನೀಡಿ"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆಯನ್ನು ಸೀಮಿತಗೊಳಿಸುವುದೇ?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ಒಂದು ಅಪ್ಲಿಕೇಶನ್ನ ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆಯನ್ನು ನೀವು ಸೀಮಿತಗೊಳಿಸಿದರೆ, ಅದು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ಬ್ಯಾಟರಿ ಅನ್ನು ಆಪ್ಟಿಮೈಜ್ ಮಾಡಲು ಈ ಅಪ್ಲಿಕೇಶನ್ ಹೊಂದಿಸದ ಕಾರಣ, ನೀವು ಇದನ್ನು ನಿರ್ಬಂಧಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\n\n ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿರ್ಬಂಧಿಸಲು, ಮೊದಲು ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಷನ್ ಅನ್ನು ಆನ್ ಮಾಡಿ."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ನಿರ್ವಹಿಸಿ"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"ಮಿತಿ ಇಲ್ಲದ್ದು"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗಿದೆ"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"ಒಟ್ಟು: ಒಂದು ನಿಮಿಷಕ್ಕಿಂತ ಕಡಿಮೆ"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ಹಿನ್ನೆಲೆ: ಒಂದು ನಿಮಿಷಕ್ಕಿಂತ ಕಡಿಮೆ"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"ವೀಕ್ಷಣಾ ಅವಧಿ: ಒಂದು ನಿಮಿಷಕ್ಕೂ ಕಡಿಮೆ ಸಮಯ"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"ಒಂದು ನಿಮಿಷಕ್ಕಿಂತಲೂ ಕಡಿಮೆ"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"ಒಟ್ಟು: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"ಹಿನ್ನೆಲೆ: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"ವೀಕ್ಷಣಾ ಅವಧಿ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"ಡೇಟಾ, ಪಾಸ್ಕೀ, ಪಾಸ್ವರ್ಡ್"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"ಆಟೋ, ಫಿಲ್, ಆಟೋಫಿಲ್, ಡೇಟಾ, ಪಾಸ್ಕೀ, ಪಾಸ್ವರ್ಡ್"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>ನಿಮಗೆ ಈ ಅಪ್ಲಿಕೇಶನ್ ಮೇಲೆ ವಿಶ್ವಾಸವಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ </b> <br/> <br/> ಯಾವ ಕ್ಷೇತ್ರಗಳನ್ನು ಸ್ವಯಂ-ಭರ್ತಿ ಮಾಡಬಹುದು ಎಂಬುದನ್ನು ನಿರ್ಧರಿಸಲು <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ನಲ್ಲಿನ ಮಾಹಿತಿಯನ್ನು ಬಳಸಿಕೊಳ್ಳುತ್ತದೆ."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> ಈಗಿನಿಂದ ಹೊಸ ಪಾಸ್ವರ್ಡ್ಗಳು, ಪಾಸ್ಕೀಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ಇಲ್ಲಿ ಉಳಿಸಲಾಗುತ್ತದೆ. ಏನನ್ನು ಆಟೋಫಿಲ್ ಮಾಡಬಹುದು ಎಂಬುದನ್ನು ನಿರ್ಧರಿಸಲು <xliff:g id=app_name example=Provider>%1$s</xliff:g> ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಮೇಲಿರುವುದನ್ನು ಬಳಸಬಹುದು."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"ಪಾಸ್ವರ್ಡ್ಗಳು, ಪಾಸ್ಕೀಗಳು ಮತ್ತು ಡೇಟಾ ಸೇವೆಗಳು"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"1$s ಅನ್ನು ಆಫ್ ಮಾಡಬೇಕೆ?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>ಈ ಸೇವೆಯನ್ನು ಆಫ್ ಮಾಡಬೇಕೇ?</b> <br/> <br/> ಪಾಸ್ವರ್ಡ್ಗಳು, ಪಾಸ್ಕೀಗಳು, ಪಾವತಿ ವಿಧಾನಗಳಂತಹ ಸೇವ್ ಮಾಡಿದ ಮಾಹಿತಿಯನ್ನು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ನೀವು ಸೈನ್ ಇನ್ ಮಾಡಿದಾಗ ಭರ್ತಿ ಮಾಡಲಾಗುವುದಿಲ್ಲ. ನಿಮ್ಮ ಸೇವ್ ಮಾಡಿದ ಮಾಹಿತಿಯನ್ನು ಬಳಸಲು, ಪಾಸ್ವರ್ಡ್, ಪಾಸ್ಕೀ ಅಥವಾ ಡೇಟಾ ಸೇವೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ."</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 2692669..54796c9 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> 남음"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> 후 완충"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"기기 사용 시간"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"백그라운드 시간"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"배터리 잔량 부족"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"앱이 백그라운드에서 실행되도록 허용"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"백그라운드 활동을 제한하시겠습니까?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"앱의 백그라운드 활동을 제한하면 앱이 정상적으로 작동하지 않을 수도 있습니다."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"배터리 최적화를 설정하지 않아 이 앱을 제한할 수 없습니다.\n\n앱을 제한하려면 먼저 배터리 최적화를 사용 설정하세요."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"배터리 사용량 관리"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"제한 없음"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"최적화"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"제한됨"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"총 시간: 1분 미만"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"백그라운드: 1분 미만"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"기기 사용 시간: 1분 미만"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"1분 미만"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"총 시간: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"백그라운드: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"기기 사용 시간: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"데이터, 패스키, 비밀번호"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"자동, 완성, 자동 완성, 데이터, 패스키, 비밀번호"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>신뢰할 수 있는 앱인지 확인하세요</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g>에서는 자동 완성할 수 있는 항목을 결정하기 위해 화면의 내용을 사용합니다."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g>을(를) 사용하시겠습니까?</b> <br/> <br/> 지금부터 새로운 비밀번호, 패스키, 기타 정보가 여기에 저장됩니다. <xliff:g id=app_name example=Provider>%1$s</xliff:g>에서 자동 완성할 수 있는 항목을 파악하기 위해 화면에 표시된 내용을 사용할 수도 있습니다."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"비밀번호, 패스키, 데이터 서비스"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s을(를) 사용 중지하시겠습니까?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>이 서비스를 사용 중지하시겠습니까?</b> <br/> <br/> 로그인할 때 비밀번호, 패스키, 결제 수단 등의 저장된 정보가 채워지지 않습니다. 저장된 정보를 사용하려면 비밀번호, 패스키 또는 데이터 서비스를 선택하세요."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index bac20b6..d807b09 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> калды"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> кубаттоо"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Түзмөктү колдонуу убакыты"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Фондогу убакыт"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Батареянын кубаты төмөн"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Колдонмо фондо аткарылсын"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Фондогу аракеттери чектелсинби?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Колдонмонун фондогу аракеттери чектелсе, ал туура эмес иштеп калышы мүмкүн"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Бул колдонмодо батареянын үнөмдөлүшү жөндөлбөгөндүктөн, аны чектөөгө болбойт.\n\nКолдонмону чектөө үчүн, адегенде Батареяны үнөмдөө режимин күйгүзүңүз."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Батареянын колдонулушун тескөө"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Чектелбейт"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Оптималдаштырылган"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Чектелген"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Жалпысынан: бир мүнөткө жетпейт"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Фондо колдонулушу: бир мүнөткө жетпейт"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Канча убакыт колдонулду: бир мүнөткө жетпейт"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Бир мүнөттөн ашпайт"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Жалпысынан: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Фондо колдонулушу: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Канча убакыт колдонулду: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"маалымат, киргизүүчү ачкыч, сырсөз"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"авто, толтуруу, автотолтуруу, маалымат, киргизүүчү ачкыч, сырсөз"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Колдонмонун коопсуз экенин текшериңиз</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> экрандагы нерселерди талдап, автоматтык түрдө толтурула турган саптарды табат."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Колдонуу: <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Мындан кийин жаңы сырсөздөр, киргизүүчү ачкычтар жана башка маалымат бул жерде сакталат. <xliff:g id=app_name example=Provider>%1$s</xliff:g> экрандагы нерселерди колдонуп, автотолтурула турган талааларды аныктай алат."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Сырсөздөр, киргизүүчү ачкычтар жана маалымат кызматтары"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s өчүрүлсүнбү?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Бул кызматты өчүрөсүзбү?</b> <br/> <br/> Сырсөздөр, киргизүүчү ачкычтар, төлөм ыкмалары жана башка сакталган маалымат аккаунтка кирип жатканыңызда толтурулбайт. Сакталган маалыматыңызды колдонуу үчүн сырсөздү, киргизүүчү ачкычты же маалымат кызматын тандаңыз."</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index c0cf372..b72d4cf 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"ເຫຼືອອີກ <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ກ່ອນຈະເຕັມ"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"ເວລາໜ້າຈໍ"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"ເວລາທີ່ເຮັດວຽກຢູ່ພື້ນຫຼັງ"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"ແບັດເຕີຣີເຫຼືອໜ້ອຍ"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"ອະນຸຍາດໃຫ້ແອັບເຮັດວຽກໃນພື້ນຫຼັງໄດ້"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງບໍ?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ຫາກທ່ານຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງສຳລັບແອັບໃດໜຶ່ງ, ມັນຈະເຮັດວຽກຜິດປົກກະຕິ"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ເນື່ອງຈາກແອັບນີ້ຍັງບໍ່ໄດ້ປັບແຕ່ງໃຫ້ໃຊ້ແບັດເຕີຣີໄດ້ຢ່າງເໝາະສົມເທື່ອ, ທ່ານຈຶ່ງບໍ່ສາມາດຈຳກັດມັນໄດ້.\n\nເພື່ອຈຳກັດແອັບດັ່ງກ່າວ, ໃຫ້ເປີດການປັບແຕ່ງແບັດເຕີຣີໃຫ້ເໝາະສົມກ່ອນ."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"ຈັດການການໃຊ້ແບັດເຕີຣີ"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"ບໍ່ຈຳກັດ"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ປັບໃຫ້ເໝາະສົມ"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"ຈຳກັດ"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"ທັງໝົດ: ໜ້ອຍກວ່າໜຶ່ງນາທີ"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ພື້ນຫຼັງ: ໜ້ອຍກວ່າ 1 ນາທີ"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"ເວລາໜ້າຈໍ: ໜ້ອຍກວ່າ 1 ນາທີ"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"ໜ້ອຍກວ່າ 1 ນທ"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"ທັງໝົດ: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"ພື້ນຫຼັງ: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"ເວລາໜ້າຈໍ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"ຂໍ້ມູນ, ກະແຈຜ່ານ, ລະຫັດຜ່ານ"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"ອັດຕະໂນມັດ, ຕື່ມຂໍ້ມູນ, ການຕື່ມຂໍ້ມູນອັດຕະໂນມັດ, ຂໍ້ມູນ, ກະແຈຜ່ານ, ລະຫັດຜ່ານ"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>ໃຫ້ກວດສອບວ່າທ່ານເຊື່ອແອັບນີ້</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ຈະໃຊ້ສິ່ງທີ່ຢູ່ໃນໜ້າຈໍຂອງທ່ານເພື່ອກວດເບິ່ງວ່າຈະຕື່ມຂໍ້ມູນຫຍັງອັດຕະໂນມັດ."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> ລະຫັດຜ່ານໃໝ່, ກະແຈຜ່ານ ແລະ ຂໍ້ມູນອື່ນໆຈະຖືກບັນທຶກໄວ້ບ່ອນນີ້ນັບຈາກນີ້ເປັນຕົ້ນໄປ. <xliff:g id=app_name example=Provider>%1$s</xliff:g> ອາດໃຊ້ສິ່ງທີ່ຢູ່ໜ້າຈໍຂອງທ່ານເພື່ອເບິ່ງວ່າຈະຕື່ມຂໍ້ມູນອັດຕະໂນມັດໃດໄດ້ແດ່."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"ລະຫັດຜ່ານ, ກະແຈຜ່ານ ແລະ ບໍລິການຂໍ້ມູນ"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"ປິດ %1$s ບໍ?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>ປິດບໍລິການນີ້ບໍ?</b> <br/> <br/> ຂໍ້ມູນທີ່ບັນທຶກໄວ້ເຊັ່ນ: ລະຫັດຜ່ານ, ກະແຈຜ່ານ, ວິທີການຈ່າຍເງິນ ແລະ ຂໍ້ມູນອື່ນໆຈະບໍ່ຖືກຕື່ມໃສ່ເມື່ອທ່ານເຂົ້າສູ່ລະບົບ. ເພື່ອນຳໃຊ້ຂໍ້ມູນທີ່ບັນທຶກໄວ້, ໃຫ້ເລືອກລະຫັດຜ່ານ, ກະແຈຜ່ານ ຫຼື ບໍລິການຂໍ້ມູນ."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4453e32..ef88752 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Liko: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Liko įkrauti: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Įrenginio naudojimo laikas"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Laikas fone"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Senka akumuliatorius"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Leiskite vykdyti programą fone"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Apriboti veiklą fone?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jei apribosite programos veiklą fone, ji gali netinkamai veikti"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Negalite apriboti progr., nes ji nenust. optimiz. akum. naud.\n\nJei norite apr. progr., pirmiausia įj. akum. naud. optimiz."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Akumuliatoriaus energijos vartojimo valdymas"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Neapribota"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimizuota"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Apribota"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Iš viso: mažiau nei minutė"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Fonas: trumpiau nei minutė"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Įrenginio naudojimo laikas: mažiau nei minutė"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Mažiau nei minutė"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Iš viso: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Fonas: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Įrenginio naudojimo laikas: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"duomenys, „passkey“, slaptažodis"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatinis, užpildyti, automatinis pildymas, duomenys, prieigos raktas, slaptažodis"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Įsitikinkite, kad pasitikite šia programa</b> <br/> <br/> <xliff:g id=app_name example=„Google“ automatinis pildymas>%1$s</xliff:g> naudodamas informaciją ekrane nustato, ką gali užpildyti automatiškai."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Naudokite <xliff:g id=app_name example=„Provider“>%1$s</xliff:g>?</b> <br/> <br/> Nuo šiol čia išsaugomi nauji slaptažodžiai, prieigos raktai ir kita informacija. <xliff:g id=app_name example=„Provider“>%1$s</xliff:g> gali naudoti ekrane esančią informaciją, kad nustatytų, ką galima automatiškai užpildyti."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Slaptažodžiai, prieigos raktai ir duomenų paslaugos"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Išjungti „%1$s“?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Išjungti šį įrenginį?</b> <br/> <br/> Išsaugota informacija, pvz., slaptažodžiai, prieigos raktai, mokėjimo metodai ir kita informacija, nebus užpildyta prisijungiant. Jei norite naudoti išsaugotą informaciją, pasirinkite slaptažodį, prieigos raktą arba duomenų paslaugą."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 590e2e3..6ba8749 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -273,8 +273,7 @@
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Notiek ielāde…"</string>
<string name="location_settings_footer_general" msgid="1040507068701188821">"Lietotnes, kurām ir atļauja noteikt tuvumā esošās ierīces, var noteikt pievienoto ierīču relatīvo pozīciju."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Lietotnēm un pakalpojumiem nav atļaujas piekļūt atrašanās vietai. Jūsu ierīces atrašanās vietas datus joprojām var nosūtīt ārkārtas dienestiem, ja zvanīsiet vai sūtīsiet īsziņu uz ārkārtas numuru."</string>
- <!-- no translation found for location_settings_footer_learn_more_content_description (349380666660145540) -->
- <skip />
+ <string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Uzzināt vairāk par atrašanās vietas iestatījumiem"</string>
<string name="account_settings_title" msgid="9138880127246241885">"Konti"</string>
<string name="security_settings_title" msgid="6710768415432791970">"Drošība"</string>
<string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Šifrēšana un akreditācijas dati"</string>
@@ -2245,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> — <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Vēl <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Atlikušais uzlādes laiks: <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Izmantošanas ilgums"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Lietošanas fonā ilgums"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Zems akumulatora uzlādes līmenis"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Atļaut lietotnei darboties fonā"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vai ierobežot darbību fonā?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ierobežojot lietotnes darbību fonā, var rasties šīs lietotnes darbības traucējumi."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Lietotnei nav iestatīta akumulatora optimizācija, tāpēc to nevar ierobežot.\n\nVispirms iestatiet akumulatora optimizāciju."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Akumulatora lietojuma pārvaldība"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Neierobežots"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimizēts"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Ierobežoti"</string>
@@ -2397,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Kopā: mazāk par minūti"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Fonā: mazāk par minūti"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Izmantošanas ilgums: mazāk par minūti"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Mazāk nekā minūti"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Kopā: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Fonā: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Izmantošanas ilgums: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4180,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"dati, piekļuves atslēga, parole"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automātiskā aizpilde, automātiski aizpildīt, dati, piekļuves atslēga, parole"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Pārliecinieties, ka šī lietotne ir uzticama</b> <br/> <br/> <xliff:g id=app_name example=Google automātiskā aizpilde>%1$s</xliff:g> izmanto ekrānā redzamo, lai noteiktu, kādu informāciju aizpildīt automātiski."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Izmantojiet lietotni <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Turpmāk jaunās paroles, piekļuves atslēgas un cita informācija tiks saglabāta šeit. Lietotne <xliff:g id=app_name example=Provider>%1$s</xliff:g> var izmantot ekrānā redzamo saturu, lai noteiktu, kādu informāciju var aizpildīt automātiski."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Paroles, piekļuves atslēgas un datu pakalpojumi"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Vai izslēgt pakalpojumu %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Vai izslēgt šo pakalpojumu?</b> <br/> <br/> Pierakstoties netiks aizpildīta saglabātā informācija, piemēram, paroles, piekļuves atslēgas, maksājumu veidi un cita informācija. Lai izmantotu saglabāto informāciju, izvēlieties paroli, piekļuves atslēgu vai datu pakalpojumu."</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 4b1f11b..d3abef4 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Преостануваат <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> до полнење"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Време на користење"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Време во заднина"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Слаба батерија"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Дозволете апликацијата да работи во заднина"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Да се ограничи активноста во заднина?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Апликацијата може да се однесува необично ако ја ограничите нејзината активност во заднина"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Апликацијава не е оптимизирана и не може да се ограничи.\n\nЗа да ја ограничите, прво вклучете оптимизација на батеријата."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Управувајте со користењето на батеријата"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Неограничено"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Оптимизирано"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Ограничено"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Вкупно: помалку од една минута"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Во заднина: помалку од минута"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Време на користење: помалку од минута"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Помалку од една минута"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Вкупно: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Во заднина: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Време на користење: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"мобилен интернет, криптографски клуч, лозинка"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"автоматски, пополнување, автоматско пополнување, податоци, криптографски клуч, лозинка"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Проверете дали е ова апликација на која ѝ верувате</b> <br/> <br/> <xliff:g id=app_name example=„Автоматско пополнување на Google“>%1$s</xliff:g> го користи она што е на екранот за да утврди што може автоматски да се пополни."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Новите лозинки, криптографски клучеви и други податоци отсега ќе се зачувуваат овде. <xliff:g id=app_name example=Provider>%1$s</xliff:g> може да го користи она што е на екранот за да утврди што може автоматски да се пополни."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Услуги за лозинки, криптографски клучеви и податоци"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Да се исклучи %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Да се исклучи оваа услуга?</b> <br/> <br/> Зачуваните податоци како лозинки, криптографски клучеви, начини на плаќање и други податоци нема да се пополнуваат кога ќе се најавувате. За да ги користите зачуваните податоци, изберете услуга за лозинки, криптографски клучеви или податоци."</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 875c417..d20782a 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> ശേഷിക്കുന്നു"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"ചാർജ്ജാകാനുള്ള സമയം <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"സ്ക്രീൻ സമയം"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"പശ്ചാത്തല സമയം"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"ബാറ്ററി ചാർജ് കുറവാണ്"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"പശ്ചാത്തലത്തിൽ റൺ ചെയ്യുന്നതിന് ആപ്പിനെ അനുവദിക്കുക"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"പശ്ചാത്തല പ്രവർത്തനം പരിമിതപ്പെടുത്തണോ?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"നിങ്ങൾ ഒരു ആപ്പിനായി പശ്ചാത്തല പ്രവർത്തനം പരിമിതപ്പെടുത്തുകയാണെങ്കിൽ, അത് ശരിയായി പ്രവർത്തിക്കാനിടയില്ല."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ബാറ്ററി ഓപ്റ്റിമൈസ് ചെയ്യാൻ ഈ ആപ്പ് സജ്ജീകരിക്കാത്തതിനാൽ, നിങ്ങൾക്ക് ഇത് നിയന്ത്രിക്കാനാവില്ല.\n\nആപ്പ് നിയന്ത്രിക്കാൻ, ആദ്യം ബാറ്ററി ഓപ്റ്റിമൈസേഷൻ ഓണാക്കുക."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"ബാറ്ററി ഉപയോഗം മാനേജ് ചെയ്യുക"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"നിയന്ത്രണമില്ലാത്തത്"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ഒപ്റ്റിമൈസ് ചെയ്തത്"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"നിയന്ത്രിതം"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"ആകെ: ഒരു മിനിറ്റിൽ താഴെ"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"പശ്ചാത്തലം: ഒരു മിനിറ്റിൽ താഴെ"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"സ്ക്രീൻ സമയം: ഒരു മിനിറ്റിൽ താഴെ"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"ഒരു മിനിറ്റിൽ താഴെ"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"ആകെ: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"പശ്ചാത്തലം: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"സ്ക്രീൻ സമയം: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"ഡാറ്റ, പാസ്കീ, പാസ്വേഡ്"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"സ്വയമേവ, പൂരിപ്പിക്കുക, സ്വയമേവ പൂരിപ്പിക്കൽ, ഡാറ്റ, പാസ്കീ, പാസ്വേഡ്"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>ഈ ആപ്പിനെ നിങ്ങൾ വിശ്വസിക്കുന്നുണ്ടെന്ന് ഉറപ്പുവരുത്തുക</b> <br/> <br/> സ്വയമേവ പൂരിപ്പിക്കേണ്ടത് എന്താണെന്ന് നിർണ്ണയിക്കുന്നതിന് <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> നിങ്ങളുടെ സ്ക്രീനിൽ ഉള്ളത് ഉപയോഗിക്കുന്നു."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> പുതിയ പാസ്വേഡുകളും പാസ്കീകളും മറ്റ് വിവരങ്ങളും ഇനിമുതൽ ഇവിടെ സംരക്ഷിക്കും. എന്താണ് സ്വയമേവ പൂരിപ്പിക്കേണ്ടതെന്ന് നിർണ്ണയിക്കാൻ <xliff:g id=app_name example=Provider>%1$s</xliff:g> നിങ്ങളുടെ സ്ക്രീനിലുള്ളത് ഉപയോഗിക്കുന്നു."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"പാസ്വേഡുകൾ, പാസ്കീകൾ, ഡാറ്റാ സേവനങ്ങൾ എന്നിവ"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s ഓഫാക്കണോ?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>ഈ സേവനം ഓഫാക്കണോ?</b> <br/> <br/> സൈൻ ഇൻ ചെയ്യുമ്പോൾ പാസ്വേഡുകൾ, പാസ്കീകൾ, പേയ്മെന്റ് രീതികൾ എന്നിവ പോലുള്ള സംരക്ഷിച്ച വിവരങ്ങൾ പൂരിപ്പിക്കില്ല. നിങ്ങളുടെ സംരക്ഷിച്ച വിവരങ്ങൾ ഉപയോഗിക്കാൻ, ഒരു പാസ്വേഡോ പാസ്കീയോ ഡാറ്റാ സേവനമോ തിരഞ്ഞെടുക്കുക."</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index e8671e4..0f9315a 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> үлдсэн"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> цэнэглэх хүртэл"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Дэлгэцийн цаг"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Дэвсгэрийн цаг"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Батарей бага байна"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Аппад цаана ажиллах зөвшөөрөл олгоно уу"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Арын үйл ажиллагааг хязгаарлах уу?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Та арын үйл ажиллагааг аппад хязгаарласан тохиолдолд апп буруу ажиллаж болзошгүй"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Энэ аппыг батарейг оновчлохоор тохируулаагүй тул та үүнийг хязгаарлах боломжгүй.\n\nАппыг хязгаарлахын тулд эхлээд батарейны оновчлолыг асаана уу."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Батарей ашиглалтыг удирдах"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Хязгаарлаагүй"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Оновчилсон"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Хязгаарласан"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Нийт: нэг минутаас доош"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Дэвсгэр: нэг минутаас доош"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Дэлгэцийн цаг: минутаас бага"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Минутаас бага"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Нийт: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Дэвсгэр: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Дэлгэцийн цаг: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"өгөгдөл, passkey, нууц үг"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"автомат, бөглөх, автоматаар бөглөх хэсэг, өгөгдөл, нэвтрэх түлхүүр, нууц үг"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Энэ апп-д итгэдэг эсэхээ шалгана уу</b> <br/> <br/> <xliff:g id=app_name example=Google автоматаар бөглөх>%1$s</xliff:g> таны дэлгэцэд автоматаар бөглөх зүйлийг илрүүлэхийн тулд ашигладаг."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b> <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b>-г ашиглах <br/> <br/> Шинэ нууц үг, нэвтрэх түлхүүр болон бусад мэдээллийг одооноос эхлэн энд хадгална. <xliff:g id=app_name example=Provider>%1$s</xliff:g> юуг автоматаар бөглөж болохыг тодорхойлохын тулд таны дэлгэцэд байгаа зүйлсийг ашиглаж магадгүй."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Нууц үг, нэвтрэх түлхүүр болон өгөгдлийн үйлчилгээнүүд"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s-г унтраах уу?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Энэ үйлчилгээг унтраах уу?</b> <br/> <br/> Нууц үг, нэвтрэх түлхүүр, төлбөрийн хэрэгсэл болон бусад хадгалсан мэдээллийг таныг нэвтрэх үед бөглөхгүй. Хадгалсан мэдээллээ ашиглахын тулд нууц үг, нэвтрэх түлхүүр эсвэл өгөгдлийн үйлчилгээ сонгоно уу."</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index e2c14c5..89beee1 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> शिल्लक"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"चार्ज करण्यासाठी <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"स्क्रीनचा वेळ"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"बॅकग्राउंडचा वेळ"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"बॅटरी कमी आहे"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"अॅपला पार्श्वभूमीत चालण्याची अनुमती द्या"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"बॅकग्राउंड ॲक्टिव्हिटी मर्यादित ठेवायची?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"तुम्ही एखाद्या ॲपसाठी बॅकग्राउंड ॲक्टिव्हिटी मर्यादित ठेवल्यास, ते व्यवस्थित न चालण्याची शक्यता आहे"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"हे अॅप बॅटरी ऑप्टिमाइझ करण्यासाठी सेट केलेले नसल्याने, तुम्ही ते प्रतिबंधित करू शकत नाही.\n\nअॅप प्रतिबंधित करण्यासाठी, प्रथम बॅटरी ऑप्टिमायझेशन सुरू करा"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"बॅटरीचा वापर व्यवस्थापित करा"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"कोणताही प्रतिबंध नाही"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ऑप्टिमाइझ केली"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"प्रतिबंधित"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"एकूण: एका मिनिटापेक्षा कमी"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"बॅकग्राउंड: एका मिनिटापेक्षा कमी"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"स्क्रीन वेळ: कमाल एक मिनिट"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"एका मिनिटापेक्षा कमी"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"एकूण: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"बॅकग्राउंड: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"स्क्रीन वेळ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"डेटा, पासकी, पासवर्ड"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"ऑटो, भरा, ऑटोफिल, डेटा, पासकी, पासवर्ड"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>तुमचा या ॲपवर विश्वास असल्याची खात्री करा</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ऑटोफिल काय होऊ शकते हे ठरवण्यासाठी तुमच्या स्क्रीनवर काय आहे याचा वापर करते."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g>वापरायचे आहे का?</b> <br/> <br/> नवीन पासवर्ड, पासकी आणि इतर माहिती आता येथे सेव्ह केली जाईल. काय ऑटोफिल केले जाऊ शकते हे निर्धारित करण्यासाठी <xliff:g id=app_name example=Provider>%1$s</xliff:g> हे तुमच्या स्क्रीनवर असलेल्या गोष्टी वापरू शकते."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"पासवर्ड, पासकी आणि डेटा सेवा"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s बंद करायचे का?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>ही सेवा बंद करायची आहे का?</b> <br/> <br/> पासवर्ड, पासकी, पेमेंट पद्धती आणि इतर माहिती यांसारखी सेव्ह केलेली माहिती तुम्ही साइन इन करता, तेव्हा भरली जाणार नाही. तुमची सेव्ह केलेली माहिती वापरण्यासाठी, पासवर्ड, पासकी किंवा डेटा सेवा निवडा."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index e7b2c6f..21f2c6f 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> yang tinggal"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> untuk mengecas"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Masa skrin"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Masa latar"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Bateri lemah"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Benarkan apl berjalan di latar belakang"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Hadkan aktiviti latar belakang?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jika anda mengehadkan aktiviti latar belakang untuk apl, fungsi apl itu mungkin terganggu"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Apl ini tidak boleh dihadkan kerana tidak ditetapkan untuk mengoptimumkan bateri.\n\nHidupkan pengoptimuman bateri dahulu."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Urus penggunaan bateri"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Tiada sekatan"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Dioptimumkan"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Terhad"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Jumlah: kurang dari seminit"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Latar: kurang daripada seminit"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Masa skrin: kurang daripada seminit"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Kurang daripada seminit"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Jumlah: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Latar: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Masa skrin: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, kunci laluan, kata laluan"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatik, isi, autolengkap, data, kunci laluan, kata laluan"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Pastikan anda mempercayai apl ini</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> menggunakan item yang terdapat pada skrin anda untuk menentukan perkara yang boleh dilengkapkan secara automatik."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Kata laluan baharu, kunci laluan dan maklumat lain akan disimpan di sini mulai sekarang. <xliff:g id=app_name example=Provider>%1$s</xliff:g> mungkin menggunakan maklumat pada skrin anda untuk menentukan pengisian data automatik."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Kata laluan, kunci laluan dan perkhidmatan data"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Matikan %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Matikan perkhidmatan ini?</b> <br/> <br/> Maklumat yang disimpan seperti kata laluan, kunci laluan, kaedah pembayaran dan maklumat lain tidak akan diisikan apabila anda log masuk. Untuk menggunakan maklumat anda yang disimpan, pilih kata laluan, kunci laluan atau perkhidmatan data."</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index da1a902..2343353 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> ကျန်ရှိနေ"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> အားသွင်းမည်"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"အသုံးပြုချိန်"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"နောက်ခံအချိန်"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"ဘက်ထရီ အားနည်းနေသည်"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"အက်ပ်ကို နောက်ခံတွင် ဖွင့်ခွင့်ပြုပါ"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"နောက်ခံလုပ်ဆောင်ချက်ကို ကန့်သတ်လိုပါသလား။"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"အက်ပ်အတွက် နောက်ခံလုပ်ဆောင်ချက်ကို ကန့်သတ်လိုက်ပါက ပုံမှန်အလုပ်လုပ်မည် မဟုတ်ပါ"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ဤအက်ပ်ကို ဘက်ထရီချိန်ညှိသုံးရန် သတ်မှတ်မထားသဖြင့် ကန့်သတ်၍မရပါ။\n\nအက်ပ်ကိုကန့်သတ်ရန် ဘက်ထရီချိန်ညှိသုံးခြင်း အရင်ဖွင့်ပါ။"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"ဘက်ထရီ အသုံးပြုမှုကို စီမံရန်"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"အကန့်အသတ်မဲ့"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ပိုကောင်းအောင်လုပ်ရန်"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"ကန့်သတ်ရန်"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"စုစုပေါင်း- တစ်မိနစ်အောက်"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"နောက်ခံအချိန်- တစ်မိနစ်ထက် နည်းသည်"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"အသုံးပြုချိန်- တစ်မိနစ်အောက်"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"တစ်မိနစ်အောက်"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"စုစုပေါင်း- <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"နောက်ခံအချိန်- <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"အသုံးပြုချိန်- <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"ဒေတာ၊ လျှို့ဝှက်ကီး၊ စကားဝှက်"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"အလိုအလျောက်၊ ဖြည့်ခြင်း၊ အလိုအလျောက်ဖြည့်ခြင်း၊ ဒေတာ၊ လျှို့ဝှက်ကီး၊ စကားဝှက်"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>သင်သည် ဤအက်ပ်ကို ယုံကြည်စိတ်ချရကြောင်း သေချာပါစေ</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> သည် သင်၏ဖန်သားပြင်ပေါ်ရှိ အရာများကို အသုံးပြု၍ မည်သည့်အရာများကို အော်တိုဖြည့်နိုင်ကြောင်း ဆုံးဖြတ်သည်။"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g> သုံးမလား။</b> <br/> <br/> ယခုမှစ၍ စကားဝှက်၊ လျှို့ဝှက်ကီးနှင့် အခြားအချက်အလက် အသစ်များကို ဤနေရာတွင် သိမ်းပါမည်။ <xliff:g id=app_name example=Provider>%1$s</xliff:g> က အော်တိုဖြည့်နိုင်သည်များအား ဆုံးဖြတ်ရန် သင့်ဖန်သားပြင်ပေါ်တွင် ရှိသည်များကို သုံးနိုင်သည်။"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"စကားဝှက်၊ လျှို့ဝှက်ကီးနှင့် ဒေတာဝန်ဆောင်မှုများ"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s ကို ပိတ်မလား။"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>ဤဝန်ဆောင်မှုကို ပိတ်မလား။</b> <br/> <br/> လက်မှတ်ထိုးဝင်သောအခါ စကားဝှက်၊ လျှို့ဝှက်ကီးများ၊ ငွေပေးချေနည်းလမ်းနှင့် အခြားအချက်အလက်ကဲ့သို့ သိမ်းထားသောအချက်အလက်များကို ဖြည့်မည်မဟုတ်ပါ။ သိမ်းထားသောအချက်အလက် သုံးရန် စကားဝှက်၊ လျှို့ဝှက်ကီး (သို့) ဒေတာဝန်ဆောင်မှု ရွေးပါ။"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a03a29b..e64920c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> gjenstår"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Batteriet er fulladet om <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Tid på skjermen"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Tid i bakgrunnen"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Lavt batteri"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"La appen kjøre i bakgrunnen"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vil du begrense bakgrunnsaktivitet?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Hvis du begrenser bakgrunnsaktivitet for en app, kan det oppstå problemer"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Du kan ikke begrense appen siden den ikke er satt til å optimalisere batteriet.\n\nFor å begrense appen, slå på batterioptimalisering."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Administrer batteribruk"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Ubegrenset"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimalisert"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Begrenset"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Totalt: mindre enn ett minutt"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Bakgrunn: mindre enn ett minutt"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Skjermtid: mindre enn ett minutt"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Under ett minutt"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Totalt: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Bakgrunn: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Skjermtid: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, tilgangsnøkkel, passord"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"auto, fyll, autofyll, data, passnøkkel, passord"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Stoler du på denne appen?</b> <br/> <br/> <xliff:g id=app_name example=Google autofyll>%1$s</xliff:g> bruker det som er på skjermen, til å fastslå hva som kan fylles ut automatisk."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Vil du bruke <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Fra nå av blir nye passord, nye passnøkler og annen informasjon lagret her. <xliff:g id=app_name example=Provider>%1$s</xliff:g> kan bruke det som er på skjermen, for å avgjøre hva som kan fylles ut automatisk."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Passord, passnøkler og datatjenester"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Vil du slå av %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Vil du slå av denne tjenesten?</b> <br/> <br/> Lagret informasjon som passord, passnøkler, betalingsmåter og andre ting fylles ikke ut når du logger på. For å bruke informasjonen du har lagret, velg et passord, en passnøkkel eller en datatjeneste."</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 0f49913..28207e9 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> बाँकी"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> चार्जमा"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"स्क्रिन टाइम"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"ब्याकग्राउन्ड टाइम"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"ब्याट्री कम छ"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"एपलाई पृष्ठभूमिमा चल्न अनुमति दिनुहोस्"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"पृष्ठभूमिको गतिविधिलाई सीमित गर्ने हो?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"तपाईंले कुनै एपको पृष्ठभूमिको गतिविधिलाई सीमित गर्नुभयो भने यसले सही तरिकाले काम नगर्न सक्छ"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"यो एपलाई ब्याट्री अप्टिमाइज गर्न भनी सेट नगरिएको हुनाले तपाईं यसमा बन्देज लगाउन सक्नुहुन्न।\n\nएपमा बन्देज लगाउन पहिले ब्याट्री अप्टिमाइजेसन सुविधा अन गर्नुहोस्।"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"ब्याट्रीको खपत व्यवस्थापन गर्नुहोस्"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"असीमित"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"अप्टिमाइज गरिएको"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"प्रतिबन्धित"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"कुल समय: एक मिनेटभन्दा कम"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ब्याकग्राउन्डमा चलाइएको समय: एक मिनेटभन्दा कम"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"स्क्रिन टाइम: एक मिनेटभन्दा कम"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"एक मिनेटभन्दा कम समय"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"कुल समय: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"ब्याकग्राउन्डमा चलाइएको समय: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"स्क्रिन टाइम: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"डेटा, पासकी, पासवर्ड"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"अटो, फिल, अटोफिल, डेटा, पासकी, पासवर्ड"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>तपाईं यो एपमाथि भरोसा गर्नुहुन्छ भन्ने कुरा पक्का गर्नुहोस्</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> यस एपले अटोफिल गर्न सकिने कुराहरूको निर्धारण गर्न तपाईंको स्क्रिनमा भएका वस्तुहरूको प्रयोग गर्छ।"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g> प्रयोग गर्ने हो?</b> <br/> <br/> अबदेखि नयाँ पासवर्ड, पासकी तथा अन्य जानकारी यहाँ सेभ गरिने छन्। <xliff:g id=app_name example=Provider>%1$s</xliff:g> ले के-कस्ता जानकारी अटोफिल गर्न सकिन्छ भन्ने कुरा निर्धारण गर्न तपाईंको स्क्रिनमा भएका कुराहरू प्रयोग गर्न सक्छ।"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"पासवर्ड, पासकी र डेटासम्बन्धी सेवा"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s अफ गर्ने हो?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>यो सेवा अफ गर्ने हो?</b> <br/> <br/> तपाईंले साइन इन गर्दा सेभ गरिएका पासवर्ड, पासकी, भुक्तानी विधिलगायतका अन्य जानकारी अटोफिल हुने छैनन्। सेभ गरिएका जानकारी प्रयोग गर्न पासवर्ड, पासकी वा डेटा छनौट गर्नुहोस्।"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 240b22c..ab00814 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> tot batterij leeg is"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> tot batterij is opgeladen"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Schermtijd"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Achtergrondtijd"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Batterij bijna leeg"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Toestaan dat de app wordt uitgevoerd op de achtergrond"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Achtergrondactiviteit beperken?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Als je de achtergrondactiviteit voor een app beperkt, functioneert de app mogelijk niet meer correct"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Batterijoptimalisatie is niet ingesteld voor deze app. Je kunt de app dus niet beperken.\n\nZet eerst batterijoptimalisatie aan als je de app wilt beperken."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Batterijgebruik beheren"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Onbeperkt"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Geoptimaliseerd"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Beperkt"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Totaal: minder dan een minuut"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Achtergrond: minder dan een minuut"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Schermtijd: minder dan een minuut"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Minder dan een minuut"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Totaal: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Achtergrond: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Schermtijd: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"gegevens, toegangssleutel, wachtwoord"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatisch, invullen, automatisch invullen, gegevens, toegangssleutel, wachtwoord"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Zorg dat je deze app vertrouwt</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> maakt gebruik van de content op je scherm om te bepalen wat automatisch kan worden aangevuld."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g> gebruiken?</b> <br/> <br/> Nieuwe wachtwoorden, toegangssleutels en andere informatie worden vanaf nu hier opgeslagen. <xliff:g id=app_name example=Provider>%1$s</xliff:g> kan wat er op je scherm staat gebruiken om te bepalen wat automatisch kan worden ingevuld."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Wachtwoorden, toegangssleutels en gegevensservices"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s uitzetten?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Deze service uitzetten?</b> <br/> <br/> Opgeslagen informatie zoals wachtwoorden, toegangssleutels, betaalmethoden en andere informatie wordt niet automatisch ingevuld als je inlogt. Kies een wachtwoord, toegangssleutel of gegevensservice om je opgeslagen informatie te gebruiken."</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index a5578b1..3a468dd 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> ଅବଶିଷ୍ଟ ଅଛି"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"ଚାର୍ଜ କରିବା ପାଇଁ <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> ଲାଗିବ"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"ସ୍କ୍ରିନ ସମୟ"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"ପୃଷ୍ଠପଟ ସମୟ"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"ବ୍ୟାଟେରୀ ସ୍ତର କମ୍ ଅଛି"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"ଆପ୍ଟିକୁ ବ୍ୟାକ୍ଗ୍ରାଉଣ୍ଡରେ ଚାଲିବାକୁ ଦିଅନ୍ତୁ"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ବ୍ୟାକ୍ଗ୍ରାଉଣ୍ଡ କାର୍ଯ୍ୟକଳାପ ସୀମିତ କରିବେ?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ଯଦି ଆପଣ ଗୋଟିଏ ଆପ୍ର ବ୍ୟାକ୍ଗ୍ରାଉଣ୍ଡ କାର୍ଯ୍ୟକଳାପକୁ ସୀମିତ କରିବେ, ଏହା ଠିକ୍ ଭାବରେ କାମ କରିନପାରେ"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ବ୍ୟାଟେରୀକୁ ଅପ୍ଟିମାଇଜ୍ କରିବା ପାଇଁ ଯେହେତୁ ଏହି ଆପ୍କୁ ସେଟ୍ କରାଯାଇନାହିଁ, ତେଣୁ ଆପଣ ଏହାକୁ ସୀମାବଦ୍ଧ କରିପାରିବେ ନାହିଁ। \n\nଆପ୍କୁ ସୀମାବଦ୍ଧ କରିବା ପାଇଁ ପ୍ରଥମେ ବ୍ୟାଟେରୀ ଅପ୍ଟିମାଇଜେସନ୍କୁ ଚାଲୁ କରନ୍ତୁ।"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"ବ୍ୟାଟେରୀ ବ୍ୟବହାର ପରିଚାଳନା କରନ୍ତୁ"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"ଅପ୍ରତିବନ୍ଧିତ"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ଅପ୍ଟିମାଇଜ କରାଯାଇଛି"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"ପ୍ରତିବନ୍ଧିତ"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"ମୋଟ: ଏକ ମିନିଟରୁ କମ୍"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ପୃଷ୍ଠପଟ: ଏକ ମିନିଟରୁ କମ"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"ସ୍କ୍ରିନ ସମୟ: ଏକ ମିନିଟରୁ କମ"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"ଏକ ମିନିଟରୁ କମ"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"ମୋଟ: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"ପୃଷ୍ଠପଟ: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"ସ୍କ୍ରିନ ସମୟ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"ଡାଟା, ପାସକୀ, ପାସୱାର୍ଡ"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"ସ୍ୱତଃ, ପୂରଣ, ଅଟୋଫିଲ, ଡାଟା, ପାସକୀ, ପାସୱାର୍ଡ"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>ଆପଣ ଏହି ଆପ୍କୁ ବିଶ୍ୱାସ କରୁଥିବା ନିଶ୍ଚିତ କରନ୍ତୁ</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> କ\'ଣ ଅଟୋଫିଲ୍ କରାଯାଇପାରିବ ନିର୍ଦ୍ଧାରଣ କରିବା ପାଇଁ, Google Autofill ଆପଣଙ୍କ ସ୍କ୍ରୀନ୍ରେ ଯାହା ଥାଏ, ତାହା ବ୍ୟବହାର କରେ।"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> ବର୍ତ୍ତମାନଠାରୁ ନୂଆ ପାସୱାର୍ଡ, ପାସକୀ ଏବଂ ଅନ୍ୟ ସୂଚନା ଏଠାରେ ସେଭ ହେବ। କଣ ଅଟୋଫିଲ କରାଯାଇପାରିବ ତାହା ସ୍ଥିର କରିବାକୁ <xliff:g id=app_name example=Provider>%1$s</xliff:g> ଆପଣଙ୍କ ସ୍କ୍ରିନରେ ଯାହା ଥାଏ ତାକୁ ବ୍ୟବହାର କରିପାରେ।"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"ପାସୱାର୍ଡ, ପାସକୀ ଏବଂ ଡାଟା ସେବାଗୁଡ଼ିକ"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s ବନ୍ଦ କରିବେ?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>ଏହି ସେବାକୁ ବନ୍ଦ କରିବେ?</b> <br/> <br/> ଆପଣ ସାଇନ ଇନ କରିବା ସମୟରେ ପାସୱାର୍ଡ, ପାସକୀ, ପେମେଣ୍ଟ ପଦ୍ଧତି ପରି ସେଭ କରାଯାଇଥିବା ସୂଚନା ଏବଂ ଅନ୍ୟ ସୂଚନା ପୂରଣ ହେବ ନାହିଁ। ଆପଣଙ୍କ ସେଭ କରାଯାଇଥିବା ସୂଚନା ବ୍ୟବହାର କରିବାକୁ ଏକ ପାସୱାର୍ଡ, ପାସକୀ କିମ୍ବା ଡାଟା ସେବା ବାଛନ୍ତୁ।"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 75170fc..0062abf 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> ਬਾਕੀ"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"ਚਾਰਜ ਕਰਨ ਲਈ <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"ਸਕ੍ਰੀਨ ਸਮਾਂ"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"ਬੈਕਗ੍ਰਾਊਂਡ ਸਮਾਂ"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"ਬੈਟਰੀ ਘੱਟ ਹੈ"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"ਐਪ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ਕੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਸੀਮਿਤ ਕਰਨੀ ਹੈ?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਦੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਨੂੰ ਸੀਮਿਤ ਕਰਦੇ ਹੋ, ਤਾਂ ਉਹ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਸਕਦੀ ਹੈ"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ਇਹ ਐਪ ਬੈਟਰੀ ਨੂੰ ਸੁਯੋਗ ਕਰੋ \'ਤੇ ਸੈੱਟ ਨਾ ਕੀਤੀ ਹੋਣ ਕਰਕੇ, ਤੁਸੀਂ ਇਸ \'ਤੇ ਪਾਬੰਧੀ ਨਹੀਂ ਲਗਾ ਸਕਦੇ।\n\nਐਪ \'ਤੇ ਪਾਬੰਧੀ ਲਗਾਉਣ ਲਈ, ਪਹਿਲਾਂ ਬੈਟਰੀ ਸੁਯੋਗਕਰਨ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"ਬੈਟਰੀ ਵਰਤੋਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"ਅਣ-ਪ੍ਰਤਿਬੰਧਿਤ"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ਸੁਯੋਗ ਬਣਾਈ ਗਈ"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"ਪ੍ਰਤਿਬੰਧਿਤ"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"ਕੁੱਲ: ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ ਸਮਾਂ"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"ਬੈਕਗ੍ਰਾਊਂਡ: ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ ਸਮਾਂ"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"ਸਕ੍ਰੀਨ ਸਮਾਂ: ਇੱਕ ਮਿੰਟ ਤੋਂ ਵੀ ਘੱਟ"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"ਇੱਕ ਮਿੰਟ ਤੋਂ ਘੱਟ"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"ਕੁੱਲ: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"ਬੈਕਗ੍ਰਾਊਂਡ: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"ਸਕ੍ਰੀਨ ਸਮਾਂ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"ਡਾਟਾ, ਪਾਸਕੀ, ਪਾਸਵਰਡ"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"ਆਟੋ, ਫਿਲ, ਆਟੋਫਿਲ, ਡਾਟਾ, ਪਾਸਕੀ, ਪਾਸਵਰਡ"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਇਸ ਐਪ \'ਤੇ ਭਰੋਸਾ ਕਰਦੇ ਹੋ</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ਆਪਣੇ-ਆਪ ਭਰੀਆਂ ਜਾ ਸਕਣ ਵਾਲੀਆਂ ਚੀਜ਼ਾਂ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਮੌਜੂਦ ਚੀਜ਼ਾਂ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੈ।"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> ਹੁਣ ਤੋਂ ਨਵੇਂ ਪਾਸਵਰਡ, ਪਾਸਕੀਆਂ ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਨੂੰ ਇੱਥੇ ਰੱਖਿਅਤ ਕੀਤਾ ਜਾਵੇਗਾ। <xliff:g id=app_name example=Provider>%1$s</xliff:g> ਵੱਲੋਂ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖ ਰਹੀ ਸਮੱਗਰੀ ਦੇ ਆਧਾਰ \'ਤੇ ਇਹ ਨਿਰਧਾਰਿਤ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਕਿ ਕਿਹੜੀ ਜਾਣਕਾਰੀ ਆਟੋਫਿਲ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"ਪਾਸਵਰਡ, ਪਾਸਕੀਆਂ ਅਤੇ ਡਾਟਾ ਸੇਵਾਵਾਂ"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"ਕੀ %1$s ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>ਕੀ ਇਸ ਸੇਵਾ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?</b> <br/> <br/> ਤੁਹਾਡੇ ਵੱਲੋਂ ਸਾਈਨ-ਇਨ ਕਰਨ ਵੇਲੇ ਰੱਖਿਅਤ ਕੀਤੀ ਗਈ ਜਾਣਕਾਰੀ ਜਿਵੇਂ ਕਿ ਪਾਸਵਰਡਾਂ, ਪਾਸਕੀਆਂ, ਭੁਗਤਾਨ ਵਿਧੀਆਂ ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਨੂੰ ਭਰਿਆ ਨਹੀਂ ਜਾਵੇਗਾ। ਆਪਣੀ ਰੱਖਿਅਤ ਕੀਤੀ ਜਾਣਕਾਰੀ ਵਰਤਣ ਲਈ ਕੋਈ ਪਾਸਵਰਡ, ਪਾਸਕੀ ਜਾਂ ਡਾਟਾ ਸੇਵਾ ਚੁਣੋ।"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f798f9b..cd88791 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Pozostało: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do naładowania"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Czas korzystania z urządzenia"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Czas działania w tle"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Słaba bateria"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Pozwól aplikacji działać w tle"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Ograniczyć aktywność w tle?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jeśli ograniczysz aktywność aplikacji w tle, może ona działać nieprawidłowo"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Ta aplikacja nie jest skonfigurowana do optymalnego wykorzystywania baterii, więc nie możesz wprowadzić dla niej ograniczeń.\n\nAby wprowadzić ograniczenia dla aplikacji, najpierw włącz optymalizację baterii."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Zarządzaj wykorzystaniem baterii"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Bez ograniczeń"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Z optymalizacją"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Z ograniczeniami"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Łącznie: mniej niż minuta"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"W tle: mniej niż minuta"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Czas korzystania z urządzenia: mniej niż minuta"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Mniej niż minuta"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Łącznie: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"W tle: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Czas korzystania z urządzenia: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"dane, klucze, hasła"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatyczne, uzupełnianie, autouzupełnianie, dane, klucz dostępu, hasło"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Sprawdź, czy ta aplikacja jest zaufana</b> <br/> <br/> <xliff:g id=app_name example=Autouzupełnianie Google>%1$s</xliff:g> na podstawie zawartości ekranu określa, co można uzupełnić automatycznie."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Używać aplikacji <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Od tej pory w tym miejscu będą zachowywane nowe hasła, klucze i inne informacje. Aplikacja <xliff:g id=app_name example=Provider>%1$s</xliff:g> używa treści wyświetlanych na ekranie do określania, co można uzupełnić automatycznie."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Usługi haseł, kluczy i danych"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Wyłączyć usługę %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Wyłączyć tę usługę?</b> <br/> <br/> Zapisane informacje, takie jak hasła, klucze dostępu, formy płatności i inne dane, nie będą wypełniane, gdy się zalogujesz. Aby używać zapisanych informacji, wybierz usługę haseł, kluczy dostępu lub danych."</string>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index c144b2b..b11e99e 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -361,7 +361,7 @@
</string-array>
<string-array name="vpn_states">
<item msgid="2262719249581510939">"Desconectado"</item>
- <item msgid="9141074028293812365">"Inicializando..."</item>
+ <item msgid="9141074028293812365">"Iniciando…"</item>
<item msgid="2234425878608626285">"Conectando..."</item>
<item msgid="27547778933579155">"Conectado"</item>
<item msgid="893506841727300393">"Tempo limite"</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 6f38a87..aba4e38 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -273,8 +273,7 @@
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Carregando…"</string>
<string name="location_settings_footer_general" msgid="1040507068701188821">"Apps com permissão para encontrar dispositivos por perto podem determinar a posição relativa dos dispositivos conectados."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"O acesso à localização está desativado para apps e serviços. A localização do dispositivo ainda poderá ser enviada aos socorristas quando você ligar ou enviar uma mensagem de texto para um número de emergência."</string>
- <!-- no translation found for location_settings_footer_learn_more_content_description (349380666660145540) -->
- <skip />
+ <string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Saiba mais sobre as configurações de localização"</string>
<string name="account_settings_title" msgid="9138880127246241885">"Contas"</string>
<string name="security_settings_title" msgid="6710768415432791970">"Segurança"</string>
<string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Criptografia e credenciais"</string>
@@ -2245,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> restantes"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> até carregar"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Tempo de tela"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Tempo em segundo plano"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Bateria fraca"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Permitir que o app seja executado em segundo plano"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitar atividade em segundo plano?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Se você limitar as atividades em segundo plano de um app, ele poderá apresentar mau funcionamento"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Como o app não está configurado para otimizar bateria, não é possível restringi-lo.\n\nPara restringir, ative a otimização."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Gerenciar uso da bateria"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Sem restrições"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Otimizado"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Restrito"</string>
@@ -2397,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menos de um minuto"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Segundo plano: menos de um minuto"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Tempo de uso: menos de um minuto"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Menos de um minuto"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Segundo plano: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Tempo de uso: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4180,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"dados, chave de acesso, senha"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automático, preenchimento, preenchimento automático, dados, chave de acesso, senha"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Você precisa confiar nesse app</b> <br/> <br/> <xliff:g id=app_name example=O Preenchimento automático do Google>%1$s</xliff:g> usa o que está na sua tela para determinar o que pode ser preenchido automaticamente."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Usar <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Senhas, chaves de acesso e outras informações novas serão salvas aqui a partir de agora. <xliff:g id=app_name example=Provider>%1$s</xliff:g> pode usar o que aparece na tela para determinar o que pode ser preenchido automaticamente."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Senhas, chaves de acesso e serviços de dados"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Desativar %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Desativar este serviço?</b> <br/> <br/> Senhas, chaves de acesso, formas de pagamento e outras informações salvas não serão preenchidas quando você fizer login. Para usar suas informações salvas, escolha uma senha, uma chave de acesso ou um serviço de dados."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f2a89d1..75cec1e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> restante(s)"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> a cobrar"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Tempo ao ecrã"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Tempo em segundo plano"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Bateria fraca"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Permitir que a aplicação seja executada em segundo plano"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Quer limitar a atividade em segundo plano?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Se limitar a atividade em segundo plano de uma aplicação, esta pode apresentar um comportamento anormal."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"A app não está def. p/ otimizar a bateria, não a pode restringir.\n\nP/ restringir a app, ative a otimiz. da bateria."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Faça a gestão da utilização da bateria"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Sem restrições"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Otimizada"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Restrita"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menos de um min"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Em segundo plano: menos de um min"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Tempo de utilização: menos de um minuto"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Menos de um min"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Em segundo plano: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Tempo de utilização: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"dados, chave de acesso, palavra-passe"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automático, preenchimento, preenchimento automático, dados, chave de acesso, palavra-passe"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Certifique-se de que confia nesta app</b> <br/> <br/> <xliff:g id=app_name example=O Preenchimento automático do Google>%1$s</xliff:g> utiliza o que está no ecrã para determinar o que pode ser preenchido automaticamente."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use a app <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Entre outras informações, a partir de agora, as palavras-passe e as chaves de acesso novas vão ser guardadas aqui. A app <xliff:g id=app_name example=Provider>%1$s</xliff:g> pode usar o que está no ecrã para determinar o que pode ser preenchido automaticamente."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Palavras-passe, chaves de acesso e serviços de dados"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Desativar %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Desativar este serviço?</b> <br/> <br/> As informações guardadas, como palavras-passe, chaves de acesso, métodos de pagamento e outras informações, não vão ser preenchidas quando iniciar sessão. Para usar as informações guardadas, escolha uma palavra-passe, uma chave de acesso ou um serviço de dados."</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index c144b2b..b11e99e 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -361,7 +361,7 @@
</string-array>
<string-array name="vpn_states">
<item msgid="2262719249581510939">"Desconectado"</item>
- <item msgid="9141074028293812365">"Inicializando..."</item>
+ <item msgid="9141074028293812365">"Iniciando…"</item>
<item msgid="2234425878608626285">"Conectando..."</item>
<item msgid="27547778933579155">"Conectado"</item>
<item msgid="893506841727300393">"Tempo limite"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6f38a87..aba4e38 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -273,8 +273,7 @@
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Carregando…"</string>
<string name="location_settings_footer_general" msgid="1040507068701188821">"Apps com permissão para encontrar dispositivos por perto podem determinar a posição relativa dos dispositivos conectados."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"O acesso à localização está desativado para apps e serviços. A localização do dispositivo ainda poderá ser enviada aos socorristas quando você ligar ou enviar uma mensagem de texto para um número de emergência."</string>
- <!-- no translation found for location_settings_footer_learn_more_content_description (349380666660145540) -->
- <skip />
+ <string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Saiba mais sobre as configurações de localização"</string>
<string name="account_settings_title" msgid="9138880127246241885">"Contas"</string>
<string name="security_settings_title" msgid="6710768415432791970">"Segurança"</string>
<string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Criptografia e credenciais"</string>
@@ -2245,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> restantes"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> até carregar"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Tempo de tela"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Tempo em segundo plano"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Bateria fraca"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Permitir que o app seja executado em segundo plano"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitar atividade em segundo plano?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Se você limitar as atividades em segundo plano de um app, ele poderá apresentar mau funcionamento"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Como o app não está configurado para otimizar bateria, não é possível restringi-lo.\n\nPara restringir, ative a otimização."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Gerenciar uso da bateria"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Sem restrições"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Otimizado"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Restrito"</string>
@@ -2397,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: menos de um minuto"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Segundo plano: menos de um minuto"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Tempo de uso: menos de um minuto"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Menos de um minuto"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Segundo plano: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Tempo de uso: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4180,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"dados, chave de acesso, senha"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automático, preenchimento, preenchimento automático, dados, chave de acesso, senha"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Você precisa confiar nesse app</b> <br/> <br/> <xliff:g id=app_name example=O Preenchimento automático do Google>%1$s</xliff:g> usa o que está na sua tela para determinar o que pode ser preenchido automaticamente."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Usar <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Senhas, chaves de acesso e outras informações novas serão salvas aqui a partir de agora. <xliff:g id=app_name example=Provider>%1$s</xliff:g> pode usar o que aparece na tela para determinar o que pode ser preenchido automaticamente."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Senhas, chaves de acesso e serviços de dados"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Desativar %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Desativar este serviço?</b> <br/> <br/> Senhas, chaves de acesso, formas de pagamento e outras informações salvas não serão preenchidas quando você fizer login. Para usar suas informações salvas, escolha uma senha, uma chave de acesso ou um serviço de dados."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 79b387c..ebf5b43 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Timp rămas: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> până la finalizarea încărcării"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Durata de folosire a dispozitivului"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Timpul în fundal"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Nivel scăzut al bateriei"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Permite aplicației să ruleze în fundal"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitezi activitatea de fundal?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Dacă limitezi activitatea de fundal pentru o aplicație, aceasta se poate comporta necorespunzător"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplicația nu optimizează bateria, deci nu o poți restricționa.\n\nPentru a o restricționa, activează optimizarea bateriei."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Gestionează utilizarea bateriei"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Fără restricții"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimizată"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Limitată"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Total: mai puțin de un minut"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"În fundal: mai puțin de un minut"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Durata de folosire a dispozitivului: mai puțin de un minut"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Mai puțin de un minut"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Total: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"În fundal: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Durata de folosire a dispozitivului: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"date, cheie de acces, parolă"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"auto, completare, completare automată, date, cheie de acces, parolă"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Asigură-te că ai încredere în această aplicație</b> <br/> <br/> <xliff:g id=app_name example=Completarea automată Google>%1$s</xliff:g> folosește conținutul de pe ecran pentru a stabili ce se poate completa automat."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Folosește <xliff:g id=app_name example=Furnizorul>%1$s</xliff:g>?</b> <br/> <br/> Noile parole, chei de acces și alte informații se vor salva aici de acum înainte. <xliff:g id=app_name example=Furnizorul>%1$s</xliff:g> poate folosi ce se află pe ecran pentru a stabili ce se poate completa automat."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Parole, chei de acces și servicii de date"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Dezactivezi %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Dezactivezi serviciul?</b> <br/> <br/> Informațiile salvate, cum ar fi parole, chei de acces, metode de plată și altele, nu vor fi completate când te conectezi. Pentru a folosi informațiile salvate, alege o parolă, o cheie de acces sau un serviciu de date."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4b53906..6b9d5e1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Батарея будет разряжена через <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Батарея будет заряжена через <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Время в активном режиме"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Время в фоновом режиме"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Низкий заряд батареи"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Разрешить приложению работать в фоновом режиме"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Ограничить работу в фоновом режиме?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Это действие может привести к неправильной работе приложения."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Оптимизация расхода заряда батареи для этого приложения не настроена.\n\nВключите ее, чтобы установить ограничения."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Управление расходом заряда"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Без ограничений"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"С оптимизацией"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Ограничено"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Всего: меньше минуты"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"В фоновом режиме: меньше минуты"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Время использования устройства: меньше минуты"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Менее минуты"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Всего: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"В фоновом режиме: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Время использования: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"данные, ключ доступа, пароль"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"авто, заполнение, автозаполнение, данные, ключ доступа, пароль"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Подтвердите, что вы доверяете этому приложению</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> анализирует содержимое экрана и находит поля, которые можно заполнить автоматически."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Использовать приложение \"<xliff:g id=app_name example=Provider>%1$s</xliff:g>\"?</b> <br/> <br/> С этого момента в нем будут сохраняться новые пароли, ключи доступа и другие данные. Приложение \"<xliff:g id=app_name example=Provider>%1$s</xliff:g>\" может анализировать содержимое экрана и находить поля, для которых доступно автозаполнение."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Сервисы для паролей, ключей доступа и данных"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Отключить %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Отключить этот сервис?</b> <br/> <br/>Пароли, ключи доступа, способы оплаты и другая сохраненная информация не будут подставляться при входе. Чтобы использовать эти данные, выберите пароль, ключ доступа или сервис."</string>
@@ -4793,10 +4788,10 @@
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Приложения, установленные в течение # последнего месяца}one{Приложения, установленные в течение # последнего месяца}few{Приложения, установленные в течение # последних месяцев}many{Приложения, установленные в течение # последних месяцев}other{Приложения, установленные в течение # последнего месяца}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Приложения, установленные более # месяца назад}one{Приложения, установленные более # месяца назад}few{Приложения, установленные более # месяцев назад}many{Приложения, установленные более # месяцев назад}other{Приложения, установленные более # месяца назад}}"</string>
<string name="aspect_ratio_title" msgid="2451826875939676101">"Соотношение сторон"</string>
- <string name="aspect_ratio_summary" msgid="4056406351663726494">"Если приложение не адаптировано для устройства <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, выберите другое соотношение сторон"</string>
- <string name="aspect_ratio_main_summary" msgid="4141964559612756940">"Если приложение неправильно отображается на устройстве \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", попробуйте другое соотношение сторон. Некоторые приложения оптимизированы не для всех соотношений сторон."</string>
- <string name="aspect_ratio_summary_text" msgid="4737461467467220325">"Если приложение неправильно отображается на устройстве \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", попробуйте другое соотношение сторон."</string>
- <string name="aspect_ratio_main_summary_text" msgid="5544816872094235840">"Если приложение неправильно отображается на устройстве \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\", попробуйте другое соотношение сторон. Некоторые приложения оптимизированы не для всех соотношений сторон."</string>
+ <string name="aspect_ratio_summary" msgid="4056406351663726494">"Если приложение неправильно отображается на устройстве <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, попробуйте другое соотношение сторон."</string>
+ <string name="aspect_ratio_main_summary" msgid="4141964559612756940">"Если приложение неправильно отображается на устройстве <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, попробуйте другое соотношение сторон. Некоторые приложения оптимизированы не для всех соотношений сторон."</string>
+ <string name="aspect_ratio_summary_text" msgid="4737461467467220325">"Если приложение неправильно отображается на устройстве <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, попробуйте другое соотношение сторон."</string>
+ <string name="aspect_ratio_main_summary_text" msgid="5544816872094235840">"Если приложение неправильно отображается на устройстве <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, попробуйте другое соотношение сторон. Некоторые приложения оптимизированы не для всех соотношений сторон."</string>
<string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Рекомендуемые приложения"</string>
<string name="user_aspect_ratio_changed_apps_label" msgid="2096614916172567672">"Измененные приложения"</string>
<string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Значение по умолчанию в приложении"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 9e16fed..6c52b3d 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> ක් ඉතිරියි"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> වෙත වෙනස් කරන්න"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"තිර කාලය"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"පසුබිම් කාලය"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"බැටරිය අඩුයි"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"පසුබිමේ ධාවනය කිරීමට යෙදුමට අවසර දෙන්න"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"පසුබිම් ක්රියාකාරිත්වය සීමා කරන්නද?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ඔබ යෙදුමක පසුබිම් ක්රියාකාරිත්වය සීමා කළහොත්, එය වැරදි ලෙස ක්රියා කරනු ඇත"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"මෙම යෙදුම බැටරිය ප්රශස්ත කිරීමට සකසා නැති නිසා, ඔබට එය සීමා කළ නොහැකිය. \n\nයෙදුම සීමා කිරීම සඳහා, පළමුව බැටරි ප්රශස්තකරණය ක්රියාත්මක කරන්න."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"බැටරි භාවිතය කළමනාකරණය"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"සීමා නොකළ"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ප්රශස්ත කළ"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"සීමා කළ"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"මුළු: මිනිත්තුවකට වඩා අඩුය"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"පසුබිම: මිනිත්තුවකට වඩා අඩුය"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"තිර කාලය: මිනිත්තුවකට වඩා අඩුයි"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"මිනිත්තුවකට වඩා අඩු"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"එකතුව: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"පසුබිම: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"තිර කාලය: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"දත්ත, මුරයතුර, මුරපදය"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"ස්වයංක්රීය, පුරවන්න, ස්වයං පිරවුම, දත්ත, මුරයතුර, මුරපදය"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>ඔබ මෙම යෙදුම විශ්වාස කරන බව සහතික කර ගන්න</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ස්වයං පිරවිය හැකි දේවල් නිර්ණය කිරීමට ඔබේ තිරයෙහි ඇති දේවල් භාවිත කරයි."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g> භාවිතා කරන්න ද?</b> <br/> <br/> නව මුරපද, මුරයතුරු, සහ අනෙකුත් තතු මෙතැන් සිට මෙහි සුරකිනු ඇත. <xliff:g id=app_name example=Provider>%1$s</xliff:g> ස්වයංව පිරවිය හැකි දේ තීරණය කිරීමට ඔබේ තිරයෙහි ඇති දේ භාවිතා කළ හැක."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"මුරපද, මුරයතුරු සහ දත්ත සේවා"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s ක්රියාවිරහිත කරන්න ද?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>මෙම සේවාව අක්රිය කරන්නද?</b> <br/> <br/> ඔබ පුරනය වන විට මුරපද, මුරයතුරු, ගෙවීම් ක්රම, සහ අනෙකුත් තොරතුරු වැනි සුරැකි තොරතුරු පුරවන්නේ නැත. ඔබේ සුරකින ලද තොරතුරු භාවිත කිරීමට, මුරපදයක්, මුරයතුරක් හෝ දත්ත සේවාවක් තෝරන්න."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1b02a4c..66ec584 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Zostáva <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do nabitia"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Čas používania"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Čas na pozadí"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Nízky stav batérie"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Povoliť aplikácii spúšťať sa na pozadí"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Obmedziť aktivitu na pozadí?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ak obmedzíte aktivitu aplikácie na pozadí, nemusí fungovať správne"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikácia nemá nastavenú optimalizáciu batérie, preto ju nemôžete obmedziť.\n\nAk ju chcete obmedziť, zapnite optimalizáciu."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Správa spotreby batérie"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Bez obmedzení"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimalizované"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Obmedzené"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Celkove: menej ako minúta"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Na pozadí: menej ako minúta"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Čas používania: menej ako minúta"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Menej ako minúta"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Celkove: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Na pozadí: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Čas používania: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"údaje, prístupový kľúč, heslo"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatické, dopĺňanie, automatické dopĺňanie, údaje, prístupový kľúč, heslo"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Skontrolujte, či ide o dôveryhodnú aplikáciu</b> <br/> <br/> <xliff:g id=app_name example=Automatické dopĺňanie Google>%1$s</xliff:g> určuje na základe obsahu obrazovky, čo je možné automaticky vyplniť."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Tu sa budú odteraz ukladať nové heslá, prístupové kľúče a ďalšie informácie. <xliff:g id=app_name example=Provider>%1$s</xliff:g> môže určovať, čo treba automaticky doplniť, pomocou obsahu na obrazovke."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Heslá, prístupové kľúče a služby poskytujúce údaje"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Chcete službu %1$s vypnúť?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Chcete túto službu vypnúť?</b> <br/> <br/> Keď sa prihlásite, uložené informácie, ako sú heslá, prístupové kľúče, spôsoby platby a iné, sa nebudú dopĺňať. Ak chcete používať uložené údaje, vyberte heslo, prístupový kľúč alebo službu poskytujúcu údaje."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 28d9ade..37e58c7 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Preostali čas: <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do napolnjenosti"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Čas uporabe"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Čas izvajanja v ozadju"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Skoraj prazna baterija"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Dovoli, da se aplikacija izvaja v ozadju"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Želite omejiti dejavnost v ozadju?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Če boste omejili dejavnost aplikacije v ozadju, morda ne bo pravilno delovala"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Ker za to aplikacijo ni izbrana nastavitev optimiziranja porabe baterije, je ni mogoče omejiti.\n\nČe želite omejiti aplikacijo, najprej vklopite optimizacijo baterije."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Upravljanje porabe energije baterije"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Neomejeno"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimizirano"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Omejeno"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Skupno: manj kot minuta"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"V ozadju: manj kot minuta"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Čas uporabe: manj kot min"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Manj kot minuta"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Skupno: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"V ozadju: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Čas uporabe: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"podatki, ključ za dostop, geslo"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"samodejno, izpolnjevanje, samodejno izpolnjevanje, podatki, ključ za dostop, geslo"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Prepričajte se, da zaupate tej aplikaciji</b> <br/> <br/> <xliff:g id=app_name example=Google Samodejno izpolnjevanje>%1$s</xliff:g> iz elementov na zaslonu ugotovi, kaj je mogoče samodejno izpolniti."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Uporabi aplikacijo <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Nova gesla, ključi za dostop in drugi podatki bodo odslej shranjeni tukaj. Aplikacija <xliff:g id=app_name example=Provider>%1$s</xliff:g> lahko na podlagi prikaza na zaslonu ugotovi, kaj se lahko samodejno izpolni."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Gesla, ključi za dostop in podatkovne storitve"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Želite izklopiti »%1$s«?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Želite izklopiti to storitev?</b> <br/> <br/> Shranjeni podatki, kot so gesla, ključi za dostop, plačilna sredstva in drugo, ne bodo izpolnjeni ob prijavi. Za uporabo shranjenih podatkov izberite geslo, ključ za dostop ali podatkovno storitev."</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 738d952..84ac005 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -1941,7 +1941,7 @@
<string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"Për të përdorur një veçori të qasshmërisë, rrëshqit shpejt lart nga fundi i ekranit me 3 gishta.\n\nPër të ndërruar mes veçorive, rrëshqit shpejt lart me 3 gishta dhe mbaje të shtypur."</string>
<string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"E kuptova"</string>
<string name="accessibility_tutorial_dialog_link_button" msgid="6797349445794031781">"Cilësimet e butonit"</string>
- <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Shkurtorja për: <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
+ <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Shkurtorja për <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
<string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"Butoni i qasshmërisë"</string>
<string name="accessibility_shortcut_edit_summary_software_gesture" msgid="5489284264414421286">"Gjesti i qasshmërisë"</string>
<string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"Rrëshqit lart me 2 gishta"</string>
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> të mbetura"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> për të karikuar"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Koha para ekranit"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Koha në sfond"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Bateria në nivel të ulët"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Lejo që aplikacioni të ekzekutohet në sfond"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Të kufizohet aktiviteti në sfond?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Nëse e kufizon aktivitetin në sfond për një aplikacion, mund të ketë çrregullime në funksionimin e tij"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Duke qenë se ky aplikacion nuk është caktuar për të optimizuar baterinë, nuk mund ta kufizosh atë.\n\nPër të kufizuar aplikacionin, në fillim aktivizo optimizimin e baterisë."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Menaxho përdorimin e baterisë"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Pa kufizim"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"I optimizuar"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"I kufizuar"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Në total: më pak se një minutë"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Në sfond: më pak se një minutë"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Koha para ekranit: më pak se një minutë"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Më pak se një minutë"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Në total: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Në sfond: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Koha para ekranit: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"të dhëna, çelës kalimi, fjalëkalim"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"automatik, plotëso, plotësimi automatik, të dhënat, çelësi i kalimit, fjalëkalimi"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Sigurohu që ke besim te ky aplikacion</b> <br/> <br/> <xliff:g id=app_name example=Plotësimi automatik i Google>%1$s</xliff:g> përdor atë që ndodhet në ekranin tënd për të përcaktuar se çfarë mund të plotësohet automatikisht."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Fjalëkalimet, çelësat e kalimit dhe informacionet e tjera të reja do të ruhen këtu nga tani e tutje. <xliff:g id=app_name example=Provider>%1$s</xliff:g> mund të përdorë ato që janë në ekranin tënd për të përcaktuar se çfarë mund të plotësohet automatikisht."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Fjalëkalimet, çelësat e kalimit dhe shërbimet e të dhënave"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Të çaktivizohet %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Të çaktivizohet shërbimi?</b> <br/> <br/> Informacionet e ruajtura si fjalëkalimet, çelësat e kalimit, mënyrat e pagesës dhe informacione të tjera nuk do të plotësohen kur të identifikohesh. Për të përdorur informacionin tënd të ruajtur, zgjidh një fjalëkalim, çelës kalimi ose shërbim të dhënash."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 8ea3e73..3e5cce4 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Још <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Пуни се још <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Време на екрану"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Време у позадини"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Низак ниво батерије"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Дозволите апликацији да се покреће у позадини"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Желите ли да ограничите активности у позадини?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ако ограничите активности апликације у позадини, можда ће се понашати неочекивано."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Апл. није подешена за оптимизацију батерије, па не можете да је ограничите. \n\nЗа огр. апл. укључите оптимизацију батерије."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Управљајте потрошњом батерије"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Неограничено"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Оптимизовано"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Ограничено"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Укупно: мање од минут"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Позадина: мање од минут"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Време испред екрана: мање од минута"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Мање од минута"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Укупно: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Позадина: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Време испред екрана: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"подаци, приступни кôд, лозинка"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"аутоматски, попуњавање, аутоматско попуњавање, подаци, приступни кључ, лозинка"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Уверите се да је ова апликација поуздана</b> <br/> <br/> <xliff:g id=app_name example=Google аутоматско попуњавање>%1$s</xliff:g> користи садржај екрана за утврђивање података који могу аутоматски да се попуне."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Користите <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Нове лозинке, приступни кључеви и други подаци ће се од сада чувати овде. <xliff:g id=app_name example=Provider>%1$s</xliff:g> може да користи оно што је на екрану ради одређивања шта може аутоматски да се попуни."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Услуге за лозинке, приступне кодове и податке"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Желите да искључите: %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Желите да искључите ову услугу?</b> <br/> <br/> Сачуване информације као што су лозинке, приступни кључеви, начини плаћања и други подаци се неће попуњавати када сте пријављени. Да бисте користили сачуване информације, одаберите услугу за лозинке, приступне кључеве или податке."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f8266e6..1d2a802 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> återstår"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Ladda i <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> till"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Skärmtid"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Bakgrundstid"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Låg batterinivå"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Tillåt att appen körs i bakgrunden"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vill du begränsa bakgrundsaktivitet?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Om du begränsar bakgrundaktiviteten för en app kanske den inte fungerar som den ska"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Appen kan inte begränsas eftersom batterioptimering inte har angetts.\n\nAktivera batterioptimering för att begränsa appen."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Hantera batterianvändning"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Obegränsad"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimerad"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Begränsad"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Totalt: mindre än en minut"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"I bakgrunden: mindre än en minut"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Skärmtid: mindre än en minut"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Under en minut"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Totalt: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"I bakgrunden: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Skärmtid: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, nyckel, lösenord"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"auto, fyll, autofyll, data, nyckel, lösenord"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Kontrollera att du litar på den här appen</b> <br/> <br/> <xliff:g id=app_name example=Google Autofyll>%1$s</xliff:g> identifierar vad som kan fyllas i automatiskt utifrån vad som visas på skärmen."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Använd <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Nya lösenord, nycklar och annan information sparas här från och med nu. <xliff:g id=app_name example=Provider>%1$s</xliff:g> kan använda det som visas på skärmen för att avgöra vad som kan fyllas i automatiskt."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Lösenord, nycklar och datatjänster"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Vill du stänga av %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Vill du inaktivera den här tjänsten?</b> <br/> <br/> Sparade uppgifter som lösenord, nycklar, betalningsmetoder och annan information fylls inte i när du loggar in. Om du vill använda dina sparade uppgifter väljer du en lösenords-, nyckel- eller datatjänst."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 52437b1..11b5112 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Imesalia <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> chaji ijae"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Muda wa kutumia kifaa"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Muda wa programu kuendeshwa chinichini"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Chaji ya betri imepungua"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Iruhusu programu kutumika chini chini"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Ungependa kudhibiti shughuli za chini chini?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ikiwa utadhibiti shughuli za chini chini za programu, huenda isifanye kazi vizuri"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Kwa kuwa programu hii haiboreshi matumizi ya betri, huwezi kuizuia.\n\nIli uizuie, washa kuboresha matumizi ya betri."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Dhibiti matumizi ya betri"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Yasiyodhibitiwa"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Yaliyoboreshwa"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Yanayodhibitiwa"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Jumla: chini ya dakika moja"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Chinichini: chini ya dakika moja"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Muda wa kutumia kifaa: chini ya dakika moja"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Chini ya dakika moja"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Jumla: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Chinichini: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Muda wa kutumia kifaa: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, ufunguo wa siri, nenosiri"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"kiotomatiki, jaza, jaza kiotomatiki, data, ufunguo wa siri, nenosiri"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Hakikisha kuwa unaamini programu hii</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> hutumia kilicho kwenye skrini yako kubaini kinachoweza kujazwa kiotomatiki."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Tumia <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Manenosiri mapya, funguo za siri na maelezo mengine yatahifadhiwa hapa kuanzia sasa. Huenda <xliff:g id=app_name example=Provider>%1$s</xliff:g> ikatumia maudhui kwenye skrini yako kubaini kinachoweza kujazwa kiotomatiki."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Manenosiri, funguo za siri na huduma za data"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Ungependa kuzima %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Ungependa kuzima huduma hii?</b> <br/> <br/> Maelezo yaliyohifadhiwa kama vile manenosiri, funguo za siri, njia za kulipa na maelezo mengine hayatajazwa utakapoingia katika akaunti. Ili utumie maelezo uliyohifadhi, chagua nenosiri, ufunguo wa siri au huduma ya data."</string>
@@ -4235,7 +4230,7 @@
<!-- no translation found for graphics_driver_app_preference_values:2 (5391218026495225599) -->
<!-- no translation found for graphics_driver_app_preference_values:3 (2586045835780389650) -->
<string name="enable_angle_as_system_driver" msgid="4648827560023949786">"Kipengele cha jaribio: Washa ANGLE"</string>
- <string name="enable_angle_as_system_driver_summary" msgid="2170215556348477481">"Onyo: Washa ANGLE kama kiendeshaji chaguomsingi cha OpenGL ES. Kipengele hiki ni cha jaribio na huenda kisioane na baadhi ya programu za kamera na video."</string>
+ <string name="enable_angle_as_system_driver_summary" msgid="2170215556348477481">"Onyo: Kitawasha ANGLE kama kiendeshaji chaguomsingi cha OpenGL ES. Kipengele hiki ni cha jaribio na huenda kisioane na baadhi ya programu za kamera na video."</string>
<string name="reboot_dialog_enable_angle_as_system_driver" msgid="2619263039763150810">"Unahitaji kuwasha tena ili kubadilisha kiendeshaji cha mfumo cha OpenGL ES"</string>
<string name="platform_compat_dashboard_title" msgid="1323980546791790236">"Mabadiliko ya Uoanifu wa Programu"</string>
<string name="platform_compat_dashboard_summary" msgid="4036546607938791337">"Geuza mabadiliko ya uoanifu wa programu"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index b7b242d..b25088f 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> மீதமுள்ளது"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"சார்ஜ் செய்வதற்கு <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"பயன்படுத்திய நேரம்"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"பின்னணியில் எடுக்கப்படும் நேரம்"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"பேட்டரி குறைவாக உள்ளது"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"பின்னணியில் இயங்குவதற்குப் ஆப்ஸை அனுமதிக்கும்"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"பின்னணி செயல்பாட்டைக் கட்டுப்படுத்தவா?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ஆப்ஸின் பின்னணி செயல்பாட்டைக் கட்டுப்படுத்தினால், சரியாக வேலை செய்யாது."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"பேட்டரியை மேம்படுத்த அமைக்கப்படவில்லை, எனவே கட்டுப்படுத்த முடியாது.\n\nஆப்ஸை கட்டுப்படுத்த, பேட்டரி மேம்படுத்தலை ஆன் செய்க."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"பேட்டரி உபயோகத்தை நிர்வகித்தல்"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"கட்டுப்பாடற்ற பேட்டரி"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"மேம்படுத்தப்பட்டது"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"வரம்பிடப்பட்டது"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"மொத்தம்: ஒரு நிமிடத்திற்கும் குறைவு"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"பின்னணி: ஒரு நிமிடத்திற்கும் குறைவு"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"சாதனத்தைப் பயன்படுத்திய நேரம்: ஒரு நிமிடத்திற்கும் குறைவு"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"ஒரு நிமிடத்திற்கும் குறைவு"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"மொத்தம்: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"பின்னணி: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"சாதனத்தைப் பயன்படுத்திய நேரம்: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"தரவு, கடவுச்சாவி, கடவுச்சொல்"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"தானியங்கு, நிரப்பு, தன்னிரப்பி, தரவு, கடவுச்சாவி, கடவுச்சொல்"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>இந்த ஆப்ஸை நம்புகிறீர்கள் என்பதை உறுதிப்படுத்திக்கொள்ளவும்</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> உங்கள் திரையில் இருப்பதைப் பயன்படுத்தி, எவற்றையெல்லாம் தன்னிரப்ப முடியும் என்பதைத் தீர்மானிக்கும்."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g> ஆப்ஸைப் பயன்படுத்த வேண்டுமா?</b> <br/> <br/> இனி புதிய கடவுச்சொற்கள், கடவுச்சாவிகள் மற்றும் பிற தகவல்கள் இங்கே சேமிக்கப்படும். எவற்றைத் தானாக நிரப்ப முடியும் என்பதைத் தீர்மானிக்க <xliff:g id=app_name example=Provider>%1$s</xliff:g> உங்கள் திரையில் உள்ளவற்றைப் பயன்படுத்தக்கூடும்."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"கடவுச்சொற்கள், கடவுச்சாவிகள் மற்றும் தரவுச் சேவைகள்"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s ஐ முடக்கவா?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>இந்தச் சேவையை முடக்கவா?</b> <br/> <br/> கடவுச்சொற்கள், கடவுச்சாவிகள், பேமெண்ட் முறைகள் போன்ற சேமிக்கப்பட்ட தகவல்களும் பிற தகவல்களும் நீங்கள் உள்நுழையும்போது நிரப்பப்படாது. உங்கள் சேமிக்கப்பட்ட தகவல்களைப் பயன்படுத்த ஒரு கடவுச்சொல், கடவுச்சாவி அல்லது தரவுச் சேவையைத் தேர்ந்தெடுங்கள்."</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 089c391..a21851d 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> ఉంది"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>లోపు ఛార్జ్ చేయాలి"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"పరికర వినియోగ వ్యవధి"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"బ్యాక్గ్రౌండ్ సమయం"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"బ్యాటరీ తక్కువ ఉంది"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"బ్యాక్గ్రౌండ్లో అమలు కావడానికి యాప్ను అనుమతించండి"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"నేపథ్య యాక్టివిటీని పరిమితం చేయాలా?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"మీరు యాప్ నేపథ్య యాక్టివిటీని పరిమితం చేస్తే, అది సరిగ్గా పని చేయకపోవచ్చు."</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ఈ యాప్ బ్యాటరీని ఆప్టిమైజ్ చేయికి సెట్ చేయబడలేదు కనుక, దీన్ని మీరు పరిమితం చేయలేరు.\n\nయాప్ను పరిమితం చేయడానికి, మొదట బ్యాటరీ ఆప్టిమైజేషన్ను ఆన్ చేయండి."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"బ్యాటరీ వినియోగాన్ని మేనేజ్ చేయండి"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"అపరిమిత"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ఆప్టిమైజ్ చేయబడినది"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"పరిమితం చేయబడిన సెట్టింగ్లు"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"మొత్తం సమయం: ఒక నిమిషం కన్నా తక్కువ"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"బ్యాక్గ్రౌండ్ సమయం: ఒక నిమిషం కన్నా తక్కువ"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"పరికర వినియోగ వ్యవధి: నిమిషం కంటే తక్కువ"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"నిమిషం కంటే తక్కువ"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"మొత్తం ఉపయోగం: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"బ్యాక్గ్రౌండ్ సమయం: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"పరికర వినియోగ వ్యవధి: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"డేటా, పాస్-కీ, పాస్వర్డ్"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"ఆటోమేటిక్, ఫిల్, ఆటోఫిల్, డేటా, పాస్-కీ, పాస్వర్డ్"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>ఈ యాప్ను మీరు విశ్వసిస్తున్నట్లు నిర్ధారించండి</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> మీ స్క్రీన్పై ఉన్న వాటిని పరిగణనలోకి తీసుకుని వేటిని ఆటోఫిల్ చేయాలో నిర్ణయిస్తుంది."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g>ను ఉపయోగించాలా?</b> <br/> <br/> కొత్త పాస్వర్డ్లు, పాస్-కీలు, ఇంకా ఇతర సమాచారం ఇక నుండి ఇక్కడ సేవ్ చేయబడుతుంది. <xliff:g id=app_name example=Provider>%1$s</xliff:g> వేటిని ఆటోఫిల్ చేయాలో నిర్ణయించడానికి మీ స్క్రీన్పై ఉన్న వాటిని ఉపయోగించవచ్చు."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"పాస్వర్డ్లు, పాస్-కీలు, అలాగే డేటా సర్వీస్లు"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$sను ఆఫ్ చేయాలా?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>ఈ సర్వీస్ను ఆఫ్ చేయాలా?</b> <br/> <br/> మీరు సైన్ ఇన్ చేసినప్పుడు, పాస్వర్డ్లు, పాస్-కీలు, పేమెంట్ ఆప్షన్లు, ఇంకా ఇతర సమాచారం వంటి సేవ్ చేసిన సమాచారం పూరించడం జరగదు. మీరు సేవ్ చేసిన సమాచారాన్ని ఉపయోగించడానికి, పాస్వర్డ్ను, పాస్-కీని, లేదా డేటా సర్వీస్ను ఎంచుకోండి."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index c802b95..f5ac45e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"เหลืออีก <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"อีก <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> จะชาร์จเต็ม"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"เวลาอยู่หน้าจอ"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"เวลาที่ทำงานอยู่เบื้องหลัง"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"แบตเตอรี่อ่อน"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"อนุญาตให้แอปทำงานในเบื้องหลัง"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"จำกัดกิจกรรมในพื้นหลังใช่ไหม"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"แอปอาจทำงานผิดพลาดหากคุณจำกัดกิจกรรมในพื้นหลัง"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"เนื่องจากแอปนี้ไม่ได้ตั้งค่าให้เพิ่มประสิทธิภาพแบตเตอรี่ คุณจึงจำกัดการใช้งานไม่ได้\n\nหากต้องการจำกัด ให้เปิดการเพิ่มประสิทธิภาพแบตเตอรี่ก่อน"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"จัดการการใช้งานแบตเตอรี่"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"ไม่จำกัด"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"เพิ่มประสิทธิภาพ"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"จำกัด"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"รวม: ไม่ถึง 1 นาที"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"การทำงานในเบื้องหลัง: ไม่ถึง 1 นาที"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"เวลาอยู่หน้าจอ: น้อยกว่า 1 นาที"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"น้อยกว่า 1 นาที"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"รวม: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"การทำงานในเบื้องหลัง: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"เวลาอยู่หน้าจอ: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"อินเทอร์เน็ต, พาสคีย์, รหัสผ่าน"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"อัตโนมัติ, ป้อน, ป้อนข้อความอัตโนมัติ, ข้อมูล, พาสคีย์, รหัสผ่าน"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>ตรวจดูว่าคุณเชื่อถือแอปนี้ได้</b> <br/> <br/> <xliff:g id=app_name example=Google ป้อนอัตโนมัติ>%1$s</xliff:g> ใช้สิ่งที่อยู่บนหน้าจอเพื่อดูว่าจะป้อนข้อมูลใดโดยอัตโนมัติได้บ้าง"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>ใช้ <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> ระบบจะบันทึกรหัสผ่านใหม่ พาสคีย์ และข้อมูลอื่นๆ ไว้ที่นี่นับจากนี้เป็นต้นไป <xliff:g id=app_name example=Provider>%1$s</xliff:g> อาจใช้สิ่งที่อยู่บนหน้าจอเพื่อดูว่าจะป้อนข้อมูลใดโดยอัตโนมัติได้บ้าง"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"รหัสผ่าน พาสคีย์ และบริการอินเทอร์เน็ต"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"ปิด %1$s ไหม"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>ปิดบริการนี้ไหม</b> <br/> <br/> ระบบจะไม่กรอกข้อมูลที่บันทึกไว้ เช่น รหัสผ่าน พาสคีย์ วิธีการชำระเงิน และข้อมูลอื่นๆ เมื่อคุณลงชื่อเข้าใช้ หากต้องการใช้ข้อมูลที่บันทึกไว้ ให้เลือกรหัสผ่าน พาสคีย์ หรือบริการข้อมูล"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 3b4002b..50d17ed 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> natitira"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> upang ma-charge"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Tagal ng paggamit"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Tagal sa background"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Paubos na ang baterya"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Pahintulutan ang app na tumakbo sa background"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitahan ang aktibidad sa background?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Kung lilimitahan mo ang aktibidad sa background ng app, maaari itong gumana nang hindi tama"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Hindi nakatakda ang app na mag-optimize ng baterya kaya hindi ito malilimitahan.\n\nPara malimitahan, i-on ang battery optimization."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Pamahalaan ang paggamit ng baterya"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Hindi pinaghihigpitan"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Naka-optimize"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Limitado"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Kabuuan: wala pang isang minuto"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Background: wala pang isang minuto"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Tagal ng paggamit: wala pang isang minuto"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Wala pang isang minuto"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Kabuuan: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Background: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Tagal ng paggamit: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"data, passkey, password"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"auto, fill, autofill, data, passkey, password"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Tiyaking pinagkakatiwalaan mo ang app na ito</b> <br/> <br/> Ginagamit ng <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ang nasa iyong screen para matukoy kung ano ang pwedeng i-autofill."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Gamitin ang <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Mase-save ang mga bagong password, passkey, at iba pang impormasyon dito mula ngayon. Puwdeng gamitin ng <xliff:g id=app_name example=Provider>%1$s</xliff:g> kung ano ang nasa screen mo para matukoy kung ano ang puwedeng i-autofill."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Mga password, passkey, at serbisyo sa data"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"I-off ang %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>I-off ang serbisyong ito?</b> <br/> <br/> Hindi pupunan ang mga naka-save na impormasyon tulad ng mga password, passkey, paraan ng pagbabayad, at iba pang impormasyon kapag nag-sign in ka. Para magamit ang iyong naka-save na impormasyon, pumili ng serbisyo ng password, passkey, o data."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c63b815..0e18374 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> kaldı"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Şarj olmasına <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> var"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Ekran başında kalma süresi"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Arka planda kullanım süresi"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Pil seviyesi düşük"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Uygulamanın arka planda çalışmasına izin verin"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Arka plan etkinliği sınırlansın mı?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Uygulama için arka plan etkinliğini sınırlarsanız hatalı davranabilir"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Uygulama, pili optimize etmek için ayarlanmadığından kısıtlanamaz.\n\nUygulamayı kısıtlamak için önce pil optimizasyonunu açın."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Pil kullanımını yönetme"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Kısıtlanmamış"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimize edilmiş"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Kısıtlı"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Toplam: Bir dakikadan az"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Arka planda: bir dakikadan az"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Ekran süresi: bir dakikadan az"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"1 dakikadan az"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Toplam: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Arka planda: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Ekran süresi: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"veri, şifre anahtarı, şifre"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"otomatik, doldurma, otomatik doldurma, veriler, geçiş anahtarı, şifre"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Bu uygulamaya güvendiğinizden emin olun</b> <br/> <br/> <xliff:g id=app_name example=Google Otomatik Doldurma>%1$s</xliff:g> otomatik doldurulabilecek öğeleri belirlemek için ekranınızdaki bilgileri kullanır."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g> kullanılsın mı?</b> <br/> <br/> Yeni şifreler, geçiş anahtarları ve diğer bilgiler artık buraya kaydedilecek. <xliff:g id=app_name example=Provider>%1$s</xliff:g> otomatik doldurulabilecek alanları belirlemek için ekranınızdaki bilgileri kullanabilir."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Şifreler, geçiş anahtarları ve veri hizmetleri"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s kapatılsın mı?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Bu hizmet kapatılsın mı?</b> <br/> <br/> Şifreler, geçiş anahtarları, ödeme yöntemleri gibi kayıtlı bilgiler ve diğer bilgiler oturum açtığınızda doldurulmaz. Kayıtlı bilgilerinizi kullanmak için bir şifre, geçiş anahtarı veya veri hizmeti seçin."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f79ca85..844cfc7 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Залишилося <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Залишилося заряджати <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Час використання пристрою"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Час роботи у фоновому режимі"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Низький заряд акумулятора"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Дозволити додаткам працювати у фоновому режимі"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Обмежити фонову активність?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Якщо обмежити фонову активність, додаток може працювати неналежним чином"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Оскільки в додатку не передбачено економію заряду акумулятора, його не можна обмежити.\n\nУвімкніть оптимізацію споживання заряду."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Використання заряду"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Без обмежень"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Оптимізовано"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Обмежено"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Усього: менше ніж хвилина"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"У фоновому режимі: менше ніж хвилина"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Час використання пристрою: менше ніж хвилина"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Менше ніж хвилина"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Усього: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"У фоновому режимі: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Час використання пристрою: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"дані, ключ доступу, пароль"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"автоматично, заповнення, автозаповнення, дані, ключ доступу, пароль"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Переконайтеся, що додаток надійний</b> <br/> <br/> <xliff:g id=app_name example=Функція Автозаповнення Google>%1$s</xliff:g> використовує інформацію на екрані, щоб визначати поля для автозаповнення."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Використовувати додаток <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Відтепер тут зберігатимуться нові паролі, ключі доступу й інша інформація. Додаток <xliff:g id=app_name example=Provider>%1$s</xliff:g> може використовувати інформацію на екрані, щоб визначати поля, які можна заповнити автоматично."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Сервіси керування паролями, ключами доступу й даними"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Вимкнути %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Вимкнути цей сервіс?</b> <br/> <br/> Збережена інформація, наприклад паролі, ключі доступу, способи оплати тощо, не буде підставлятись автоматично, коли ви ввійдете в обліковий запис. Щоб використовувати збережену інформацію, виберіть сервіс для паролів, ключів доступу або даних."</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index d04a50c..7b70702 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> باقی"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> چارج کرنے کیلئے"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"اسکرین کا وقت"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"پس منظر کا وقت"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"بیٹری کم ہے"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"ایپ کو پس منظر میں چلنے کی اجازت دیں"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"پس منظر کی سرگرمی کو محدود کریں؟"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"اگر آپ کسی ایپ کی پس منظر کی سرگرمی کو محدود کرتے ہیں تو یہ غلط برتاؤ کر سکتی ہے"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"چونکہ یہ ایپ بیٹری کی کارکردگی کو بہتر بنانے کیلئے نہیں ہے، لہذا آپ اسے محدود نہیں کر سکتے ہیں۔\n\nایپ کو محدود کرنے کیلئے، پہلے بیٹری کی کارکردگی کو بہتر بنانے کو آن کریں۔"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"بیٹری کے استعمال کا نظم کریں"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"(پابندی کے بغیر)"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"بہتر کردہ"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"محدود کردہ"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"کُل: ایک منٹ سے کم"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"پس منظر: ایک منٹ سے کم"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"اسکرین کا وقت: ایک منٹ سے کم"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"ایک منٹ سے کم"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"کُل: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"پس منظر: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"اسکرین کا وقت: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"ڈیٹا، پاس کی، پاس ورڈ"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"آٹو، فل، آٹو فل، ڈیٹا، پاس کی، پاس ورڈ"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>یہ یقینی بنائیں کہ آپ کو اس ایپ پر اعتماد ہے</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> آٹو فل کی جا سکنے والی چیزوں کی تعیین کیلئے آپ کی اسکرین پر موجود چیزوں کو استعمال کرتا ہے۔"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> نئے پاس ورڈز، پاس کیز اور دیگر معلومات اب سے یہاں محفوظ کی جائیں گی۔ <xliff:g id=app_name example=Provider>%1$s</xliff:g> آپ کی اسکرین پر موجود چیزوں کا استعمال کر سکتا ہے تاکہ یہ تعین کیا جا سکے کہ کیا آٹو فل ہو سکتا ہے۔"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"پاس ورڈز، پاس کیز اور ڈیٹا سروسز"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s کو آف کریں؟"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>یہ سروس آف کریں؟</b> <br/> <br/> جب آپ سائن ان کرتے ہیں تو محفوظ کردہ معلومات جیسے پاس ورڈ، پاس کیز، ادائیگی کے طریقے اور دیگر معلومات کو پُر نہیں کیا جائے گا۔ اپنی محفوظ کردہ معلومات کو استعمال کرنے کے لیے، پاس ورڈ، پاس کی، یا ڈیٹا سروس کا انتخاب کریں۔"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index fb48f75..9391aba 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"Batareya quvvati <xliff:g id="REMAIN">%1$s</xliff:g>dan so‘ng tugaydi"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"Batareya quvvati <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>dan so‘ng to‘ladi"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Foydalanish vaqti"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Fondagi faollik vaqti"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Batareya quvvati kam"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Ilovaga fonda ishlashiga ruxsat berish"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Fonda ishlashi cheklansinmi?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Bu ilovaning ishlashiga ta’sir ko‘rsatishi mumkin"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Bu ilova batareya sarfini optimallashtirish uchun sozlanmagani sababli uni cheklash imkonsiz.\n\nIlovani cheklash uchun avval batareya sarfini optimallashtirish funksiyasini yoqing."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Batareya sarfini boshqarish"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Cheklanmagan"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimallangan"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Cheklangan"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Jami: bir daqiqadan kam"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Orqa fon rejimida: bir daqiqadan kam"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Qurilmadan foydalanish vaqti: bir daqiqadan kam"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Bir daqiqadan kam"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Jami: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Orqa fon rejimi: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Qurilmadan foydalanish vaqti: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"maʼlumotlar, kod, parol"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"avtomatik, kiritish, avtomatik kiritish, maʼlumotlar, kalit, parol"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Bu ilova ishonchli ekanini tekshiring</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ekraningizda nimani avtomatik kiritish kerakligini aniqlaydi."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b><xliff:g id=app_name example=Provider>%1$s</xliff:g> ishlatilsinmi?</b> <br/> <br/> Endi yangi parollar, kalitlar va boshqa axborotlar shu yerda saqlanadi. <xliff:g id=app_name example=Provider>%1$s</xliff:g> ekrandagi elementlar yordamida avtomatik kiritish mumkin narsalarni aniqlashi mumkin."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Parollar, kalitlar va maʼlumot xizmatlari"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"%1$s faolsizlantirilsinmi?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Bu xizmat faolsizlantirilsinmi?</b> <br/> <br/> Hisobga kirganingizda saqlangan parollar, kalitlar, toʻlov usullari va boshqa maʼlumotlar avtomatik kiritilmaydi. Saqlangan axborotdan foydalanish uchun parol, kalit yoki axborot xizmatini tanlang."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8b46c5c..1e17934 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"<xliff:g id="REMAIN">%1$s</xliff:g> còn lại"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> để tính phí"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Thời gian sử dụng thiết bị"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"Thời gian chạy ở chế độ nền"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Pin yếu"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"Cho phép ứng dụng chạy trong nền"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Giới hạn hoạt động nền?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Nếu bạn giới hạn hoạt động nền cho một ứng dụng, ứng dụng đó có thể hoạt động không đúng cách"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Không thể hạn chế ứng dụng này vì bạn chưa đặt để tối ưu hóa pin.\n\nĐể hạn chế ứng dụng, trước tiên hãy bật tối ưu hóa pin."</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Quản lý mức sử dụng pin"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"Không hạn chế"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Tối ưu hóa"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Bị hạn chế"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"Tổng: chưa đến 1 phút"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"Ở chế độ nền: chưa đến 1 phút"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"Thời gian sử dụng thiết bị: chưa đến 1 phút"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"Dưới 1 phút"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"Tổng: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"Ở chế độ nền: <xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"Thời gian sử dụng thiết bị: <xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"dữ liệu, khoá truy cập, mật khẩu"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"tự động, điền, tự động điền, dữ liệu, khoá truy cập, mật khẩu"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Hãy đảm bảo bạn tin tưởng ứng dụng này</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> sử dụng thông tin trên màn hình để xác định nội dung nào có thể được tự động điền."</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Sử dụng <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Mật khẩu mới, khoá truy cập mới, cũng như các thông tin khác sẽ được lưu ở đây kể từ bây giờ. <xliff:g id=app_name example=Provider>%1$s</xliff:g> có thể dùng thông tin trên màn hình của bạn để xác định thông tin nào có thể tự động điền."</string>
<string name="credman_picker_title" msgid="8191267620665129205">"Dịch vụ dữ liệu, khoá truy cập và mật khẩu"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Tắt %1$s?"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>Tắt dịch vụ này?</b> <br/> <br/> Thông tin đã lưu (ví dụ: mật khẩu, khoá truy cập, phương thức thanh toán) và thông tin khác sẽ không được điền khi bạn đăng nhập. Để sử dụng thông tin mà bạn đã lưu, hãy chọn một mật khẩu, khoá truy cập hoặc dịch vụ dữ liệu."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 84301aa..9c46d5d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"还可用：<xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"充电剩余时间：<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"设备使用时间"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"后台运行时间"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"电池电量低"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"允许应用在后台运行"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"要限制后台活动吗？"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"如果您限制某个应用的后台活动，可能会导致该应用出现异常"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"由于此应用未设置为优化电池用量，因此您无法对其加以限制。\n\n要限制该应用，请先开启电池优化功能。"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"管理电池用量"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"无限制"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"优化"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"受限"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"总计：不到 1 分钟"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"后台：不到 1 分钟"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"设备使用时间：不到 1 分钟"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"不到 1 分钟"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"总计：<xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"后台：<xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"设备使用时间：<xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"数据, 通行密钥, 密码, data, passkey, password"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"自动, 填充, 自动填充, 数据, 通行密钥, 密码, auto, fill, autofill, data, passkey, password"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>请确认这是您信任的应用</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g>会根据您的屏幕内容判断可自动填充哪些内容。"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>要使用<xliff:g id=app_name example=Provider>%1$s</xliff:g>吗？</b> <br/> <br/>从现在起，系统会将新密码、通行密钥和其他信息保存在此处。<xliff:g id=app_name example=Provider>%1$s</xliff:g>可能会根据屏幕上的内容判断可以自动填充的内容。"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"密码、通行密钥和数据服务"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"要关闭%1$s吗？"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>停用此服务？</b> <br/> <br/>停用此服务后，当您登录时，系统不会填充密码、通行密钥、付款方式等已保存的信息以及其他信息。如需使用已保存的信息，请选择一个密码、通行密钥或数据服务。"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 14d66e7..b8195bb 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"剩餘 <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>後完成充電"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"裝置使用時間"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"背景執行時間"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"電量不足"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"允許應用程式在背景中執行"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"要限制背景活動嗎？"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"如果你限制應用程式的背景活動，應用程式可能無法正常運作"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"由於此應用程式並未設定為優化電池，你無法限制其使用。\n\n如要限制應用程式，請先開啟電池優化功能。"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"管理電池用量"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"無限制"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"優化"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"限制"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"總計：不足 1 分鐘"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"背景：不足 1 分鐘"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"裝置使用時間：不足 1 分鐘"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"少於 1 分鐘"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"總計：<xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"背景：<xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"裝置使用時間：<xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"資料, 密鑰, 密碼"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"自動, 填入, 自動填入, 資料, 密鑰, 密碼"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>請確定你信任此應用程式</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> 應用程式會根據你畫面上的內容判斷可自動填入的資料。"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>要使用「<xliff:g id=app_name example=Provider>%1$s</xliff:g>」嗎？</b> <br/> <br/> 從現在起，新的密碼、密鑰和其他資料都會儲存在這裡。「<xliff:g id=app_name example=Provider>%1$s</xliff:g>」可能會根據畫面內容判斷要自動填入的資料。"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"密碼、密鑰及資料服務"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"要關閉「%1$s」嗎？"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>要關閉此服務嗎？</b> <br/> <br/> 當你登入後，系統將不會填入密碼、密鑰、付款方法等其他已儲存的資料。如要使用已儲存的資料，請選擇密碼、密鑰或資料服務。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0f2b034..a5e1e47 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2244,17 +2244,14 @@
<string name="power_usage_level_and_status" msgid="821521456989429593">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="6997529817917076536">"還剩 <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
<string name="power_charge_remaining" msgid="7046064326172265116">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>後充電完畢"</string>
- <!-- no translation found for power_usage_detail_screen_time (6027274749498485283) -->
- <skip />
- <!-- no translation found for power_usage_detail_background_time (3661437083554322691) -->
- <skip />
+ <string name="power_usage_detail_screen_time" msgid="6027274749498485283">"前景執行時間"</string>
+ <string name="power_usage_detail_background_time" msgid="3661437083554322691">"背景執行時間"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"電池電力不足"</string>
<string name="background_activity_summary" msgid="3817376868497046016">"允許應用程式在背景執行"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"要限制背景活動嗎？"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"如果你限制應用程式的背景活動，應用程式可能無法正常運作"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"由於這個應用程式並未設為最佳化電池用量，因此你無法加以限制。\n\n如要限制應用程式，請先開啟電池效能最佳化功能。"</string>
- <!-- no translation found for manager_battery_usage_category_title (1493303237531629961) -->
- <skip />
+ <string name="manager_battery_usage_category_title" msgid="1493303237531629961">"管理電池用量"</string>
<string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"無限制"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"最佳化"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"受限制"</string>
@@ -2396,8 +2393,7 @@
<string name="battery_usage_total_less_than_one_minute" msgid="1035425863251685509">"總計：不到 1 分鐘"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="3957971442554437909">"背景：不到 1 分鐘"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="2911989465891679033">"裝置使用時間：少於 1 分鐘"</string>
- <!-- no translation found for power_usage_time_less_than_one_minute (8407404329381010144) -->
- <skip />
+ <string name="power_usage_time_less_than_one_minute" msgid="8407404329381010144">"不到 1 分鐘"</string>
<string name="battery_usage_for_total_time" msgid="8402254046930910905">"總計：<xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_for_background_time" msgid="9109637210617095188">"背景：<xliff:g id="TIME">%s</xliff:g>"</string>
<string name="battery_usage_screen_time" msgid="3973865893520804115">"裝置使用時間：<xliff:g id="TIME">%s</xliff:g>"</string>
@@ -4179,8 +4175,7 @@
<string name="credman_keywords" msgid="8305600680836806170">"資料, 密碼金鑰, 密碼"</string>
<string name="credman_autofill_keywords" msgid="701180623776848914">"自動、填入、自動填入、資料、密碼金鑰、密碼"</string>
<string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>請確定這是你信任的應用程式</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> 會根據畫面上顯示的內容判斷要自動填入哪些資訊。"</string>
- <!-- no translation found for credman_autofill_confirmation_message (843829628024668466) -->
- <skip />
+ <string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>要使用「<xliff:g id=app_name example=Provider>%1$s</xliff:g>」嗎？</b> <br/> <br/> 從現在起，新的密碼、密碼金鑰和其他資訊都會儲存在這裡。「<xliff:g id=app_name example=Provider>%1$s</xliff:g>」可能會根據畫面內容判斷可自動填入的資訊。"</string>
<string name="credman_picker_title" msgid="8191267620665129205">"密碼、密碼金鑰和資料服務"</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"要停用「%1$s」嗎？"</string>
<string name="credman_confirmation_message" msgid="2357324543658635239">"<b>要關閉這項服務嗎？</b> <br/> <br/> 當你登入後，系統將不會填入密碼、密碼金鑰、付款方式等其他已儲存的資訊。如要使用已儲存的資訊，請選擇所需的密碼、密碼金鑰或資料服務。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 7a4ddf6..e164a27 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -273,8 +273,7 @@
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Iyalayisha…"</string>
<string name="location_settings_footer_general" msgid="1040507068701188821">"Ama-app anemvume Yamadivayisi aeseduze angakhetha indawo ehambelanayo yamadivayisi axhunyiwe."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Ukufinyelela kwendawo kuvaliwe mayelana nama-app namasevisi. Indawo yedivayisi yakho isengathunyelwa kubaphenduli besimo esiphuthumayo uma ushaya ikholi noma uthumela umbhalo kwinombolo ephuthumayo."</string>
- <!-- no translation found for location_settings_footer_learn_more_content_description (349380666660145540) -->
- <skip />
+ <string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Funda kabanzi Ngamasethingi wendawo"</string>
<string name="account_settings_title" msgid="9138880127246241885">"Ama-akhawunti"</string>
<string name="security_settings_title" msgid="6710768415432791970">"Ukuphepha"</string>
<string name="encryption_and_credential_settings_title" msgid="5856216318961482983">"Ukubethela nokuqinisekisa"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 01a8126..484af0a 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1474,4 +1474,19 @@
<string-array name="terms_of_address_supported_languages">
<item>fr</item> <!-- French -->
</string-array>
+
+ <!-- Values for notification cooldown -->
+ <string-array name="notification_polite_options">
+ <item>@string/notification_polite_all_apps</item>
+ <item>@string/notification_polite_conversations</item>
+ <item>@string/notification_polite_disabled</item>
+ </string-array>
+
+ <!-- Values for notification cooldown -->
+ <string-array name="notification_polite_options_values" translatable="false">
+ <item>0</item>
+ <item>1</item>
+ <item>2</item>
+ </string-array>
+
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 87ba77b..7a467d5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3121,6 +3121,10 @@
<string name="carrier_enabled_summaryOff">APN disabled</string>
<!-- Edit Beaerer Info of APN -->
<string name="bearer">Bearer</string>
+ <!-- Edit Network Type Info of APN -->
+ <string name="network_type">Network type</string>
+ <!-- Network type unspecified -->
+ <string name="network_type_unspecified">Unspecified</string>
<!-- Edit Mvno Type Info of APN -->
<string name="mvno_type">MVNO type</string>
<!-- Edit Mvno Match Data Info of APN -->
@@ -5563,8 +5567,10 @@
<string name="battery_usage_without_time"></string>
<!-- Description for the specific time slot in the battery usage page [CHAR LIMIT=120] -->
<string name="battery_usage_since_last_full_charge">since last full charge</string>
- <!-- Description for system apps aggregated battery usage data [CHAR LIMIT=120] -->
+ <!-- Description for system apps aggregated battery usage data [CHAR LIMIT=120] -->
<string name="battery_usage_system_apps">System apps</string>
+ <!-- Description for uninstalled apps aggregated battery usage data [CHAR LIMIT=120] -->
+ <string name="battery_usage_uninstalled_apps">Uninstalled apps</string>
<!-- Description for others battery usage data [CHAR LIMIT=120] -->
<string name="battery_usage_others">Others</string>
@@ -6180,6 +6186,8 @@
<string name="account_settings_menu_auto_sync_personal">Auto-sync personal data</string>
<!-- Title for menu option to enable global auto-sync of work account data [CHAR LIMIT=30] -->
<string name="account_settings_menu_auto_sync_work">Auto-sync work data</string>
+ <!-- Title for menu option to enable global auto-sync of private account data [CHAR LIMIT=30] -->
+ <string name="account_settings_menu_auto_sync_private">Auto-sync private data</string>
<!-- Title for option to change data usage cycle day. [CHAR LIMIT=32] -->
<string name="data_usage_change_cycle">Change cycle\u2026</string>
@@ -8206,6 +8214,20 @@
<string name="notif_listener_more_settings">More settings</string>
<string name="notif_listener_more_settings_desc">More settings are available inside this app</string>
+ <!-- Title for Polite Notifications setting [CHAR LIMIT=30]-->
+ <string name="notification_polite_title">Notification cooldown</string>
+ <string name="notification_polite_all_apps">Apply cooldown to all notifications</string>
+ <string name="notification_polite_all_apps_summary">Gradually lower the notification volume when you get many successive notifications from the same app</string>
+ <string name="notification_polite_conversations">Apply cooldown to conversations</string>
+ <string name="notification_polite_conversations_summary">Gradually lower the notification volume when you get many messages from the same chat within a short period of time</string>
+ <string name="notification_polite_disabled">Don\'t use notification cooldown</string>
+ <string name="notification_polite_disabled_summary">Never lower notification volume, regardless of the amount of successive notifications from the same app</string>
+ <string name="notification_polite_vibrate_unlocked">Vibrate when unlocked</string>
+ <string name="notification_polite_vibrate_unlocked_summary">Only vibrate when screen is unlocked</string>
+ <string name="notification_polite_work">Apply to work profiles</string>
+ <string name="notification_polite_work_summary">Apply the notification cooldown settings from your personal profile to your work profile</string>
+
+
<!-- Title for managing VR (virtual reality) helper services. [CHAR LIMIT=50] -->
<string name="vr_listeners_title">VR helper services</string>
@@ -12473,4 +12495,21 @@
<string name="quarantined_apps_title" translatable="false">Quarantined Apps</string>
<!-- Do not translate. Developer settings: Button to unquarantine an app [CHAR LIMIT=20] -->
<string name="unquarantine_app_button" translatable="false">Unquarantine app</string>
+
+ <!-- Title of preference to manage content protection settings -->
+ <string name="content_protection_preference_title">Scanning for deceptive apps</string>
+ <!-- Summary of the preference to manage content protection settings -->
+ <string name="content_protection_preference_summary">Check app activity for phishing</string>
+ <!-- Title of the switch bar on the subpage of content protection settings -->
+ <string name="content_protection_preference_user_consent_switch_title">Use scanning</string>
+ <!-- Title of the toggle switch of work apps on the subpage of content protection settings -->
+ <string name="content_protection_preference_user_consent_work_profile_switch_title">Use scanning for work apps</string>
+ <!-- Summary of the subpage of content protection settings -->
+ <string name="content_protection_preference_subpage_summary">Scanning runs privately right on your device, checking app activity for phishing or other deceptive behavior. If it\’s detected, some app info is sent to Google Play Protect to confirm the threat and warn app users.</string>
+ <!-- Information at the bottom of the subpage of content protection settings -->
+ <string name="content_protection_preference_subpage_info">
+ <![CDATA[
+ This is a protected security feature. No device or personal info is shared with Google.
+ \n\nPhishing is an attempt to steal sign-in credentials or other personal info.
+ ]]></string>
</resources>
diff --git a/res/xml/accounts_private_dashboard_settings.xml b/res/xml/accounts_private_dashboard_settings.xml
new file mode 100644
index 0000000..79bcce9
--- /dev/null
+++ b/res/xml/accounts_private_dashboard_settings.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2023 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="user_and_account_settings_screen"
+ android:title="@string/account_dashboard_title"
+ settings:keywords="@string/keywords_accounts">
+
+ <PreferenceCategory
+ android:key="passwords_category"
+ android:order="10"
+ android:persistent="false"
+ android:title="@string/autofill_passwords"
+ settings:controller="com.android.settings.applications.autofill.PasswordsPreferenceController"
+ settings:keywords="@string/autofill_keywords" />
+
+ <PreferenceCategory
+ android:key="default_service_category"
+ android:order="20"
+ android:title="@string/autofill_app">
+
+ <com.android.settings.widget.GearPreference
+ android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
+ android:key="default_autofill_private"
+ android:title="@string/autofill_app"
+ settings:keywords="@string/autofill_keywords">
+ <extra
+ android:name="for_work"
+ android:value="false" />
+ </com.android.settings.widget.GearPreference>
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:key="dashboard_tile_placeholder"
+ android:order="130"/>
+
+ <SwitchPreference
+ android:key="auto_sync_account_data"
+ android:title="@string/auto_sync_account_title"
+ android:summary="@string/auto_sync_account_summary"
+ android:order="200"
+ settings:allowDividerAbove="true"/>
+
+ <SwitchPreference
+ android:key="auto_sync_private_account_data"
+ android:title="@string/account_settings_menu_auto_sync_private"
+ android:summary="@string/auto_sync_account_summary"
+ android:order="210"/>
+
+</PreferenceScreen>
diff --git a/res/xml/accounts_private_dashboard_settings_credman.xml b/res/xml/accounts_private_dashboard_settings_credman.xml
new file mode 100644
index 0000000..88b2736
--- /dev/null
+++ b/res/xml/accounts_private_dashboard_settings_credman.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="user_and_account_settings_screen"
+ android:title="@string/account_dashboard_title"
+ settings:keywords="@string/keywords_accounts">
+
+ <PreferenceCategory
+ android:key="default_service_category"
+ android:order="10"
+ android:title="@string/credman_chosen_app_title">
+
+ <com.android.settings.widget.GearPreference
+ android:fragment="com.android.settings.applications.credentials.DefaultCombinedPickerPrivate"
+ android:key="default_credman_autofill_private"
+ android:title="@string/credman_chosen_app_title"
+ settings:searchable="false">
+ settings:keywords="@string/credman_autofill_keywords">
+ <extra
+ android:name="for_work"
+ android:value="false" />
+ </com.android.settings.widget.GearPreference>
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:key="credman_category"
+ android:order="20"
+ android:persistent="false"
+ android:title="@string/credman_credentials"
+ settings:controller="com.android.settings.applications.credentials.CredentialManagerPreferenceController"
+ settings:keywords="@string/credman_keywords" />
+
+ <PreferenceCategory
+ android:key="dashboard_tile_placeholder"
+ android:order="130"/>
+
+ <SwitchPreference
+ android:key="auto_sync_account_data"
+ android:title="@string/auto_sync_account_title"
+ android:summary="@string/auto_sync_account_summary"
+ android:order="200"
+ settings:allowDividerAbove="true"/>
+
+ <SwitchPreference
+ android:key="auto_sync_private_account_data"
+ android:title="@string/account_settings_menu_auto_sync_private"
+ android:summary="@string/auto_sync_account_summary"
+ android:order="210"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/app_data_usage.xml b/res/xml/app_data_usage.xml
index aacc1f6..034015c 100644
--- a/res/xml/app_data_usage.xml
+++ b/res/xml/app_data_usage.xml
@@ -21,7 +21,8 @@
android:title="@string/data_usage_app_summary_title">
<com.android.settings.datausage.SpinnerPreference
- android:key="cycle" />
+ android:key="cycle"
+ settings:controller="com.android.settings.datausage.AppDataUsageCycleController" />
<PreferenceCategory
android:key="app_data_usage_summary_category">
@@ -56,7 +57,8 @@
<Preference
android:key="app_settings"
- android:title="@string/data_usage_app_settings" />
+ android:title="@string/data_usage_app_settings"
+ settings:controller="com.android.settings.datausage.AppDataUsageAppSettingsController" />
<com.android.settingslib.RestrictedSwitchPreference
android:key="restrict_background"
@@ -76,6 +78,7 @@
<PreferenceCategory
android:key="app_list"
- android:title="@string/data_usage_other_apps" />
+ android:title="@string/data_usage_other_apps"
+ settings:controller="com.android.settings.datausage.AppDataUsageListController" />
</PreferenceScreen>
diff --git a/res/xml/apps.xml b/res/xml/apps.xml
index 85d187c..c4313f6 100644
--- a/res/xml/apps.xml
+++ b/res/xml/apps.xml
@@ -111,9 +111,7 @@
android:key="advanced_category"
android:title="@string/advanced_apps"
android:order="21"
- android:visibility="gone"
- settings:searchable="false"
- settings:controller="com.android.settings.widget.PreferenceCategoryController">
+ settings:searchable="false">
<Preference
android:key="aspect_ratio_apps"
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index 32081cf..ee88215 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -180,5 +180,13 @@
android:title="@string/notification_assistant_title"
android:summary="@string/notification_assistant_summary"
settings:controller="com.android.settings.notification.NotificationAssistantPreferenceController"/>
+
+ <Preference
+ android:fragment="com.android.settings.notification.PoliteNotificationsPreferenceFragment"
+ android:key="polite_notifications_preference"
+ android:order="26"
+ android:persistent="false"
+ android:title="@string/notification_polite_title"
+ settings:controller="com.android.settings.notification.PoliteNotificationsPreferenceController" />
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/polite_notifications_settings.xml b/res/xml/polite_notifications_settings.xml
new file mode 100644
index 0000000..5e09c3b
--- /dev/null
+++ b/res/xml/polite_notifications_settings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2023 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:title="@string/notification_polite_title">
+
+ <com.android.settings.RestrictedListPreference
+ android:key="polite_notifications_pref_dlg"
+ android:persistent="false"
+ android:title="@string/notification_polite_title"
+ android:entries="@array/notification_polite_options"
+ android:entryValues="@array/notification_polite_options_values"
+ settings:controller="com.android.settings.notification.PoliteNotificationFilterController"/>
+
+ <SwitchPreference
+ android:key="notification_polite_vibrate_unlocked"
+ android:persistent="false"
+ android:title="@string/notification_polite_vibrate_unlocked"
+ android:summary="@string/notification_polite_vibrate_unlocked_summary"
+ settings:controller="com.android.settings.notification.PoliteNotifVibrateUnlockedToggleController" />
+
+ <SwitchPreference
+ android:key="notification_polite_work_profile"
+ android:persistent="false"
+ android:title="@string/notification_polite_work"
+ android:summary="@string/notification_polite_work_summary"
+ settings:controller="com.android.settings.notification.PoliteNotifWorkProfileToggleController" />
+
+</PreferenceScreen>
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
deleted file mode 100644
index eadea68..0000000
--- a/res/xml/wifi_settings.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:title="@string/wifi_settings"
- settings:keywords="@string/keywords_wifi">
-
- <com.android.settings.wifi.LinkablePreference
- android:key="wifi_status_message"/>
-
- <PreferenceCategory
- android:key="connected_access_point"
- android:layout="@layout/preference_category_no_label"/>
-
- <PreferenceCategory
- android:key="access_points"
- android:layout="@layout/preference_category_no_label"/>
-
- <Preference
- android:key="configure_wifi_settings"
- android:title="@string/wifi_configure_settings_preference_title"
- settings:allowDividerAbove="true"
- android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>
-
- <Preference
- android:key="saved_networks"
- android:title="@string/wifi_saved_access_points_label"
- android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"/>
-
- <com.android.settings.datausage.DataUsagePreference
- android:key="wifi_data_usage"
- android:title="@string/wifi_data_usage"/>
-</PreferenceScreen>
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index b41650c..29eabdb 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -18,6 +18,9 @@
import static android.content.Intent.EXTRA_USER;
import static android.content.Intent.EXTRA_USER_ID;
+import static android.os.UserManager.USER_TYPE_FULL_SYSTEM;
+import static android.os.UserManager.USER_TYPE_PROFILE_MANAGED;
+import static android.os.UserManager.USER_TYPE_PROFILE_PRIVATE;
import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
import static android.text.format.DateUtils.FORMAT_SHOW_DATE;
@@ -63,6 +66,7 @@
import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
+import android.os.Flags;
import android.os.IBinder;
import android.os.INetworkManagementService;
import android.os.RemoteException;
@@ -111,6 +115,7 @@
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.dashboard.profileselector.ProfileFragmentBridge;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment.ProfileType;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.widget.ActionBarShadowController;
import com.android.settingslib.widget.AdaptiveIcon;
@@ -118,6 +123,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
+import java.util.Objects;
import java.util.Set;
public final class Utils extends com.android.settingslib.Utils {
@@ -441,6 +447,38 @@
}
/**
+ * Returns the profile of userType of the current user or {@code null} if none is found or a
+ * profile exists, but it is disabled.
+ */
+ @Nullable
+ public static UserHandle getProfileOfType(
+ @NonNull UserManager userManager, @ProfileType int userType) {
+ final List<UserHandle> userProfiles = userManager.getUserProfiles();
+ String umUserType = getUmUserType(userType);
+ for (UserHandle profile : userProfiles) {
+ if (profile.getIdentifier() == UserHandle.myUserId()) {
+ continue;
+ }
+ final UserInfo userInfo = userManager.getUserInfo(profile.getIdentifier());
+ if (Objects.equals(umUserType, userInfo.userType)) {
+ return profile;
+ }
+ }
+ return null;
+ }
+
+ private static String getUmUserType(@ProfileType int userType) throws IllegalArgumentException {
+ if (userType == ProfileType.WORK) {
+ return USER_TYPE_PROFILE_MANAGED;
+ } else if (userType == ProfileType.PRIVATE) {
+ return USER_TYPE_PROFILE_PRIVATE;
+ } else if (userType == ProfileType.PERSONAL) {
+ return USER_TYPE_FULL_SYSTEM;
+ }
+ throw new IllegalArgumentException("Cannot get user type for ALL types");
+ }
+
+ /**
* 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.
*/
@@ -479,15 +517,20 @@
return UserHandle.USER_NULL;
}
- /** Returns user ID of current user, throws IllegalStateException if it's not available. */
- public static int getCurrentUserId(UserManager userManager, boolean isWorkProfile)
- throws IllegalStateException {
- if (isWorkProfile) {
- final UserHandle managedUserHandle = getManagedProfile(userManager);
- if (managedUserHandle == null) {
- throw new IllegalStateException("Work profile user ID is not available.");
+ /**
+ * Returns user ID of the user of specified type under the current context, throws
+ * IllegalStateException if it's not available.
+ */
+ public static int getCurrentUserIdOfType(
+ @NonNull UserManager userManager,
+ @ProfileType int userType) throws IllegalStateException {
+ if (userType != ProfileType.PERSONAL) {
+ final UserHandle userHandle = getProfileOfType(userManager, userType);
+ if (userHandle == null) {
+ throw new IllegalStateException("User ID of requested profile type is not "
+ + "available.");
}
- return managedUserHandle.getIdentifier();
+ return userHandle.getIdentifier();
}
return UserHandle.myUserId();
}
@@ -1223,8 +1266,10 @@
List<UserHandle> profiles = userManager.getUserProfiles();
for (UserHandle userHandle : profiles) {
UserProperties userProperties = userManager.getUserProperties(userHandle);
- if (userProperties.getShowInSettings()
- == UserProperties.SHOW_IN_SETTINGS_SEPARATE) {
+ if (userProperties.getShowInSettings() == UserProperties.SHOW_IN_SETTINGS_SEPARATE) {
+ if (Flags.allowPrivateProfile() && userProperties.getHideInSettingsInQuietMode()) {
+ return !userManager.isQuietModeEnabled(userHandle);
+ }
return true;
}
}
diff --git a/src/com/android/settings/accounts/AccountDashboardFragment.java b/src/com/android/settings/accounts/AccountDashboardFragment.java
index 7816fd7..81aefd9 100644
--- a/src/com/android/settings/accounts/AccountDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDashboardFragment.java
@@ -31,14 +31,17 @@
import com.android.settings.applications.autofill.PasswordsPreferenceController;
import com.android.settings.applications.credentials.CredentialManagerPreferenceController;
import com.android.settings.applications.credentials.DefaultCombinedPreferenceController;
+import com.android.settings.applications.credentials.DefaultPrivateCombinedPreferenceController;
import com.android.settings.applications.credentials.DefaultWorkCombinedPreferenceController;
import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController;
+import com.android.settings.applications.defaultapps.DefaultPrivateAutofillPreferenceController;
import com.android.settings.applications.defaultapps.DefaultWorkAutofillPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.users.AutoSyncDataPreferenceController;
import com.android.settings.users.AutoSyncPersonalDataPreferenceController;
+import com.android.settings.users.AutoSyncPrivateDataPreferenceController;
import com.android.settings.users.AutoSyncWorkDataPreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
@@ -111,9 +114,11 @@
if (CredentialManager.isServiceEnabled(context)) {
controllers.add(new DefaultCombinedPreferenceController(context));
controllers.add(new DefaultWorkCombinedPreferenceController(context));
+ controllers.add(new DefaultPrivateCombinedPreferenceController(context));
} else {
controllers.add(new DefaultAutofillPreferenceController(context));
controllers.add(new DefaultWorkAutofillPreferenceController(context));
+ controllers.add(new DefaultPrivateAutofillPreferenceController(context));
}
}
@@ -132,6 +137,7 @@
controllers.add(new AutoSyncDataPreferenceController(context, parent));
controllers.add(new AutoSyncPersonalDataPreferenceController(context, parent));
controllers.add(new AutoSyncWorkDataPreferenceController(context, parent));
+ controllers.add(new AutoSyncPrivateDataPreferenceController(context, parent));
}
private static int getPreferenceLayoutResId(Context context) {
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index db6a4ae..33b3888 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -296,14 +296,15 @@
updateProfileUi(userInfo);
} else {
List<UserInfo> profiles = mUm.getProfiles(UserHandle.myUserId());
- final int profilesCount = profiles.size();
- for (int i = 0; i < profilesCount; i++) {
- if (profiles.get(i).isManagedProfile()
- && (mType & ProfileSelectFragment.ProfileType.WORK) != 0) {
- updateProfileUi(profiles.get(i));
- } else if (!profiles.get(i).isManagedProfile()
- && (mType & ProfileSelectFragment.ProfileType.PERSONAL) != 0) {
- updateProfileUi(profiles.get(i));
+ for (UserInfo profile : profiles) {
+ if ((profile.isManagedProfile()
+ && (mType & ProfileSelectFragment.ProfileType.WORK) != 0)
+ || (profile.isPrivateProfile()
+ && (mType & ProfileSelectFragment.ProfileType.PRIVATE) != 0)
+ || (!profile.isManagedProfile()
+ && !profile.isPrivateProfile()
+ && (mType & ProfileSelectFragment.ProfileType.PERSONAL) != 0)) {
+ updateProfileUi(profile);
}
}
}
diff --git a/src/com/android/settings/accounts/AccountPrivateDashboardFragment.java b/src/com/android/settings/accounts/AccountPrivateDashboardFragment.java
new file mode 100644
index 0000000..9794b4a
--- /dev/null
+++ b/src/com/android/settings/accounts/AccountPrivateDashboardFragment.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2023 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.accounts;
+
+import static android.provider.Settings.EXTRA_AUTHORITIES;
+
+import static com.android.settings.accounts.AccountDashboardFragment.buildAutofillPreferenceControllers;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.credentials.CredentialManager;
+
+import com.android.settings.R;
+import com.android.settings.applications.autofill.PasswordsPreferenceController;
+import com.android.settings.applications.credentials.CredentialManagerPreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
+import com.android.settings.users.AutoSyncDataPreferenceController;
+import com.android.settings.users.AutoSyncPrivateDataPreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AccountPrivateDashboardFragment extends DashboardFragment {
+ private static final String TAG = "AccountPrivateFrag";
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.ACCOUNT_PRIVATE;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ if (this.getContext() != null && CredentialManager.isServiceEnabled(this.getContext())) {
+ return R.xml.accounts_private_dashboard_settings_credman;
+ }
+ return R.xml.accounts_private_dashboard_settings;
+ }
+
+ @Override
+ public int getHelpResource() {
+ return R.string.help_url_user_and_account_dashboard;
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ if (CredentialManager.isServiceEnabled(context)) {
+ CredentialManagerPreferenceController cmpp =
+ use(CredentialManagerPreferenceController.class);
+ CredentialManagerPreferenceController.Delegate delegate =
+ new CredentialManagerPreferenceController.Delegate() {
+ public void setActivityResult(int resultCode) {
+ getActivity().setResult(resultCode);
+ }
+ public void forceDelegateRefresh() {
+ forceUpdatePreferences();
+ }
+ };
+ cmpp.init(this, getFragmentManager(), getIntent(), delegate, /*isWorkProfile=*/false);
+ } else {
+ getSettingsLifecycle().addObserver(use(PasswordsPreferenceController.class));
+ }
+ }
+
+ @Override
+ protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+ final List<AbstractPreferenceController> controllers = new ArrayList<>();
+ buildAutofillPreferenceControllers(context, controllers);
+ final String[] authorities = getIntent().getStringArrayExtra(EXTRA_AUTHORITIES);
+ buildAccountPreferenceControllers(context, authorities, controllers);
+ return controllers;
+ }
+
+ private void buildAccountPreferenceControllers(
+ Context context,
+ String[] authorities,
+ List<AbstractPreferenceController> controllers) {
+ final AccountPreferenceController accountPrefController =
+ new AccountPreferenceController(
+ context,
+ this,
+ authorities,
+ ProfileSelectFragment.ProfileType.PRIVATE);
+ controllers.add(accountPrefController);
+ controllers.add(new AutoSyncDataPreferenceController(context, this));
+ controllers.add(new AutoSyncPrivateDataPreferenceController(context, this));
+ }
+}
diff --git a/src/com/android/settings/applications/AdvancedAppsPreferenceCategoryController.java b/src/com/android/settings/applications/AdvancedAppsPreferenceCategoryController.java
new file mode 100644
index 0000000..6a518fd
--- /dev/null
+++ b/src/com/android/settings/applications/AdvancedAppsPreferenceCategoryController.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2023 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.applications;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.widget.PreferenceCategoryController;
+
+/**
+ * Preference category controller for Advanced category under Apps page
+ */
+public class AdvancedAppsPreferenceCategoryController extends PreferenceCategoryController {
+
+ public AdvancedAppsPreferenceCategoryController(@NonNull Context context,
+ @NonNull String preferenceKey) {
+ super(context, preferenceKey);
+ }
+}
diff --git a/src/com/android/settings/applications/AppDashboardFragment.java b/src/com/android/settings/applications/AppDashboardFragment.java
index 11f8405..41160d8 100644
--- a/src/com/android/settings/applications/AppDashboardFragment.java
+++ b/src/com/android/settings/applications/AppDashboardFragment.java
@@ -20,9 +20,12 @@
import android.content.Context;
import android.provider.SearchIndexableResource;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
+import com.android.settings.applications.appcompat.UserAspectRatioAppsPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.PreferenceCategoryController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
@@ -35,11 +38,21 @@
public class AppDashboardFragment extends DashboardFragment {
private static final String TAG = "AppDashboardFragment";
+ private static final String ADVANCED_CATEGORY_KEY = "advanced_category";
+ private static final String ASPECT_RATIO_PREF_KEY = "aspect_ratio_apps";
private AppsPreferenceController mAppsPreferenceController;
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new AppsPreferenceController(context));
+
+ final UserAspectRatioAppsPreferenceController aspectRatioAppsPreferenceController =
+ new UserAspectRatioAppsPreferenceController(context, ASPECT_RATIO_PREF_KEY);
+ final AdvancedAppsPreferenceCategoryController advancedCategoryController =
+ new AdvancedAppsPreferenceCategoryController(context, ADVANCED_CATEGORY_KEY);
+ advancedCategoryController.setChildren(List.of(aspectRatioAppsPreferenceController));
+ controllers.add(advancedCategoryController);
+
return controllers;
}
@@ -75,6 +88,11 @@
getSettingsLifecycle().addObserver(hibernatedAppsPreferenceController);
}
+ @VisibleForTesting
+ PreferenceCategoryController getAdvancedAppsPreferenceCategoryController() {
+ return use(AdvancedAppsPreferenceCategoryController.class);
+ }
+
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context);
diff --git a/src/com/android/settings/applications/ProcStatsData.java b/src/com/android/settings/applications/ProcStatsData.java
index 7742e98..aedb066 100644
--- a/src/com/android/settings/applications/ProcStatsData.java
+++ b/src/com/android/settings/applications/ProcStatsData.java
@@ -29,6 +29,8 @@
import android.util.LongSparseArray;
import android.util.SparseArray;
+import androidx.annotation.WorkerThread;
+
import com.android.internal.app.ProcessMap;
import com.android.internal.app.procstats.DumpUtils;
import com.android.internal.app.procstats.IProcessStats;
@@ -85,24 +87,10 @@
}
}
- public void setTotalTime(int totalTime) {
- memTotalTime = totalTime;
- }
-
public void xferStats() {
sStatsXfer = mStats;
}
- public void setMemStates(int[] memStates) {
- mMemStates = memStates;
- refreshStats(false);
- }
-
- public void setStats(int[] stats) {
- this.mStates = stats;
- refreshStats(false);
- }
-
public int getMemState() {
int factor = mStats.mMemFactor;
if (factor == ProcessStats.ADJ_NOTHING) {
@@ -118,15 +106,13 @@
return mMemInfo;
}
- public long getElapsedTime() {
- return mStats.mTimePeriodEndRealtime - mStats.mTimePeriodStartRealtime;
- }
-
+ /**
+ * Sets the duration.
+ *
+ * <p>Note: {@link #refreshStats(boolean)} needs to called manually to take effect.
+ */
public void setDuration(long duration) {
- if (duration != mDuration) {
- mDuration = duration;
- refreshStats(true);
- }
+ mDuration = duration;
}
public long getDuration() {
@@ -137,6 +123,12 @@
return pkgEntries;
}
+ /**
+ * Refreshes the stats.
+ *
+ * <p>Note: This needs to be called manually to take effect.
+ */
+ @WorkerThread
public void refreshStats(boolean forceLoad) {
if (mStats == null || forceLoad) {
load();
diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
index 32662a2..baa1daf 100644
--- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appinfo;
import android.content.Context;
-import android.net.NetworkStats;
import android.net.NetworkTemplate;
import android.os.Bundle;
import android.os.Process;
@@ -34,8 +33,8 @@
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.datausage.AppDataUsage;
-import com.android.settings.datausage.DataUsageUtils;
-import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.datausage.lib.NetworkTemplates;
+import com.android.settings.spa.app.appinfo.AppDataUsagePreferenceKt;
import com.android.settingslib.AppItem;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -46,6 +45,10 @@
import java.util.List;
+/**
+ * @deprecated Will be removed, use {@link AppDataUsagePreferenceKt} instead.
+ */
+@Deprecated(forRemoval = true)
public class AppDataUsagePreferenceController extends AppInfoPreferenceControllerBase
implements LoaderManager.LoaderCallbacks<List<NetworkCycleDataForUid>>, LifecycleObserver,
OnResume, OnPause {
@@ -92,7 +95,7 @@
@Override
public Loader<List<NetworkCycleDataForUid>> onCreateLoader(int id, Bundle args) {
- final NetworkTemplate template = getTemplate(mContext);
+ final NetworkTemplate template = NetworkTemplates.INSTANCE.getDefaultTemplate(mContext);
final int uid = mParent.getAppEntry().info.uid;
final NetworkCycleDataForUidLoader.Builder builder =
@@ -147,18 +150,6 @@
return mContext.getString(R.string.computing_size);
}
- private static NetworkTemplate getTemplate(Context context) {
- if (SubscriptionUtil.isSimHardwareVisible(context)
- && DataUsageUtils.hasReadyMobileRadio(context)) {
- return new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE).setMeteredness(
- NetworkStats.METERED_YES).build();
- }
- if (DataUsageUtils.hasWifiRadio(context)) {
- return new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build();
- }
- return new NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build();
- }
-
@VisibleForTesting
boolean isBandwidthControlEnabled() {
return Utils.isBandwidthControlEnabled();
diff --git a/src/com/android/settings/applications/autofill/PasswordsPreferenceController.java b/src/com/android/settings/applications/autofill/PasswordsPreferenceController.java
index 03a551f..73fef1b 100644
--- a/src/com/android/settings/applications/autofill/PasswordsPreferenceController.java
+++ b/src/com/android/settings/applications/autofill/PasswordsPreferenceController.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.autofill;
import static android.app.admin.DevicePolicyResources.Strings.Settings.AUTO_SYNC_PERSONAL_DATA;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.AUTO_SYNC_PRIVATE_DATA;
import static android.app.admin.DevicePolicyResources.Strings.Settings.AUTO_SYNC_WORK_DATA;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.service.autofill.AutofillService.EXTRA_RESULT;
@@ -122,6 +123,8 @@
AUTO_SYNC_PERSONAL_DATA, R.string.account_settings_menu_auto_sync_personal);
replaceEnterpriseStringTitle(screen, "auto_sync_work_account_data",
AUTO_SYNC_WORK_DATA, R.string.account_settings_menu_auto_sync_work);
+ replaceEnterpriseStringTitle(screen, "auto_sync_private_account_data",
+ AUTO_SYNC_PRIVATE_DATA, R.string.account_settings_menu_auto_sync_private);
}
private void addPasswordPreferences(
diff --git a/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java b/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
index 98d56cc..de06806 100644
--- a/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
+++ b/src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
@@ -45,7 +45,6 @@
import android.provider.Settings;
import android.service.autofill.AutofillServiceInfo;
import android.text.TextUtils;
-import android.util.IconDrawableFactory;
import android.util.Log;
import android.view.View;
import android.widget.Switch;
@@ -96,9 +95,11 @@
private static final String ALTERNATE_INTENT = "android.settings.SYNC_SETTINGS";
private static final String PRIMARY_INTENT = "android.settings.CREDENTIAL_PROVIDER";
private static final int MAX_SELECTABLE_PROVIDERS = 5;
+ private static final String SETTINGS_ACTIVITY_INTENT_ACTION = "android.intent.action.MAIN";
+ private static final String SETTINGS_ACTIVITY_INTENT_CATEGORY =
+ "android.intent.category.LAUNCHER";
private final PackageManager mPm;
- private final IconDrawableFactory mIconFactory;
private final List<CredentialProviderInfo> mServices;
private final Set<String> mEnabledPackageNames;
private final @Nullable CredentialManager mCredentialManager;
@@ -119,7 +120,6 @@
public CredentialManagerPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mPm = context.getPackageManager();
- mIconFactory = IconDrawableFactory.newInstance(mContext);
mServices = new ArrayList<>();
mEnabledPackageNames = new HashSet<>();
mExecutor = ContextCompat.getMainExecutor(mContext);
@@ -484,13 +484,22 @@
continue;
}
+ // Get the settings activity.
+ CharSequence settingsActivity =
+ combinedInfo.getCredentialProviderInfos().get(0).getSettingsActivity();
+
Drawable icon = combinedInfo.getAppIcon(context, getUser());
CharSequence title = combinedInfo.getAppName(context);
// Build the pref and add it to the output & group.
CombiPreference pref =
addProviderPreference(
- context, title, icon, packageName, combinedInfo.getSettingsSubtitle());
+ context,
+ title == null ? "" : title,
+ icon,
+ packageName,
+ combinedInfo.getSettingsSubtitle(),
+ settingsActivity);
output.put(packageName, pref);
group.addPreference(pref);
}
@@ -510,7 +519,8 @@
label == null ? "" : label,
service.getServiceIcon(mContext),
service.getServiceInfo().packageName,
- service.getSettingsSubtitle());
+ service.getSettingsSubtitle(),
+ service.getSettingsActivity());
}
/**
@@ -569,43 +579,90 @@
@NonNull CharSequence title,
@Nullable Drawable icon,
@NonNull String packageName,
- @Nullable CharSequence subtitle) {
+ @Nullable CharSequence subtitle,
+ @Nullable CharSequence settingsActivity) {
final CombiPreference pref =
new CombiPreference(prefContext, mEnabledPackageNames.contains(packageName));
pref.setTitle(title);
if (icon != null) {
- pref.setIcon(Utils.getSafeIcon(icon));
+ pref.setIcon(icon);
}
+ pref.setLayoutResource(R.layout.preference_icon_credman);
+
if (subtitle != null) {
pref.setSummary(subtitle);
}
pref.setPreferenceListener(
- (p, isChecked) -> {
- if (isChecked) {
- if (mEnabledPackageNames.size() >= MAX_SELECTABLE_PROVIDERS) {
- // Show the error if too many enabled.
- pref.setChecked(false);
- final DialogFragment fragment = newErrorDialogFragment();
+ new CombiPreference.OnCombiPreferenceClickListener() {
+ @Override
+ public void onCheckChanged(CombiPreference p, boolean isChecked) {
+ if (isChecked) {
+ if (mEnabledPackageNames.size() >= MAX_SELECTABLE_PROVIDERS) {
+ // Show the error if too many enabled.
+ pref.setChecked(false);
+ final DialogFragment fragment = newErrorDialogFragment();
- if (fragment == null || mFragmentManager == null) {
+ if (fragment == null || mFragmentManager == null) {
+ return;
+ }
+
+ fragment.show(mFragmentManager, ErrorDialogFragment.TAG);
return;
}
- fragment.show(mFragmentManager, ErrorDialogFragment.TAG);
+ togglePackageNameEnabled(packageName);
+
+ // Enable all prefs.
+ if (mPrefs.containsKey(packageName)) {
+ mPrefs.get(packageName).setChecked(true);
+ }
+ } else {
+ togglePackageNameDisabled(packageName);
+ }
+ }
+
+ @Override
+ public void onLeftSideClicked() {
+ if (settingsActivity == null) {
+ Log.w(TAG, "settingsActivity was null");
return;
}
- togglePackageNameEnabled(packageName);
-
- // Enable all prefs.
- if (mPrefs.containsKey(packageName)) {
- mPrefs.get(packageName).setChecked(true);
+ String settingsActivityStr = String.valueOf(settingsActivity);
+ ComponentName cn = ComponentName.unflattenFromString(settingsActivityStr);
+ if (cn == null) {
+ Log.w(
+ TAG,
+ "Failed to deserialize settingsActivity attribute, we got: "
+ + settingsActivityStr);
+ return;
}
- } else {
- togglePackageNameDisabled(packageName);
+
+ Intent intent = new Intent(SETTINGS_ACTIVITY_INTENT_ACTION);
+ intent.addCategory(SETTINGS_ACTIVITY_INTENT_CATEGORY);
+ intent.setComponent(cn);
+
+ Context context = mContext;
+ int currentUserId = getUser();
+ int contextUserId = context.getUser().getIdentifier();
+
+ if (currentUserId != contextUserId) {
+ Log.d(
+ TAG,
+ "onLeftSideClicked(): using context for current user ("
+ + currentUserId
+ + ") instead of user "
+ + contextUserId
+ + " on headless system user mode");
+ context =
+ context.createContextAsUser(
+ UserHandle.of(currentUserId), /* flags= */ 0);
+ }
+
+ context.startActivity(intent);
}
});
@@ -921,6 +978,9 @@
public interface OnCombiPreferenceClickListener {
/** Called when the check is updated */
void onCheckChanged(CombiPreference p, boolean isChecked);
+
+ /** Called when the left side is clicked. */
+ void onLeftSideClicked();
}
public CombiPreference(Context context, boolean initialValue) {
@@ -969,6 +1029,18 @@
// Store this for later.
mSwitch = switchView;
}
+
+ super.setOnPreferenceClickListener(
+ new Preference.OnPreferenceClickListener() {
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ if (mOnClickListener != null) {
+ mOnClickListener.onLeftSideClicked();
+ }
+
+ return true;
+ }
+ });
}
}
}
diff --git a/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java b/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java
new file mode 100644
index 0000000..722cb1a
--- /dev/null
+++ b/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2023 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.applications.credentials;
+
+import android.os.UserManager;
+
+import com.android.settings.Utils;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment.ProfileType;
+
+public class DefaultCombinedPickerPrivate extends DefaultCombinedPicker {
+ @Override
+ protected int getUser() {
+ UserManager userManager = getContext().getSystemService(UserManager.class);
+ return Utils.getCurrentUserIdOfType(userManager, ProfileType.PRIVATE);
+ }
+}
diff --git a/src/com/android/settings/applications/credentials/DefaultPrivateCombinedPreferenceController.kt b/src/com/android/settings/applications/credentials/DefaultPrivateCombinedPreferenceController.kt
new file mode 100644
index 0000000..d606f3c
--- /dev/null
+++ b/src/com/android/settings/applications/credentials/DefaultPrivateCombinedPreferenceController.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2023 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.applications.credentials
+
+import android.content.Context
+import android.content.Intent
+import android.os.UserHandle
+import com.android.settings.Utils
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment
+import com.android.settingslib.applications.DefaultAppInfo
+
+class DefaultPrivateCombinedPreferenceController(context: Context?) : DefaultCombinedPreferenceController(context) {
+ private val userHandle: UserHandle? =
+ Utils.getProfileOfType(mUserManager, ProfileSelectFragment.ProfileType.PRIVATE)
+
+ override fun isAvailable(): Boolean {
+ return if (userHandle == null) {
+ false
+ } else super.isAvailable()
+ }
+
+ override fun getPreferenceKey(): String {
+ return "default_credman_autofill_private"
+ }
+
+ override fun getSettingIntent(info: DefaultAppInfo ?): Intent ? {
+ if (info == null) {
+ return null
+ }
+ return userHandle?.let { handle ->
+ AutofillSettingIntentProvider(mContext, handle.identifier, info.key).intent
+ } ?: null
+ }
+
+ override fun startActivity(intent: Intent) {
+ userHandle?.let { handle ->
+ mContext.startActivityAsUser(intent, handle)
+ }
+ }
+
+ override fun getUser(): Int {
+ return userHandle?.identifier ?: UserHandle.myUserId()
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/defaultapps/DefaultPrivateAutofillPreferenceController.kt b/src/com/android/settings/applications/defaultapps/DefaultPrivateAutofillPreferenceController.kt
new file mode 100644
index 0000000..67211b4
--- /dev/null
+++ b/src/com/android/settings/applications/defaultapps/DefaultPrivateAutofillPreferenceController.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2023 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.applications.defaultapps
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.os.UserHandle
+import android.provider.Settings
+import android.text.TextUtils
+import com.android.settings.Utils
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment
+import com.android.settingslib.applications.DefaultAppInfo
+
+class DefaultPrivateAutofillPreferenceController(context: Context?) : DefaultAutofillPreferenceController(context) {
+ private val userHandle: UserHandle? = Utils
+ .getProfileOfType(mUserManager, ProfileSelectFragment.ProfileType.PRIVATE)
+
+ override fun isAvailable(): Boolean {
+ return if (userHandle == null) {
+ false
+ } else super.isAvailable()
+ }
+
+ override fun getPreferenceKey(): String {
+ return "default_autofill_private"
+ }
+
+ override fun getDefaultAppInfo(): DefaultAppInfo ? {
+ val flattenComponent = userHandle?.let { handle ->
+ Settings.Secure.getStringForUser(
+ mContext.contentResolver,
+ DefaultAutofillPicker.SETTING,
+ handle.identifier
+ )
+ }
+ return if (!flattenComponent.isNullOrEmpty()) {
+ userHandle?.let {
+ DefaultAppInfo(
+ mContext,
+ mPackageManager,
+ it.identifier,
+ ComponentName.unflattenFromString(flattenComponent))
+ }
+ } else null
+ }
+
+ override fun startActivity(intent: Intent) {
+ if (userHandle == null) {
+ mContext.startActivityAsUser(intent, UserHandle.CURRENT)
+ } else mContext.startActivityAsUser(intent, userHandle)
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/backup/SettingsBackupHelper.java b/src/com/android/settings/backup/SettingsBackupHelper.java
index a682df8..ad7e314 100644
--- a/src/com/android/settings/backup/SettingsBackupHelper.java
+++ b/src/com/android/settings/backup/SettingsBackupHelper.java
@@ -16,10 +16,13 @@
package com.android.settings.backup;
+import static com.android.settings.localepicker.LocaleNotificationDataManager.LOCALE_NOTIFICATION;
+
import android.app.backup.BackupAgentHelper;
import android.app.backup.BackupDataInputStream;
import android.app.backup.BackupDataOutput;
import android.app.backup.BackupHelper;
+import android.app.backup.SharedPreferencesBackupHelper;
import android.os.ParcelFileDescriptor;
import com.android.settings.fuelgauge.BatteryBackupHelper;
@@ -33,12 +36,15 @@
* Backup agent for Settings APK
*/
public class SettingsBackupHelper extends BackupAgentHelper {
+ private static final String PREF_LOCALE_NOTIFICATION = "localeNotificationSharedPref";
@Override
public void onCreate() {
super.onCreate();
addHelper("no-op", new NoOpHelper());
addHelper(BatteryBackupHelper.TAG, new BatteryBackupHelper(this));
+ addHelper(PREF_LOCALE_NOTIFICATION,
+ new SharedPreferencesBackupHelper(this, LOCALE_NOTIFICATION));
}
@Override
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index c62ab3b..be2a948 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -203,6 +203,10 @@
final int currentDensity = displayDensity.getDefaultDisplayDensityValues()
[currentDensityIndex];
final int defaultDensity = displayDensity.getDefaultDensityForDefaultDisplay();
+
+ if (getResources().getConfiguration().fontScale > 1) {
+ return false;
+ }
return defaultDensity == currentDensity;
}
diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt
index 31afcb7..58fcea6 100644
--- a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/activity/FingerprintEnrollmentV2Activity.kt
@@ -42,6 +42,7 @@
import com.android.settings.biometrics.BiometricEnrollBase.RESULT_FINISHED
import com.android.settings.biometrics.GatekeeperPasswordProvider
import com.android.settings.biometrics.fingerprint2.domain.interactor.FingerprintManagerInteractorImpl
+import com.android.settings.biometrics.fingerprint2.shared.model.FingerprintViewModel
import com.android.settings.biometrics.fingerprint2.ui.enrollment.fragment.FingerprintEnrollConfirmationV2Fragment
import com.android.settings.biometrics.fingerprint2.ui.enrollment.fragment.FingerprintEnrollEnrollingV2Fragment
import com.android.settings.biometrics.fingerprint2.ui.enrollment.fragment.FingerprintEnrollFindSensorV2Fragment
@@ -82,6 +83,7 @@
private lateinit var accessibilityViewModel: AccessibilityViewModel
private lateinit var foldStateViewModel: FoldStateViewModel
private lateinit var orientationStateViewModel: OrientationStateViewModel
+ private lateinit var fingerprintScrollViewModel: FingerprintScrollViewModel
private val coroutineDispatcher = Dispatchers.Default
/** Result listener for ChooseLock activity flow. */
@@ -210,8 +212,9 @@
)[FingerprintEnrollViewModel::class.java]
// Initialize scroll view model
- ViewModelProvider(this, FingerprintScrollViewModel.FingerprintScrollViewModelFactory())[
- FingerprintScrollViewModel::class.java]
+ fingerprintScrollViewModel =
+ ViewModelProvider(this, FingerprintScrollViewModel.FingerprintScrollViewModelFactory())[
+ FingerprintScrollViewModel::class.java]
// Initialize AccessibilityViewModel
accessibilityViewModel =
@@ -255,6 +258,9 @@
}
if (theClass != null) {
+ supportFragmentManager.fragments.onEach { fragment ->
+ supportFragmentManager.beginTransaction().remove(fragment).commit()
+ }
supportFragmentManager
.beginTransaction()
.setReorderingAllowed(true)
diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollIntroV2Fragment.kt b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollIntroV2Fragment.kt
index dbf6d12..898b158 100644
--- a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollIntroV2Fragment.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/fragment/FingerprintEnrollIntroV2Fragment.kt
@@ -25,10 +25,13 @@
import android.text.Html
import android.text.method.LinkMovementMethod
import android.util.Log
+import android.view.LayoutInflater
import android.view.View
+import android.view.ViewGroup
import android.widget.ImageView
import android.widget.ScrollView
import android.widget.TextView
+import androidx.annotation.VisibleForTesting
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope
@@ -72,48 +75,69 @@
* 2. How the data will be stored
* 3. How the user can access and remove their data
*/
-class FingerprintEnrollIntroV2Fragment : Fragment(R.layout.fingerprint_v2_enroll_introduction) {
- private lateinit var footerBarMixin: FooterBarMixin
- private lateinit var textModel: TextModel
- private lateinit var navigationViewModel: FingerprintEnrollNavigationViewModel
- private lateinit var fingerprintEnrollViewModel: FingerprintEnrollViewModel
- private lateinit var fingerprintScrollViewModel: FingerprintScrollViewModel
- private lateinit var gateKeeperViewModel: FingerprintGatekeeperViewModel
+class FingerprintEnrollIntroV2Fragment() : Fragment(R.layout.fingerprint_v2_enroll_introduction) {
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- navigationViewModel =
- ViewModelProvider(requireActivity())[FingerprintEnrollNavigationViewModel::class.java]
- fingerprintEnrollViewModel =
- ViewModelProvider(requireActivity())[FingerprintEnrollViewModel::class.java]
- fingerprintScrollViewModel =
- ViewModelProvider(requireActivity())[FingerprintScrollViewModel::class.java]
- gateKeeperViewModel =
- ViewModelProvider(requireActivity())[FingerprintGatekeeperViewModel::class.java]
+ /** Used for testing purposes */
+ private var factory: ViewModelProvider.Factory? = null
+
+ @VisibleForTesting
+ constructor(theFactory: ViewModelProvider.Factory) : this() {
+ factory = theFactory
}
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
+ private val viewModelProvider: ViewModelProvider by lazy {
+ if (factory != null) {
+ ViewModelProvider(requireActivity(), factory!!)
+ } else {
+ ViewModelProvider(requireActivity())
+ }
+ }
- lifecycleScope.launch {
- combine(
- navigationViewModel.enrollType,
- fingerprintEnrollViewModel.sensorType,
- ) { enrollType, sensorType ->
- Pair(enrollType, sensorType)
- }
- .collect { (enrollType, sensorType) ->
- textModel =
- when (enrollType) {
- Unicorn -> getUnicornTextModel()
- else -> getNormalTextModel()
- }
+ private lateinit var footerBarMixin: FooterBarMixin
+ private lateinit var textModel: TextModel
- setupFooterBarAndScrollView(view)
+ // Note that the ViewModels cannot be requested before the onCreate call
+ private val navigationViewModel: FingerprintEnrollNavigationViewModel by lazy {
+ viewModelProvider[FingerprintEnrollNavigationViewModel::class.java]
+ }
+ private val fingerprintViewModel: FingerprintEnrollViewModel by lazy {
+ viewModelProvider[FingerprintEnrollViewModel::class.java]
+ }
+ private val fingerprintScrollViewModel: FingerprintScrollViewModel by lazy {
+ viewModelProvider[FingerprintScrollViewModel::class.java]
+ }
+ private val gateKeeperViewModel: FingerprintGatekeeperViewModel by lazy {
+ viewModelProvider[FingerprintGatekeeperViewModel::class.java]
+ }
- if (savedInstanceState == null) {
- getLayout()?.setHeaderText(textModel.headerText)
- getLayout()?.setDescriptionText(textModel.descriptionText)
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? =
+ super.onCreateView(inflater, container, savedInstanceState).also { theView ->
+ val view = theView!!
+
+ viewLifecycleOwner.lifecycleScope.launch {
+ combine(
+ navigationViewModel.enrollType,
+ fingerprintViewModel.sensorType,
+ ) { enrollType, sensorType ->
+ Pair(enrollType, sensorType)
+ }
+ .collect { (enrollType, sensorType) ->
+ textModel =
+ when (enrollType) {
+ Unicorn -> getUnicornTextModel()
+ else -> getNormalTextModel()
+ }
+
+ setupFooterBarAndScrollView(view)
+
+ val layout = view as GlifLayout
+
+ layout.setHeaderText(textModel.headerText)
+ layout.setDescriptionText(textModel.descriptionText)
// Set color filter for the following icons.
val colorFilter = getIconColorFilter()
@@ -158,9 +182,9 @@
view.requireViewById<TextView?>(R.id.footer_title_1).setText(textModel.footerTitleOne)
view.requireViewById<TextView?>(R.id.footer_title_2).setText(textModel.footerTitleOne)
}
- }
+ }
+ return view
}
- }
private fun setFooterLink(view: View) {
val footerLink: TextView = view.requireViewById(R.id.footer_learn_more)
@@ -185,17 +209,18 @@
navigationViewModel.nextStep()
}
- val layout: GlifLayout = requireActivity().requireViewById(R.id.setup_wizard_layout)
+ val layout: GlifLayout = view.findViewById(R.id.setup_wizard_layout)!!
footerBarMixin = layout.getMixin(FooterBarMixin::class.java)
footerBarMixin.primaryButton =
- FooterButton.Builder(requireActivity())
+ FooterButton.Builder(requireContext())
.setText(R.string.security_settings_face_enroll_introduction_more)
.setListener(onNextButtonClick)
.setButtonType(FooterButton.ButtonType.OPT_IN)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
.build()
+
footerBarMixin.setSecondaryButton(
- FooterButton.Builder(requireActivity())
+ FooterButton.Builder(requireContext())
.setText(textModel.negativeButton)
.setListener({ Log.d(TAG, "prevClicked") })
.setButtonType(FooterButton.ButtonType.NEXT)
@@ -211,8 +236,8 @@
val requireScrollMixin = layout.getMixin(RequireScrollMixin::class.java)
requireScrollMixin.requireScrollWithButton(
- requireActivity(),
- footerBarMixin.primaryButton,
+ requireContext(),
+ primaryButton,
R.string.security_settings_face_enroll_introduction_more,
onNextButtonClick
)
@@ -224,7 +249,7 @@
}
}
- lifecycleScope.launch {
+ viewLifecycleOwner.lifecycleScope.launch {
fingerprintScrollViewModel.hasReadConsentScreen.collect { consented ->
if (consented) {
primaryButton.setText(
@@ -244,7 +269,7 @@
// the flow. For instance if someone launches the activity with an invalid challenge, it
// either 1) Fails or 2) Launched confirmDeviceCredential
primaryButton.isEnabled = false
- lifecycleScope.launch {
+ viewLifecycleOwner.lifecycleScope.launch {
gateKeeperViewModel.hasValidGatekeeperInfo.collect { primaryButton.isEnabled = it }
}
}
@@ -284,8 +309,4 @@
PorterDuff.Mode.SRC_IN
)
}
-
- private fun getLayout(): GlifLayout? {
- return requireView().findViewById(R.id.setup_wizard_layout) as GlifLayout?
- }
}
diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollFindSensorViewModel.kt b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollFindSensorViewModel.kt
index 94bfce3..17f8132 100644
--- a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollFindSensorViewModel.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrollFindSensorViewModel.kt
@@ -25,11 +25,13 @@
import com.android.systemui.biometrics.shared.model.FingerprintSensorType
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.combineTransform
import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.shareIn
import kotlinx.coroutines.flow.transform
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
@@ -45,7 +47,9 @@
) : ViewModel() {
/** Represents the stream of sensor type. */
val sensorType: Flow<FingerprintSensorType> =
- fingerprintEnrollViewModel.sensorType.filterWhenEducationIsShown()
+ fingerprintEnrollViewModel.sensorType
+ .filterWhenEducationIsShown()
+ .shareIn(viewModelScope, SharingStarted.WhileSubscribed(), 1)
private val _isUdfps: Flow<Boolean> =
sensorType.map {
it == FingerprintSensorType.UDFPS_OPTICAL || it == FingerprintSensorType.UDFPS_ULTRASONIC
diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrolllNavigationViewModel.kt b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrolllNavigationViewModel.kt
index d2bb321..97c8271 100644
--- a/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrolllNavigationViewModel.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/ui/enrollment/viewmodel/FingerprintEnrolllNavigationViewModel.kt
@@ -31,11 +31,6 @@
private const val TAG = "FingerprintEnrollNavigationViewModel"
-/** Interface to validate a gatekeeper hat */
-interface Validator {
- fun validateGateKeeper(challenge: Long?): Boolean
-}
-
/**
* The [EnrollType] for fingerprint enrollment indicates information on how the flow should behave.
*/
@@ -56,7 +51,6 @@
*/
class FingerprintEnrollNavigationViewModel(
private val dispatcher: CoroutineDispatcher,
- private val validator: Validator,
private val fingerprintManagerInteractor: FingerprintManagerInteractor,
private val gatekeeperViewModel: FingerprintGatekeeperViewModel,
private val canSkipConfirm: Boolean
@@ -145,11 +139,6 @@
return FingerprintEnrollNavigationViewModel(
backgroundDispatcher,
- object : Validator {
- override fun validateGateKeeper(challenge: Long?): Boolean {
- return challenge != null
- }
- },
fingerprintManagerInteractor,
fingerprintGatekeeperViewModel,
canSkipConfirm,
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherController.java b/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherController.java
index 562a469..d1d00d8 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherController.java
@@ -16,6 +16,7 @@
package com.android.settings.bluetooth;
+import android.bluetooth.BluetoothDevice;
import android.content.Context;
import androidx.preference.PreferenceFragmentCompat;
@@ -75,7 +76,6 @@
protected void refresh() {
updateButtonPreferenceTitle(mPreference);
setPreferencesVisibility(getButtonPreferenceVisibility(mCachedDevice));
-
}
private void updateButtonPreferenceTitle(ButtonPreference preference) {
@@ -97,7 +97,7 @@
if (!cachedDevice.isConnectedHearingAidDevice()) {
return false;
}
- return isBinauralMode(cachedDevice) && !isOtherSideConnected(cachedDevice);
+ return isBinauralMode(cachedDevice) && !isOtherSideBonded(cachedDevice);
}
private void launchPairingDetail() {
@@ -112,25 +112,16 @@
return cachedDevice.getDeviceMode() == HearingAidInfo.DeviceMode.MODE_BINAURAL;
}
- private boolean isOtherSideConnected(CachedBluetoothDevice cachedDevice) {
- // Check sub device for ASHA hearing aid
- if (cachedDevice.isConnectedAshaHearingAidDevice()) {
- final CachedBluetoothDevice subDevice = cachedDevice.getSubDevice();
- if (subDevice != null && subDevice.isConnectedAshaHearingAidDevice()) {
- return true;
- }
- }
+ private boolean isOtherSideBonded(CachedBluetoothDevice cachedDevice) {
+ final CachedBluetoothDevice subDevice = cachedDevice.getSubDevice();
+ final boolean subDeviceBonded =
+ subDevice != null && subDevice.getBondState() == BluetoothDevice.BOND_BONDED;
- // Check member device for LE audio hearing aid
- if (cachedDevice.isConnectedLeAudioHearingAidDevice()) {
- final Set<CachedBluetoothDevice> memberDevices = cachedDevice.getMemberDevice();
- for (CachedBluetoothDevice memberDevice : memberDevices) {
- if (memberDevice.isConnectedLeAudioHearingAidDevice()) {
- return true;
- }
- }
- }
+ final Set<CachedBluetoothDevice> memberDevice = cachedDevice.getMemberDevice();
+ final boolean allMemberDevicesBonded =
+ !memberDevice.isEmpty() && memberDevice.stream().allMatch(
+ device -> device.getBondState() == BluetoothDevice.BOND_BONDED);
- return false;
+ return subDeviceBonded || allMemberDevicesBonded;
}
}
diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
index 508084d..fd8ef1f 100644
--- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
+++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
@@ -124,7 +124,8 @@
private static boolean isBluetoothEnabled() {
final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
- return adapter.isEnabled();
+ return adapter.getState() == BluetoothAdapter.STATE_ON
+ || adapter.getState() == BluetoothAdapter.STATE_TURNING_ON;
}
private static PendingIntent getPrimaryAction(Context context) {
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectAccountFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectAccountFragment.java
index cf91031..77dc3a7 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectAccountFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectAccountFragment.java
@@ -15,10 +15,12 @@
*/
package com.android.settings.dashboard.profileselector;
+
import androidx.fragment.app.Fragment;
import com.android.settings.R;
import com.android.settings.accounts.AccountPersonalDashboardFragment;
+import com.android.settings.accounts.AccountPrivateDashboardFragment;
import com.android.settings.accounts.AccountWorkProfileDashboardFragment;
/**
@@ -28,10 +30,12 @@
@Override
public Fragment[] getFragments() {
- return new Fragment[] {
- new AccountPersonalDashboardFragment(),
- new AccountWorkProfileDashboardFragment()
- };
+ return ProfileSelectFragment.getFragments(
+ getContext(),
+ null /* bundle */,
+ AccountPersonalDashboardFragment::new,
+ AccountWorkProfileDashboardFragment::new,
+ AccountPrivateDashboardFragment::new);
}
@Override
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
index 5c0580d..657cdbf 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
@@ -17,21 +17,28 @@
package com.android.settings.dashboard.profileselector;
import static android.app.admin.DevicePolicyResources.Strings.Settings.PERSONAL_CATEGORY_HEADER;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.PRIVATE_CATEGORY_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_CATEGORY_HEADER;
import static android.content.Intent.EXTRA_USER_ID;
import android.annotation.IntDef;
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.pm.UserInfo;
import android.os.Bundle;
+import android.os.Flags;
import android.os.UserHandle;
import android.os.UserManager;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.RecyclerView;
@@ -42,12 +49,14 @@
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.privatespace.PrivateSpaceMaintainer;
import com.google.android.material.tabs.TabLayout;
import com.google.android.material.tabs.TabLayoutMediator;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
/**
* Base fragment class for profile settings.
@@ -77,9 +86,14 @@
int WORK = 1 << 1;
/**
- * It is personal and work profile
+ * It is private profile
*/
- int ALL = PERSONAL | WORK;
+ int PRIVATE = 1 << 2;
+
+ /**
+ * It is personal, work, and private profile
+ */
+ int ALL = PERSONAL | WORK | PRIVATE;
}
/**
@@ -97,6 +111,11 @@
*/
public static final int WORK_TAB = 1;
+ /**
+ * Used in fragment argument with Extra key {@link SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB}
+ */
+ public static final int PRIVATE_TAB = 2;
+
private ViewGroup mContentView;
private ViewPager2 mViewPager;
@@ -215,12 +234,20 @@
if (isWorkProfile) {
return WORK_TAB;
}
+ UserInfo userInfo = UserManager.get(activity).getUserInfo(userId);
+ if (Flags.allowPrivateProfile() && userInfo != null && userInfo.isPrivateProfile()) {
+ return PRIVATE_TAB;
+ }
}
// Start intent from a specific user eg: adb shell --user 10
final int intentUser = activity.getIntent().getContentUserHint();
if (UserManager.get(activity).isManagedProfile(intentUser)) {
return WORK_TAB;
}
+ UserInfo userInfo = UserManager.get(activity).getUserInfo(intentUser);
+ if (Flags.allowPrivateProfile() && userInfo != null && userInfo.isPrivateProfile()) {
+ return PRIVATE_TAB;
+ }
return PERSONAL_TAB;
}
@@ -229,13 +256,114 @@
final DevicePolicyManager devicePolicyManager =
getContext().getSystemService(DevicePolicyManager.class);
- if (position == WORK_TAB) {
+ if (Flags.allowPrivateProfile()) {
+ int tabForPosition =
+ ((ViewPagerAdapter) mViewPager.getAdapter()).getTabForPosition(position);
+
+ if (tabForPosition == WORK_TAB) {
+ return devicePolicyManager.getResources().getString(WORK_CATEGORY_HEADER,
+ () -> getContext().getString(
+ com.android.settingslib.R.string.category_work));
+ }
+
+ if (tabForPosition == PRIVATE_TAB) {
+ return devicePolicyManager.getResources().getString(PRIVATE_CATEGORY_HEADER,
+ () -> getContext()
+ .getString(com.android.settingslib.R.string.category_private));
+ }
+
+ } else if (position == WORK_TAB) {
return devicePolicyManager.getResources().getString(WORK_CATEGORY_HEADER,
() -> getContext().getString(com.android.settingslib.R.string.category_work));
+
+ }
+ return devicePolicyManager.getResources().getString(PERSONAL_CATEGORY_HEADER,
+ () -> getContext().getString(
+ com.android.settingslib.R.string.category_personal));
+ }
+
+ /** Creates fragments of passed types, and returns them in an array. */
+ @NonNull static Fragment[] getFragments(
+ Context context,
+ @Nullable Bundle bundle,
+ FragmentConstructor personalFragmentConstructor,
+ FragmentConstructor workFragmentConstructor,
+ FragmentConstructor privateFragmentConstructor) {
+ return getFragments(
+ context,
+ bundle,
+ personalFragmentConstructor,
+ workFragmentConstructor,
+ privateFragmentConstructor,
+ new PrivateSpaceInfoProvider() {},
+ new ManagedProfileInfoProvider() {});
+ }
+
+ /**
+ * Creates fragments of passed types, and returns them in an array. This overload exists only
+ * for helping with testing.
+ */
+ @NonNull static Fragment[] getFragments(
+ Context context,
+ @Nullable Bundle bundle,
+ FragmentConstructor personalFragmentConstructor,
+ FragmentConstructor workFragmentConstructor,
+ FragmentConstructor privateFragmentConstructor,
+ PrivateSpaceInfoProvider privateSpaceInfoProvider,
+ ManagedProfileInfoProvider managedProfileInfoProvider) {
+ Fragment[] result = new Fragment[0];
+ ArrayList<Fragment> fragments = new ArrayList<>();
+
+ try {
+ final Bundle personalOnly = bundle != null ? bundle : new Bundle();
+ personalOnly.putInt(EXTRA_PROFILE, ProfileType.PERSONAL);
+ final Fragment personalFragment =
+ personalFragmentConstructor.constructAndGetFragment();
+ personalFragment.setArguments(personalOnly);
+ fragments.add(personalFragment);
+
+ if (managedProfileInfoProvider.getManagedProfile(context) != null) {
+ final Bundle workOnly = bundle != null ? bundle : new Bundle();
+ workOnly.putInt(EXTRA_PROFILE, ProfileType.WORK);
+ final Fragment workFragment =
+ workFragmentConstructor.constructAndGetFragment();
+ workFragment.setArguments(workOnly);
+ fragments.add(workFragment);
+ }
+
+ if (Flags.allowPrivateProfile()
+ && !privateSpaceInfoProvider.isPrivateSpaceLocked(context)) {
+ final Bundle privateOnly = bundle != null ? bundle : new Bundle();
+ privateOnly.putInt(EXTRA_PROFILE, ProfileType.PRIVATE);
+ final Fragment privateFragment =
+ privateFragmentConstructor.constructAndGetFragment();
+ privateFragment.setArguments(privateOnly);
+ fragments.add(privateFragment);
+ }
+
+ result = new Fragment[fragments.size()];
+ fragments.toArray(result);
+ } catch (Exception e) {
+ Log.e(TAG, "Failed to create fragment");
}
- return devicePolicyManager.getResources().getString(PERSONAL_CATEGORY_HEADER,
- () -> getContext().getString(com.android.settingslib.R.string.category_personal));
+ return result;
+ }
+
+ interface FragmentConstructor {
+ Fragment constructAndGetFragment();
+ }
+
+ interface PrivateSpaceInfoProvider {
+ default boolean isPrivateSpaceLocked(Context context) {
+ return PrivateSpaceMaintainer.getInstance(context).isPrivateSpaceLocked();
+ }
+ }
+
+ interface ManagedProfileInfoProvider {
+ default UserHandle getManagedProfile(Context context) {
+ return Utils.getManagedProfile(context.getSystemService(UserManager.class));
+ }
}
static class ViewPagerAdapter extends FragmentStateAdapter {
@@ -256,5 +384,22 @@
public int getItemCount() {
return mChildFragments.length;
}
+
+ private int getTabForPosition(int position) {
+ if (position >= mChildFragments.length) {
+ Log.e(TAG, "tab requested for out of bound position " + position);
+ return PERSONAL_TAB;
+ }
+ @ProfileType
+ int profileType = mChildFragments[position].getArguments().getInt(EXTRA_PROFILE);
+
+ if (profileType == ProfileType.WORK) {
+ return WORK_TAB;
+ }
+ if (profileType == ProfileType.PRIVATE) {
+ return PRIVATE_TAB;
+ }
+ return PERSONAL_TAB;
+ }
}
}
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectKeyboardFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectKeyboardFragment.java
index c4386e6..d35692c 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectKeyboardFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectKeyboardFragment.java
@@ -16,8 +16,6 @@
package com.android.settings.dashboard.profileselector;
-import android.os.Bundle;
-
import androidx.fragment.app.Fragment;
import com.android.settings.R;
@@ -39,19 +37,11 @@
@Override
public Fragment[] getFragments() {
- final Bundle personalOnly = new Bundle();
- personalOnly.putInt(EXTRA_PROFILE, ProfileType.PERSONAL);
- final Fragment personalFragment = new AvailableVirtualKeyboardFragment();
- personalFragment.setArguments(personalOnly);
-
- final Bundle workOnly = new Bundle();
- workOnly.putInt(EXTRA_PROFILE, ProfileType.WORK);
- final Fragment workFragment = new AvailableVirtualKeyboardFragment();
- workFragment.setArguments(workOnly);
-
- return new Fragment[]{
- personalFragment,
- workFragment
- };
+ return ProfileSelectFragment.getFragments(
+ getContext(),
+ null /* bundle */,
+ AvailableVirtualKeyboardFragment::new,
+ AvailableVirtualKeyboardFragment::new,
+ AvailableVirtualKeyboardFragment::new);
}
}
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java
index 28fb97b..feaec74 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java
@@ -45,20 +45,12 @@
@Override
public Fragment[] getFragments() {
-
- final Bundle workOnly = new Bundle();
- workOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.WORK);
- final Fragment workFragment = new LocationWorkProfileSettings();
- workFragment.setArguments(workOnly);
-
- final Bundle personalOnly = new Bundle();
- personalOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.PERSONAL);
- final Fragment personalFragment = new LocationPersonalSettings();
- personalFragment.setArguments(personalOnly);
- return new Fragment[]{
- personalFragment,
- workFragment
- };
+ return ProfileSelectFragment.getFragments(
+ getContext(),
+ null /* bundle */,
+ LocationPersonalSettings::new,
+ LocationWorkProfileSettings::new,
+ LocationPersonalSettings::new);
}
@Override
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationServicesFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationServicesFragment.java
index 111e4ce..8e48c7b 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationServicesFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationServicesFragment.java
@@ -16,8 +16,6 @@
package com.android.settings.dashboard.profileselector;
-import android.os.Bundle;
-
import androidx.fragment.app.Fragment;
import com.android.settings.R;
@@ -31,19 +29,12 @@
@Override
public Fragment[] getFragments() {
- final Bundle workOnly = new Bundle();
- workOnly.putInt(EXTRA_PROFILE, ProfileType.WORK);
- final Fragment workFragment = new LocationServicesForWork();
- workFragment.setArguments(workOnly);
-
- final Bundle personalOnly = new Bundle();
- personalOnly.putInt(EXTRA_PROFILE, ProfileType.PERSONAL);
- final Fragment personalFragment = new LocationServices();
- personalFragment.setArguments(personalOnly);
- return new Fragment[]{
- personalFragment, // 0
- workFragment
- };
+ return ProfileSelectFragment.getFragments(
+ getContext(),
+ null /* bundle */,
+ LocationServices::new,
+ LocationServicesForWork::new,
+ LocationServices::new);
}
@Override
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectManageApplications.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectManageApplications.java
index 36aa9c5..4c82f6c 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectManageApplications.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectManageApplications.java
@@ -31,19 +31,12 @@
@Override
public Fragment[] getFragments() {
- final Bundle workOnly = getArguments() != null ? getArguments().deepCopy() : new Bundle();
- workOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.WORK);
- final Fragment workFragment = new ManageApplications();
- workFragment.setArguments(workOnly);
-
- final Bundle personalOnly = getArguments() != null ? getArguments() : new Bundle();
- personalOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.PERSONAL);
- final Fragment personalFragment = new ManageApplications();
- personalFragment.setArguments(personalOnly);
- return new Fragment[]{
- personalFragment, //0
- workFragment
- };
+ return ProfileSelectFragment.getFragments(
+ getContext(),
+ getArguments(),
+ ManageApplications::new,
+ ManageApplications::new,
+ ManageApplications::new);
}
@Override
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectPhysicalKeyboardFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectPhysicalKeyboardFragment.java
index 3c1546e..239d609 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectPhysicalKeyboardFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectPhysicalKeyboardFragment.java
@@ -51,22 +51,11 @@
@Override
public Fragment[] getFragments() {
- final Bundle personalOnly = new Bundle();
- personalOnly.putInt(EXTRA_PROFILE, ProfileType.PERSONAL);
- final Fragment personalFragment = new NewKeyboardLayoutEnabledLocalesFragment();
- personalOnly.putParcelable(
- Settings.EXTRA_INPUT_DEVICE_IDENTIFIER, mInputDeviceIdentifier);
- personalFragment.setArguments(personalOnly);
-
- final Bundle workOnly = new Bundle();
- workOnly.putInt(EXTRA_PROFILE, ProfileType.WORK);
- final Fragment workFragment = new NewKeyboardLayoutEnabledLocalesFragment();
- workOnly.putParcelable(Settings.EXTRA_INPUT_DEVICE_IDENTIFIER, mInputDeviceIdentifier);
- workFragment.setArguments(workOnly);
-
- return new Fragment[]{
- personalFragment,
- workFragment
- };
+ return ProfileSelectFragment.getFragments(
+ getContext(),
+ null /* bundle */,
+ NewKeyboardLayoutEnabledLocalesFragment::new,
+ NewKeyboardLayoutEnabledLocalesFragment::new,
+ NewKeyboardLayoutEnabledLocalesFragment::new);
}
}
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java
index 5babf30..b523e7e 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectStorageFragment.java
@@ -193,20 +193,12 @@
return mFragments;
}
- final Bundle workBundle = new Bundle();
- workBundle.putInt(EXTRA_PROFILE, ProfileType.WORK);
- final Fragment workFragment = new StorageCategoryFragment();
- workFragment.setArguments(workBundle);
-
- final Bundle personalBundle = new Bundle();
- personalBundle.putInt(EXTRA_PROFILE, ProfileType.PERSONAL);
- final Fragment personalFragment = new StorageCategoryFragment();
- personalFragment.setArguments(personalBundle);
-
- mFragments = new Fragment[] {
- personalFragment,
- workFragment
- };
+ mFragments = ProfileSelectFragment.getFragments(
+ getContext(),
+ null /* bundle */,
+ StorageCategoryFragment::new,
+ StorageCategoryFragment::new,
+ StorageCategoryFragment::new);
return mFragments;
}
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 33307a3..4c0b516 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -16,49 +16,45 @@
import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+import static com.android.settings.datausage.lib.AppDataUsageRepository.getAppUid;
+import static com.android.settings.datausage.lib.AppDataUsageRepository.getAppUidList;
+
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.net.NetworkTemplate;
import android.os.Bundle;
-import android.os.Process;
import android.os.UserHandle;
-import android.telephony.SubscriptionManager;
import android.util.ArraySet;
import android.util.IconDrawableFactory;
import android.util.Log;
-import android.util.Range;
-import android.view.View;
-import android.widget.AdapterView;
import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceCategory;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.RecyclerView;
import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
+import com.android.settings.datausage.lib.AppDataUsageDetailsRepository;
+import com.android.settings.datausage.lib.NetworkTemplates;
+import com.android.settings.datausage.lib.NetworkUsageDetailsData;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.AppItem;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
-import com.android.settingslib.net.NetworkCycleDataForUid;
-import com.android.settingslib.net.NetworkCycleDataForUidLoader;
import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider;
+import kotlin.Unit;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -76,38 +72,25 @@
private static final String KEY_TOTAL_USAGE = "total_usage";
private static final String KEY_FOREGROUND_USAGE = "foreground_usage";
private static final String KEY_BACKGROUND_USAGE = "background_usage";
- private static final String KEY_APP_SETTINGS = "app_settings";
private static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
- private static final String KEY_APP_LIST = "app_list";
- private static final String KEY_CYCLE = "cycle";
private static final String KEY_UNRESTRICTED_DATA = "unrestricted_data_saver";
- private static final int LOADER_APP_USAGE_DATA = 2;
- private static final int LOADER_APP_PREF = 3;
-
private PackageManager mPackageManager;
private final ArraySet<String> mPackages = new ArraySet<>();
private Preference mTotalUsage;
private Preference mForegroundUsage;
private Preference mBackgroundUsage;
- private Preference mAppSettings;
private RestrictedSwitchPreference mRestrictBackground;
- private PreferenceCategory mAppList;
private Drawable mIcon;
@VisibleForTesting
CharSequence mLabel;
@VisibleForTesting
String mPackageName;
- private CycleAdapter mCycleAdapter;
- @Nullable
- private List<NetworkCycleDataForUid> mUsageData;
@VisibleForTesting
NetworkTemplate mTemplate;
private AppItem mAppItem;
- private Intent mAppSettingsIntent;
- private SpinnerPreference mCycle;
private RestrictedSwitchPreference mUnrestrictedData;
private DataSaverBackend mDataSaverBackend;
private Context mContext;
@@ -134,15 +117,16 @@
mSelectedCycle = (args != null) ? args.getLong(ARG_SELECTED_CYCLE) : 0L;
if (mTemplate == null) {
- mTemplate = DataUsageUtils.getDefaultTemplate(mContext,
- SubscriptionManager.getDefaultDataSubscriptionId());
+ mTemplate = NetworkTemplates.INSTANCE.getDefaultTemplate(mContext);
}
+ final Activity activity = requireActivity();
+ activity.setTitle(NetworkTemplates.getTitleResId(mTemplate));
if (mAppItem == null) {
int uid = (args != null) ? args.getInt(AppInfoBase.ARG_PACKAGE_UID, -1)
: getActivity().getIntent().getIntExtra(AppInfoBase.ARG_PACKAGE_UID, -1);
if (uid == -1) {
// TODO: Log error.
- getActivity().finish();
+ activity.finish();
} else {
addUid(uid);
mAppItem = new AppItem(uid);
@@ -154,19 +138,12 @@
}
}
- if (mAppItem.key > 0 && UserHandle.isApp(mAppItem.key)) {
- // In case we've been asked data usage for an app, automatically
- // include data usage of the corresponding SDK sandbox
- final int appSandboxUid = Process.toSdkSandboxUid(mAppItem.key);
- if (!mAppItem.uids.get(appSandboxUid)) {
- mAppItem.addUid(appSandboxUid);
- }
- }
mTotalUsage = findPreference(KEY_TOTAL_USAGE);
mForegroundUsage = findPreference(KEY_FOREGROUND_USAGE);
mBackgroundUsage = findPreference(KEY_BACKGROUND_USAGE);
- initCycle();
+ final List<Integer> uidList = getAppUidList(mAppItem.uids);
+ initCycle(uidList);
final UidDetailProvider uidDetailProvider = getUidDetailProvider();
@@ -179,14 +156,16 @@
removePreference(KEY_RESTRICT_BACKGROUND);
} else {
if (mPackages.size() != 0) {
+ int userId = UserHandle.getUserId(mAppItem.key);
try {
final ApplicationInfo info = mPackageManager.getApplicationInfoAsUser(
- mPackages.valueAt(0), 0, UserHandle.getUserId(mAppItem.key));
+ mPackages.valueAt(0), 0, userId);
mIcon = IconDrawableFactory.newInstance(getActivity()).getBadgedIcon(info);
mLabel = info.loadLabel(mPackageManager);
mPackageName = info.packageName;
} catch (PackageManager.NameNotFoundException e) {
}
+ use(AppDataUsageAppSettingsController.class).init(mPackages, userId);
}
mRestrictBackground = findPreference(KEY_RESTRICT_BACKGROUND);
mRestrictBackground.setOnPreferenceChangeListener(this);
@@ -194,32 +173,8 @@
mUnrestrictedData.setOnPreferenceChangeListener(this);
}
mDataSaverBackend = new DataSaverBackend(mContext);
- mAppSettings = findPreference(KEY_APP_SETTINGS);
- mAppSettingsIntent = new Intent(Intent.ACTION_MANAGE_NETWORK_USAGE);
- mAppSettingsIntent.addCategory(Intent.CATEGORY_DEFAULT);
-
- final PackageManager pm = getPackageManager();
- boolean matchFound = false;
- for (String packageName : mPackages) {
- mAppSettingsIntent.setPackage(packageName);
- if (pm.resolveActivity(mAppSettingsIntent, 0) != null) {
- matchFound = true;
- break;
- }
- }
- if (!matchFound) {
- removePreference(KEY_APP_SETTINGS);
- mAppSettings = null;
- }
-
- if (mPackages.size() > 1) {
- mAppList = findPreference(KEY_APP_LIST);
- LoaderManager.getInstance(this).restartLoader(LOADER_APP_PREF, Bundle.EMPTY,
- mAppPrefCallbacks);
- } else {
- removePreference(KEY_APP_LIST);
- }
+ use(AppDataUsageListController.class).init(uidList);
} else {
final Context context = getActivity();
final UidDetail uidDetail = uidDetailProvider.getUidDetail(mAppItem.key, true);
@@ -228,20 +183,16 @@
mPackageName = context.getPackageName();
removePreference(KEY_UNRESTRICTED_DATA);
- removePreference(KEY_APP_SETTINGS);
removePreference(KEY_RESTRICT_BACKGROUND);
- removePreference(KEY_APP_LIST);
}
addEntityHeader();
}
@Override
- public void onResume() {
- super.onResume();
- // No animations will occur before:
- // - LOADER_APP_USAGE_DATA initially updates the cycle
- // - updatePrefs() initially updates the preference visibility
+ public void onStart() {
+ super.onStart();
+ // No animations will occur before bindData() initially updates the cycle.
// This is mainly for the cycle spinner, because when the page is entered from the
// AppInfoDashboardFragment, there is no way to know whether the cycle data is available
// before finished the async loading.
@@ -249,11 +200,14 @@
// setBackPreferenceListAnimatorIfLoaded().
mIsLoading = true;
getListView().setItemAnimator(null);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
if (mDataSaverBackend != null) {
mDataSaverBackend.addListener(this);
}
- LoaderManager.getInstance(this).restartLoader(LOADER_APP_USAGE_DATA, null /* args */,
- mUidDataCallbacks);
updatePrefs();
}
@@ -279,17 +233,6 @@
}
@Override
- public boolean onPreferenceTreeClick(Preference preference) {
- if (preference == mAppSettings) {
- // TODO: target towards entire UID instead of just first package
- getActivity().startActivityAsUser(mAppSettingsIntent, new UserHandle(
- UserHandle.getUserId(mAppItem.key)));
- return true;
- }
- return super.onPreferenceTreeClick(preference);
- }
-
- @Override
protected int getPreferenceScreenResId() {
return R.xml.app_data_usage;
}
@@ -309,14 +252,16 @@
return new UidDetailProvider(mContext);
}
- private void initCycle() {
- mCycle = findPreference(KEY_CYCLE);
- mCycleAdapter = new CycleAdapter(mContext, mCycle);
+ @VisibleForTesting
+ void initCycle(List<Integer> uidList) {
+ var controller = use(AppDataUsageCycleController.class);
+ var repository = new AppDataUsageDetailsRepository(mContext, mTemplate, mCycles, uidList);
+ controller.init(repository, data -> {
+ bindData(data);
+ return Unit.INSTANCE;
+ });
if (mCycles != null) {
- // If coming from a page like DataUsageList where already has a selected cycle, display
- // that before loading to reduce flicker.
- mCycleAdapter.setInitialCycleList(mCycles, mSelectedCycle);
- mCycle.setHasCycles(true);
+ controller.setInitialCycles(mCycles, mSelectedCycle);
}
}
@@ -360,33 +305,20 @@
}
private void addUid(int uid) {
- if (Process.isSdkSandboxUid(uid)) {
- // For a sandbox process, get the associated app UID
- uid = Process.getAppUidForSdkSandboxUid(uid);
- }
- String[] packages = mPackageManager.getPackagesForUid(uid);
+ String[] packages = mPackageManager.getPackagesForUid(getAppUid(uid));
if (packages != null) {
Collections.addAll(mPackages, packages);
}
}
@VisibleForTesting
- void bindData(int position) {
- final long backgroundBytes, foregroundBytes;
- if (mUsageData == null || position >= mUsageData.size()) {
- backgroundBytes = foregroundBytes = 0;
- mCycle.setHasCycles(false);
- } else {
- mCycle.setHasCycles(true);
- final NetworkCycleDataForUid data = mUsageData.get(position);
- backgroundBytes = data.getBackgroudUsage();
- foregroundBytes = data.getForegroudUsage();
- }
- final long totalBytes = backgroundBytes + foregroundBytes;
-
- mTotalUsage.setSummary(DataUsageUtils.formatDataUsage(mContext, totalBytes));
- mForegroundUsage.setSummary(DataUsageUtils.formatDataUsage(mContext, foregroundBytes));
- mBackgroundUsage.setSummary(DataUsageUtils.formatDataUsage(mContext, backgroundBytes));
+ void bindData(@NonNull NetworkUsageDetailsData data) {
+ mIsLoading = false;
+ mTotalUsage.setSummary(DataUsageUtils.formatDataUsage(mContext, data.getTotalUsage()));
+ mForegroundUsage.setSummary(
+ DataUsageUtils.formatDataUsage(mContext, data.getForegroundUsage()));
+ mBackgroundUsage.setSummary(
+ DataUsageUtils.formatDataUsage(mContext, data.getBackgroundUsage()));
}
private boolean getAppRestrictBackground() {
@@ -436,94 +368,6 @@
return SettingsEnums.APP_DATA_USAGE;
}
- private final AdapterView.OnItemSelectedListener mCycleListener =
- new AdapterView.OnItemSelectedListener() {
- @Override
- public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
- bindData(position);
- }
-
- @Override
- public void onNothingSelected(AdapterView<?> parent) {
- // ignored
- }
- };
-
- @VisibleForTesting
- final LoaderManager.LoaderCallbacks<List<NetworkCycleDataForUid>> mUidDataCallbacks =
- new LoaderManager.LoaderCallbacks<>() {
- @Override
- @NonNull
- public Loader<List<NetworkCycleDataForUid>> onCreateLoader(int id, Bundle args) {
- final NetworkCycleDataForUidLoader.Builder<?> builder =
- NetworkCycleDataForUidLoader.builder(mContext);
- builder.setRetrieveDetail(true)
- .setNetworkTemplate(mTemplate);
- for (int i = 0; i < mAppItem.uids.size(); i++) {
- builder.addUid(mAppItem.uids.keyAt(i));
- }
- if (mCycles != null) {
- builder.setCycles(mCycles);
- }
- return builder.build();
- }
-
- @Override
- public void onLoadFinished(@NonNull Loader<List<NetworkCycleDataForUid>> loader,
- List<NetworkCycleDataForUid> data) {
- mUsageData = data;
- mCycle.setOnItemSelectedListener(mCycleListener);
- mCycleAdapter.updateCycleList(data.stream()
- .map(cycle -> new Range<>(cycle.getStartTime(), cycle.getEndTime()))
- .toList());
- if (mSelectedCycle > 0L) {
- final int numCycles = data.size();
- int position = 0;
- for (int i = 0; i < numCycles; i++) {
- final NetworkCycleDataForUid cycleData = data.get(i);
- if (cycleData.getEndTime() == mSelectedCycle) {
- position = i;
- break;
- }
- }
- if (position > 0) {
- mCycle.setSelection(position);
- }
- bindData(position);
- } else {
- bindData(0 /* position */);
- }
- mIsLoading = false;
- }
-
- @Override
- public void onLoaderReset(@NonNull Loader<List<NetworkCycleDataForUid>> loader) {
- }
- };
-
- private final LoaderManager.LoaderCallbacks<ArraySet<Preference>> mAppPrefCallbacks =
- new LoaderManager.LoaderCallbacks<>() {
- @Override
- @NonNull
- public Loader<ArraySet<Preference>> onCreateLoader(int i, Bundle bundle) {
- return new AppPrefLoader(getPrefContext(), mPackages, getPackageManager());
- }
-
- @Override
- public void onLoadFinished(@NonNull Loader<ArraySet<Preference>> loader,
- ArraySet<Preference> preferences) {
- if (preferences != null && mAppList != null) {
- for (Preference preference : preferences) {
- mAppList.addPreference(preference);
- }
- }
- }
-
- @Override
- public void onLoaderReset(@NonNull Loader<ArraySet<Preference>> loader) {
- }
- };
-
@Override
public void onDataSaverChanged(boolean isDataSaving) {
diff --git a/src/com/android/settings/datausage/AppDataUsageActivity.java b/src/com/android/settings/datausage/AppDataUsageActivity.java
index 48bedce..9a5a2cb 100644
--- a/src/com/android/settings/datausage/AppDataUsageActivity.java
+++ b/src/com/android/settings/datausage/AppDataUsageActivity.java
@@ -17,9 +17,9 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
+import android.provider.Settings;
import android.util.Log;
-import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settingslib.AppItem;
@@ -61,14 +61,12 @@
args.putParcelable(AppDataUsage.ARG_APP_ITEM, appItem);
intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
intent.putExtra(EXTRA_SHOW_FRAGMENT, AppDataUsage.class.getName());
- intent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.data_usage_app_summary_title);
super.onCreate(savedInstanceState);
}
@Override
protected boolean isValidFragment(String fragmentName) {
- return super.isValidFragment(fragmentName)
- || AppDataUsage.class.getName().equals(fragmentName);
+ return AppDataUsage.class.getName().equals(fragmentName);
}
}
diff --git a/src/com/android/settings/datausage/AppDataUsageAppSettingsController.kt b/src/com/android/settings/datausage/AppDataUsageAppSettingsController.kt
new file mode 100644
index 0000000..53a18c6
--- /dev/null
+++ b/src/com/android/settings/datausage/AppDataUsageAppSettingsController.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2023 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.datausage
+
+import android.content.Context
+import android.content.Intent
+import android.os.UserHandle
+import androidx.annotation.OpenForTesting
+import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.preference.Preference
+import androidx.preference.PreferenceScreen
+import com.android.settings.core.BasePreferenceController
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+@OpenForTesting
+open class AppDataUsageAppSettingsController(context: Context, preferenceKey: String) :
+ BasePreferenceController(context, preferenceKey) {
+
+ private var packageNames: Iterable<String> = emptyList()
+ private var userId: Int = -1
+ private lateinit var preference: Preference
+ private var resolvedIntent: Intent? = null
+
+ private val packageManager = mContext.packageManager
+
+ override fun getAvailabilityStatus() = AVAILABLE
+
+ fun init(packageNames: Iterable<String>, userId: Int) {
+ this.packageNames = packageNames
+ this.userId = userId
+ }
+
+ override fun displayPreference(screen: PreferenceScreen) {
+ super.displayPreference(screen)
+ preference = screen.findPreference(preferenceKey)!!
+ }
+
+ override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {
+ viewLifecycleOwner.lifecycleScope.launch {
+ viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+ update()
+ }
+ }
+ }
+
+ private suspend fun update() {
+ resolvedIntent = withContext(Dispatchers.Default) {
+ packageNames.map { packageName ->
+ Intent(SettingsIntent).setPackage(packageName)
+ }.firstOrNull { intent ->
+ packageManager.resolveActivityAsUser(intent, 0, userId) != null
+ }
+ }
+ preference.isVisible = resolvedIntent != null
+ }
+
+ override fun handlePreferenceTreeClick(preference: Preference): Boolean {
+ if (preference.key == mPreferenceKey) {
+ resolvedIntent?.let { mContext.startActivityAsUser(it, UserHandle.of(userId)) }
+ return true
+ }
+ return false
+ }
+
+ private companion object {
+ val SettingsIntent = Intent(Intent.ACTION_MANAGE_NETWORK_USAGE).apply {
+ addCategory(Intent.CATEGORY_DEFAULT)
+ }
+ }
+}
diff --git a/src/com/android/settings/datausage/AppDataUsageCycleController.kt b/src/com/android/settings/datausage/AppDataUsageCycleController.kt
new file mode 100644
index 0000000..b1a0e76
--- /dev/null
+++ b/src/com/android/settings/datausage/AppDataUsageCycleController.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2023 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.datausage
+
+import android.content.Context
+import android.view.View
+import android.widget.AdapterView
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.preference.PreferenceScreen
+import com.android.settings.core.BasePreferenceController
+import com.android.settings.datausage.lib.AppDataUsageDetailsRepository
+import com.android.settings.datausage.lib.IAppDataUsageDetailsRepository
+import com.android.settings.datausage.lib.NetworkUsageDetailsData
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class AppDataUsageCycleController(context: Context, preferenceKey: String) :
+ BasePreferenceController(context, preferenceKey) {
+
+ private lateinit var repository: IAppDataUsageDetailsRepository
+ private var onUsageDataUpdated: (NetworkUsageDetailsData) -> Unit = {}
+ private lateinit var preference: SpinnerPreference
+ private var cycleAdapter: CycleAdapter? = null
+
+ private var initialCycles: List<Long> = emptyList()
+ private var initialSelectedEndTime: Long = -1
+
+ private var usageDetailsDataList: List<NetworkUsageDetailsData> = emptyList()
+
+ fun init(
+ repository: IAppDataUsageDetailsRepository,
+ onUsageDataUpdated: (NetworkUsageDetailsData) -> Unit,
+ ) {
+ this.repository = repository
+ this.onUsageDataUpdated = onUsageDataUpdated
+ }
+
+ /**
+ * Sets the initial cycles.
+ *
+ * If coming from a page like DataUsageList where already has a selected cycle, display that
+ * before loading to reduce flicker.
+ */
+ fun setInitialCycles(initialCycles: List<Long>, initialSelectedEndTime: Long) {
+ this.initialCycles = initialCycles
+ this.initialSelectedEndTime = initialSelectedEndTime
+ }
+
+ override fun getAvailabilityStatus() = AVAILABLE
+
+ override fun displayPreference(screen: PreferenceScreen) {
+ super.displayPreference(screen)
+ preference = screen.findPreference(preferenceKey)!!
+ if (cycleAdapter == null) {
+ cycleAdapter = CycleAdapter(mContext, preference).apply {
+ if (initialCycles.isNotEmpty()) {
+ setInitialCycleList(initialCycles, initialSelectedEndTime)
+ preference.setHasCycles(true)
+ }
+ }
+ }
+ }
+
+ override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {
+ viewLifecycleOwner.lifecycleScope.launch {
+ viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+ update()
+ }
+ }
+ }
+
+ private suspend fun update() {
+ usageDetailsDataList = withContext(Dispatchers.Default) {
+ repository.queryDetailsForCycles()
+ }
+ if (usageDetailsDataList.isEmpty()) {
+ preference.setHasCycles(false)
+ onUsageDataUpdated(NetworkUsageDetailsData.AllZero)
+ return
+ }
+
+ preference.setHasCycles(true)
+ cycleAdapter?.updateCycleList(usageDetailsDataList.map { it.range })
+ preference.setOnItemSelectedListener(cycleListener)
+ }
+
+ private val cycleListener = object : AdapterView.OnItemSelectedListener {
+ override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+ usageDetailsDataList.getOrNull(position)?.let(onUsageDataUpdated)
+ }
+
+ override fun onNothingSelected(parent: AdapterView<*>?) {
+ // ignored
+ }
+ }
+}
diff --git a/src/com/android/settings/datausage/AppDataUsageListController.kt b/src/com/android/settings/datausage/AppDataUsageListController.kt
new file mode 100644
index 0000000..85a6e92
--- /dev/null
+++ b/src/com/android/settings/datausage/AppDataUsageListController.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2023 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.datausage
+
+import android.content.Context
+import android.util.SparseBooleanArray
+import androidx.annotation.OpenForTesting
+import androidx.core.util.keyIterator
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.preference.PreferenceGroup
+import androidx.preference.PreferenceScreen
+import com.android.settings.core.BasePreferenceController
+import com.android.settings.datausage.lib.AppDataUsageRepository.Companion.getAppUid
+import com.android.settings.datausage.lib.AppDataUsageRepository.Companion.getAppUidList
+import com.android.settings.datausage.lib.AppPreferenceRepository
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+@OpenForTesting
+open class AppDataUsageListController @JvmOverloads constructor(
+ context: Context,
+ preferenceKey: String,
+ private val repository: AppPreferenceRepository = AppPreferenceRepository(context),
+) : BasePreferenceController(context, preferenceKey) {
+
+ private var uids: List<Int> = emptyList()
+ private lateinit var preference: PreferenceGroup
+
+ fun init(uids: List<Int>) {
+ this.uids = uids
+ }
+
+ override fun getAvailabilityStatus() = AVAILABLE
+
+ override fun displayPreference(screen: PreferenceScreen) {
+ super.displayPreference(screen)
+ preference = screen.findPreference(preferenceKey)!!
+ }
+
+ override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {
+ viewLifecycleOwner.lifecycleScope.launch {
+ viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+ updateList()
+ }
+ }
+ }
+
+ private suspend fun updateList() {
+ if (uids.size <= 1) {
+ preference.isVisible = false
+ return
+ }
+ preference.isVisible = true
+ val appPreferences = withContext(Dispatchers.Default) {
+ repository.loadAppPreferences(uids)
+ }
+ preference.removeAll()
+ for (appPreference in appPreferences) {
+ preference.addPreference(appPreference)
+ }
+ }
+}
diff --git a/src/com/android/settings/datausage/AppPrefLoader.java b/src/com/android/settings/datausage/AppPrefLoader.java
deleted file mode 100644
index 1e0a554..0000000
--- a/src/com/android/settings/datausage/AppPrefLoader.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.datausage;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.util.ArraySet;
-
-import androidx.preference.Preference;
-
-import com.android.settingslib.utils.AsyncLoaderCompat;
-
-public class AppPrefLoader extends AsyncLoaderCompat<ArraySet<Preference>> {
- private ArraySet<String> mPackages;
- private PackageManager mPackageManager;
- private Context mPrefContext;
-
- public AppPrefLoader(Context prefContext, ArraySet<String> pkgs, PackageManager pm) {
- super(prefContext);
- mPackages = pkgs;
- mPackageManager = pm;
- mPrefContext = prefContext;
- }
-
- @Override
- public ArraySet<Preference> loadInBackground() {
- ArraySet<Preference> results = new ArraySet<>();
- for (int i = 1, size = mPackages.size(); i < size; i++) {
- try {
- ApplicationInfo info = mPackageManager.getApplicationInfo(mPackages.valueAt(i), 0);
- Preference preference = new Preference(mPrefContext);
- preference.setIcon(info.loadIcon(mPackageManager));
- preference.setTitle(info.loadLabel(mPackageManager));
- preference.setSelectable(false);
- results.add(preference);
- } catch (PackageManager.NameNotFoundException e) {
- }
- }
- return results;
- }
-
- @Override
- protected void onDiscardResult(ArraySet<Preference> result) {
- }
-}
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index c3ddb2e..0c07c19 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -44,6 +44,7 @@
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.datausage.lib.NetworkTemplates;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -128,8 +129,7 @@
}
if (mNetworkTemplate == null) {
- mNetworkTemplate = DataUsageUtils.getDefaultTemplate(context,
- DataUsageUtils.getDefaultSubscriptionId(context));
+ mNetworkTemplate = NetworkTemplates.INSTANCE.getDefaultTemplate(context);
}
mBillingCycle = findPreference(KEY_BILLING_CYCLE);
diff --git a/src/com/android/settings/datausage/ChartDataUsagePreferenceController.kt b/src/com/android/settings/datausage/ChartDataUsagePreferenceController.kt
index 0479be4..49235b5 100644
--- a/src/com/android/settings/datausage/ChartDataUsagePreferenceController.kt
+++ b/src/com/android/settings/datausage/ChartDataUsagePreferenceController.kt
@@ -74,7 +74,7 @@
preference.setTime(startTime, endTime)
lifecycleScope.launch {
val chartData = withContext(Dispatchers.Default) {
- repository.querySummary(startTime, endTime)
+ repository.queryChartData(startTime, endTime)
}
preference.setNetworkCycleData(chartData)
}
diff --git a/src/com/android/settings/datausage/DataUsageList.kt b/src/com/android/settings/datausage/DataUsageList.kt
index 9ac7161..1eb883c 100644
--- a/src/com/android/settings/datausage/DataUsageList.kt
+++ b/src/com/android/settings/datausage/DataUsageList.kt
@@ -195,8 +195,7 @@
lastDisplayedUsageData = usageData
Log.d(TAG, "showing cycle $usageData")
- val totalPhrase = DataUsageUtils.formatDataUsage(requireContext(), usageData.usage)
- usageAmount.title = getString(R.string.data_used_template, totalPhrase)
+ usageAmount.title = usageData.getDataUsedString(requireContext())
updateChart(usageData)
updateApps(usageData)
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index 4f876ab..5681c92 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -36,11 +36,11 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.datausage.lib.DataUsageLib;
import com.android.settings.network.ProxySubscriptionManager;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.network.telephony.MobileNetworkUtils;
-import com.android.settingslib.NetworkPolicyEditor;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
@@ -49,7 +49,7 @@
/**
* Settings preference fragment that displays data usage summary.
*/
-public class DataUsageSummary extends DataUsageBaseFragment implements DataUsageEditController {
+public class DataUsageSummary extends DashboardFragment {
private static final String TAG = "DataUsageSummary";
@@ -57,14 +57,9 @@
public static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
- private static final String KEY_STATUS_HEADER = "status_header";
-
// Mobile data keys
public static final String KEY_MOBILE_USAGE_TITLE = "mobile_category";
- private DataUsageSummaryPreference mSummaryPreference;
- private DataUsageSummaryPreferenceController mSummaryController;
- private NetworkTemplate mDefaultTemplate;
private ProxySubscriptionManager mProxySubscriptionMgr;
@Override
@@ -100,8 +95,6 @@
if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
hasMobileData = false;
}
- mDefaultTemplate = DataUsageUtils.getDefaultTemplate(context, defaultSubId);
- mSummaryPreference = findPreference(KEY_STATUS_HEADER);
if (!hasMobileData || !UserManager.get(context).isAdminUser()) {
removePreference(KEY_RESTRICT_BACKGROUND);
@@ -127,15 +120,6 @@
}
@Override
- public boolean onPreferenceTreeClick(Preference preference) {
- if (preference == findPreference(KEY_STATUS_HEADER)) {
- BillingCycleSettings.BytesEditorFragment.show(this, false);
- return false;
- }
- return super.onPreferenceTreeClick(preference);
- }
-
- @Override
protected int getPreferenceScreenResId() {
return R.xml.data_usage;
}
@@ -153,9 +137,8 @@
MobileNetworkUtils.isMobileNetworkUserRestricted(context)) {
return controllers;
}
- mSummaryController =
- new DataUsageSummaryPreferenceController(activity,
- DataUsageUtils.getDefaultSubscriptionId(activity));
+ final var mSummaryController = new DataUsageSummaryPreferenceController(activity,
+ DataUsageUtils.getDefaultSubscriptionId(activity));
controllers.add(mSummaryController);
return controllers;
}
@@ -269,22 +252,6 @@
return SettingsEnums.DATA_USAGE_SUMMARY;
}
- @Override
- public NetworkPolicyEditor getNetworkPolicyEditor() {
- return services.mPolicyEditor;
- }
-
- @Override
- public NetworkTemplate getNetworkTemplate() {
- return mDefaultTemplate;
- }
-
- @Override
- public void updateDataUsage() {
- updateState();
- mSummaryController.updateState(mSummaryPreference);
- }
-
private static boolean isGuestUser(Context context) {
if (context == null) return false;
final UserManager userManager = context.getSystemService(UserManager.class);
diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java
index 0c6f4c8..2bbf3e2 100644
--- a/src/com/android/settings/datausage/DataUsageUtils.java
+++ b/src/com/android/settings/datausage/DataUsageUtils.java
@@ -17,7 +17,6 @@
import static android.content.pm.PackageManager.FEATURE_ETHERNET;
import static android.content.pm.PackageManager.FEATURE_USB_HOST;
import static android.content.pm.PackageManager.FEATURE_WIFI;
-import static android.telephony.TelephonyManager.SIM_STATE_READY;
import android.app.usage.NetworkStats.Bucket;
import android.app.usage.NetworkStatsManager;
@@ -49,7 +48,6 @@
public final class DataUsageUtils {
static final boolean TEST_RADIOS = false;
static final String TEST_RADIOS_PROP = "test.radios";
- private static final boolean LOGD = false;
private static final String ETHERNET = "ethernet";
private static final String TAG = "DataUsageUtils";
@@ -107,44 +105,6 @@
}
/**
- * Test if device has a mobile data radio with SIM in ready state.
- */
- public static boolean hasReadyMobileRadio(Context context) {
- if (DataUsageUtils.TEST_RADIOS) {
- return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile");
- }
- final List<SubscriptionInfo> subInfoList =
- ProxySubscriptionManager.getInstance(context)
- .getActiveSubscriptionsInfo();
- // No activated Subscriptions
- if (subInfoList == null) {
- if (LOGD) {
- Log.d(TAG, "hasReadyMobileRadio: subInfoList=null");
- }
- return false;
- }
- final TelephonyManager tele = context.getSystemService(TelephonyManager.class);
- // require both supported network and ready SIM
- boolean isReady = true;
- for (SubscriptionInfo subInfo : subInfoList) {
- isReady = isReady & tele.getSimState(subInfo.getSimSlotIndex()) == SIM_STATE_READY;
- if (LOGD) {
- Log.d(TAG, "hasReadyMobileRadio: subInfo=" + subInfo);
- }
- }
-
- final boolean isDataCapable = tele.isDataCapable();
- final boolean retVal = isDataCapable && isReady;
- if (LOGD) {
- Log.d(TAG, "hasReadyMobileRadio:"
- + " telephonManager.isDataCapable()="
- + isDataCapable
- + " isReady=" + isReady);
- }
- return retVal;
- }
-
- /**
* Whether device has a Wi-Fi data radio.
*/
public static boolean hasWifiRadio(Context context) {
diff --git a/src/com/android/settings/datausage/SpinnerPreference.java b/src/com/android/settings/datausage/SpinnerPreference.java
index a705079..c81ac55 100644
--- a/src/com/android/settings/datausage/SpinnerPreference.java
+++ b/src/com/android/settings/datausage/SpinnerPreference.java
@@ -94,7 +94,6 @@
@Override
public void onItemSelected(
AdapterView<?> parent, View view, int position, long id) {
- if (mPosition == position) return;
mPosition = position;
mCurrentObject = mAdapter.getItem(position);
if (mListener != null) {
diff --git a/src/com/android/settings/datausage/lib/AppDataUsageDetailsRepository.kt b/src/com/android/settings/datausage/lib/AppDataUsageDetailsRepository.kt
new file mode 100644
index 0000000..94801ef
--- /dev/null
+++ b/src/com/android/settings/datausage/lib/AppDataUsageDetailsRepository.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2023 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.datausage.lib
+
+import android.app.usage.NetworkStats
+import android.content.Context
+import android.net.NetworkTemplate
+import android.util.Range
+import androidx.annotation.VisibleForTesting
+import com.android.settings.datausage.lib.AppDataUsageRepository.Companion.withSdkSandboxUids
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+
+interface IAppDataUsageDetailsRepository {
+ suspend fun queryDetailsForCycles(): List<NetworkUsageDetailsData>
+}
+
+class AppDataUsageDetailsRepository @JvmOverloads constructor(
+ context: Context,
+ private val template: NetworkTemplate,
+ private val cycles: List<Long>?,
+ uids: List<Int>,
+ private val networkCycleDataRepository: INetworkCycleDataRepository =
+ NetworkCycleDataRepository(context, template),
+) : IAppDataUsageDetailsRepository {
+ private val withSdkSandboxUids = withSdkSandboxUids(uids)
+ private val networkStatsRepository = NetworkStatsRepository(context, template)
+
+ override suspend fun queryDetailsForCycles(): List<NetworkUsageDetailsData> = coroutineScope {
+ getCycles().map {
+ async {
+ queryDetails(it)
+ }
+ }.awaitAll().filter { it.totalUsage > 0 }
+ }
+
+ private fun getCycles(): List<Range<Long>> =
+ cycles?.zipWithNext { endTime, startTime -> Range(startTime, endTime) }
+ ?: networkCycleDataRepository.getCycles()
+
+ private fun queryDetails(range: Range<Long>): NetworkUsageDetailsData {
+ var totalUsage = 0L
+ var foregroundUsage = 0L
+ for (uid in withSdkSandboxUids) {
+ val usage = getUsage(range, uid, NetworkStats.Bucket.STATE_ALL)
+ if (usage > 0L) {
+ totalUsage += usage
+ foregroundUsage += getUsage(range, uid, NetworkStats.Bucket.STATE_FOREGROUND)
+ }
+ }
+ return NetworkUsageDetailsData(
+ range = range,
+ totalUsage = totalUsage,
+ foregroundUsage = foregroundUsage,
+ backgroundUsage = totalUsage - foregroundUsage,
+ )
+ }
+
+ @VisibleForTesting
+ fun getUsage(range: Range<Long>, uid: Int, state: Int): Long =
+ networkStatsRepository.queryAggregateForUid(range, uid, state)?.usage ?: 0
+}
diff --git a/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt b/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt
index 074a555..de90594 100644
--- a/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt
+++ b/src/com/android/settings/datausage/lib/AppDataUsageRepository.kt
@@ -17,16 +17,17 @@
package com.android.settings.datausage.lib
import android.app.usage.NetworkStats
-import android.app.usage.NetworkStatsManager
import android.content.Context
import android.net.NetworkPolicyManager
import android.net.NetworkTemplate
import android.os.Process
import android.os.UserHandle
-import android.util.Log
import android.util.SparseArray
+import android.util.SparseBooleanArray
import androidx.annotation.VisibleForTesting
+import androidx.core.util.keyIterator
import com.android.settings.R
+import com.android.settings.datausage.lib.NetworkStatsRepository.Companion.Bucket
import com.android.settingslib.AppItem
import com.android.settingslib.net.UidDetailProvider
import com.android.settingslib.spaprivileged.framework.common.userManager
@@ -34,14 +35,14 @@
class AppDataUsageRepository(
private val context: Context,
private val currentUserId: Int,
- private val template: NetworkTemplate,
+ template: NetworkTemplate,
private val getPackageName: (AppItem) -> String?,
) {
- private val networkStatsManager = context.getSystemService(NetworkStatsManager::class.java)!!
+ private val networkStatsRepository = NetworkStatsRepository(context, template)
fun getAppPercent(carrierId: Int?, startTime: Long, endTime: Long): List<Pair<AppItem, Int>> {
- val networkStats = querySummary(startTime, endTime) ?: return emptyList()
- return getAppPercent(carrierId, convertToBuckets(networkStats))
+ val buckets = networkStatsRepository.querySummary(startTime, endTime)
+ return getAppPercent(carrierId, buckets)
}
@VisibleForTesting
@@ -76,13 +77,6 @@
}
}
- private fun querySummary(startTime: Long, endTime: Long): NetworkStats? = try {
- networkStatsManager.querySummary(template, startTime, endTime)
- } catch (e: RuntimeException) {
- Log.e(TAG, "Exception querying network detail.", e)
- null
- }
-
private fun filterItems(carrierId: Int?, items: List<AppItem>): List<AppItem> {
// When there is no specified SubscriptionInfo, Wi-Fi data usage will be displayed.
// In this case, the carrier service package also needs to be hidden.
@@ -126,12 +120,7 @@
items = items,
)
}
- // Map SDK sandbox back to its corresponding app
- collapseKey = if (Process.isSdkSandboxUid(uid)) {
- Process.getAppUidForSdkSandboxUid(uid)
- } else {
- uid
- }
+ collapseKey = getAppUid(uid)
category = AppItem.CATEGORY_APP
} else {
// If it is a removed user add it to the removed users' key
@@ -192,23 +181,33 @@
}
companion object {
- private const val TAG = "AppDataUsageRepository"
+ @JvmStatic
+ fun getAppUidList(uids: SparseBooleanArray) =
+ uids.keyIterator().asSequence().map { getAppUid(it) }.distinct().toList()
- @VisibleForTesting
- data class Bucket(
- val uid: Int,
- val bytes: Long,
- )
+ @JvmStatic
+ fun getAppUid(uid: Int): Int {
+ if (Process.isSdkSandboxUid(uid)) {
+ // For a sandbox process, get the associated app UID
+ return Process.getAppUidForSdkSandboxUid(uid)
+ }
+ return uid
+ }
- private fun convertToBuckets(stats: NetworkStats): List<Bucket> {
- val buckets = mutableListOf<Bucket>()
- stats.use {
- val bucket = NetworkStats.Bucket()
- while (it.getNextBucket(bucket)) {
- buckets += Bucket(uid = bucket.uid, bytes = bucket.rxBytes + bucket.txBytes)
+ /**
+ * Gets the apps' uids, also add the apps' SDK sandboxes' uids.
+ *
+ * In case we've been asked data usage for an app, include data usage of the corresponding
+ * SDK sandbox.
+ */
+ fun withSdkSandboxUids(uids: List<Int>): List<Int> {
+ val set = uids.toMutableSet()
+ for (uid in uids) {
+ if (Process.isApplicationUid(uid)) {
+ set += Process.toSdkSandboxUid(uid)
}
}
- return buckets
+ return set.toList()
}
}
}
diff --git a/src/com/android/settings/datausage/lib/AppDataUsageSummaryRepository.kt b/src/com/android/settings/datausage/lib/AppDataUsageSummaryRepository.kt
new file mode 100644
index 0000000..5579de0
--- /dev/null
+++ b/src/com/android/settings/datausage/lib/AppDataUsageSummaryRepository.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2023 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.datausage.lib
+
+import android.content.Context
+import android.net.NetworkTemplate
+import com.android.settings.datausage.lib.AppDataUsageRepository.Companion.withSdkSandboxUids
+import com.android.settings.datausage.lib.NetworkStatsRepository.Companion.AllTimeRange
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+
+interface IAppDataUsageSummaryRepository {
+ suspend fun querySummary(uid: Int): NetworkUsageData?
+}
+
+class AppDataUsageSummaryRepository(
+ context: Context,
+ template: NetworkTemplate,
+ private val networkStatsRepository: NetworkStatsRepository =
+ NetworkStatsRepository(context, template),
+) : IAppDataUsageSummaryRepository {
+
+ override suspend fun querySummary(uid: Int): NetworkUsageData? = coroutineScope {
+ withSdkSandboxUids(listOf(uid)).map { uid ->
+ async {
+ networkStatsRepository.queryAggregateForUid(range = AllTimeRange, uid = uid)
+ }
+ }.awaitAll().filterNotNull().aggregate()
+ }
+}
diff --git a/src/com/android/settings/datausage/lib/AppPreferenceRepository.kt b/src/com/android/settings/datausage/lib/AppPreferenceRepository.kt
new file mode 100644
index 0000000..a71bc8f
--- /dev/null
+++ b/src/com/android/settings/datausage/lib/AppPreferenceRepository.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2023 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.datausage.lib
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.UserHandle
+import androidx.preference.Preference
+import com.android.settingslib.Utils
+
+class AppPreferenceRepository(private val context: Context) {
+ private val packageManager = context.packageManager
+
+ fun loadAppPreferences(uids: List<Int>): List<Preference> = uids.flatMap { uid ->
+ val userId = UserHandle.getUserId(uid)
+ getPackagesForUid(uid).mapNotNull { packageName ->
+ getPreference(packageName, userId)
+ }
+ }
+
+ private fun getPackagesForUid(uid: Int): Array<String> =
+ packageManager.getPackagesForUid(uid) ?: emptyArray()
+
+ private fun getPreference(packageName: String, userId: Int): Preference? = try {
+ val app = packageManager.getApplicationInfoAsUser(packageName, 0, userId)
+ Preference(context).apply {
+ icon = Utils.getBadgedIcon(context, app)
+ title = app.loadLabel(packageManager)
+ isSelectable = false
+ }
+ } catch (e: PackageManager.NameNotFoundException) {
+ null
+ }
+}
diff --git a/src/com/android/settings/datausage/lib/NetworkCycleDataRepository.kt b/src/com/android/settings/datausage/lib/NetworkCycleDataRepository.kt
index f10d506..4e97c6d 100644
--- a/src/com/android/settings/datausage/lib/NetworkCycleDataRepository.kt
+++ b/src/com/android/settings/datausage/lib/NetworkCycleDataRepository.kt
@@ -16,39 +16,37 @@
package com.android.settings.datausage.lib
-import android.app.usage.NetworkStats
-import android.app.usage.NetworkStatsManager
import android.content.Context
import android.net.NetworkPolicy
import android.net.NetworkPolicyManager
import android.net.NetworkTemplate
import android.text.format.DateUtils
-import android.util.Log
import android.util.Range
-import androidx.annotation.VisibleForTesting
import com.android.settingslib.NetworkPolicyEditor
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
+import com.android.settingslib.spa.framework.util.asyncMap
interface INetworkCycleDataRepository {
suspend fun loadCycles(): List<NetworkUsageData>
+ fun getCycles(): List<Range<Long>>
fun getPolicy(): NetworkPolicy?
- suspend fun querySummary(startTime: Long, endTime: Long): NetworkCycleChartData?
+ suspend fun queryChartData(startTime: Long, endTime: Long): NetworkCycleChartData?
}
class NetworkCycleDataRepository(
context: Context,
private val networkTemplate: NetworkTemplate,
+ private val networkStatsRepository: NetworkStatsRepository =
+ NetworkStatsRepository(context, networkTemplate),
) : INetworkCycleDataRepository {
- private val networkStatsManager = context.getSystemService(NetworkStatsManager::class.java)!!
private val policyManager = context.getSystemService(NetworkPolicyManager::class.java)!!
override suspend fun loadCycles(): List<NetworkUsageData> =
getCycles().queryUsage().filter { it.usage > 0 }
- private fun getCycles(): List<Range<Long>> {
+ fun loadFirstCycle(): NetworkUsageData? = getCycles().firstOrNull()?.let { queryUsage(it) }
+
+ override fun getCycles(): List<Range<Long>> {
val policy = getPolicy() ?: return queryCyclesAsFourWeeks()
return policy.cycleIterator().asSequence().map {
Range(it.lower.toInstant().toEpochMilli(), it.upper.toInstant().toEpochMilli())
@@ -56,7 +54,7 @@
}
private fun queryCyclesAsFourWeeks(): List<Range<Long>> {
- val timeRange = getTimeRange()
+ val timeRange = networkStatsRepository.getTimeRange() ?: return emptyList()
return reverseBucketRange(
startTime = timeRange.lower,
endTime = timeRange.upper,
@@ -64,30 +62,14 @@
)
}
- @VisibleForTesting
- fun getTimeRange(): Range<Long> = getTimeRangeOf(
- networkStatsManager.queryDetailsForDevice(networkTemplate, Long.MIN_VALUE, Long.MAX_VALUE)
- )
-
- private fun getTimeRangeOf(stats: NetworkStats): Range<Long> {
- var start = Long.MAX_VALUE
- var end = Long.MIN_VALUE
- val bucket = NetworkStats.Bucket()
- while (stats.getNextBucket(bucket)) {
- start = start.coerceAtMost(bucket.startTimeStamp)
- end = end.coerceAtLeast(bucket.endTimeStamp)
- }
- return Range(start, end)
- }
-
override fun getPolicy(): NetworkPolicy? =
with(NetworkPolicyEditor(policyManager)) {
read()
getPolicy(networkTemplate)
}
- override suspend fun querySummary(startTime: Long, endTime: Long): NetworkCycleChartData? {
- val usage = getUsage(startTime, endTime)
+ override suspend fun queryChartData(startTime: Long, endTime: Long): NetworkCycleChartData? {
+ val usage = networkStatsRepository.querySummaryForDevice(startTime, endTime)
if (usage > 0L) {
return NetworkCycleChartData(
total = NetworkUsageData(startTime, endTime, usage),
@@ -101,17 +83,14 @@
return null
}
- private suspend fun List<Range<Long>>.queryUsage(): List<NetworkUsageData> = coroutineScope {
- map { range ->
- async {
- NetworkUsageData(
- startTime = range.lower,
- endTime = range.upper,
- usage = getUsage(range.lower, range.upper),
- )
- }
- }.awaitAll()
- }
+ private suspend fun List<Range<Long>>.queryUsage(): List<NetworkUsageData> =
+ asyncMap { queryUsage(it) }
+
+ fun queryUsage(range: Range<Long>) = NetworkUsageData(
+ startTime = range.lower,
+ endTime = range.upper,
+ usage = networkStatsRepository.querySummaryForDevice(range.lower, range.upper),
+ )
private fun bucketRange(startTime: Long, endTime: Long, bucketSize: Long): List<Range<Long>> {
val buckets = mutableListOf<Range<Long>>()
@@ -138,17 +117,4 @@
}
return buckets
}
-
- private fun getUsage(start: Long, end: Long): Long = try {
- networkStatsManager.querySummaryForDevice(networkTemplate, start, end).let {
- it.rxBytes + it.txBytes
- }
- } catch (e: Exception) {
- Log.e(TAG, "Exception querying network detail.", e)
- 0
- }
-
- companion object {
- private const val TAG = "NetworkCycleDataRepository"
- }
}
diff --git a/src/com/android/settings/datausage/lib/NetworkStatsRepository.kt b/src/com/android/settings/datausage/lib/NetworkStatsRepository.kt
new file mode 100644
index 0000000..22f9dd0
--- /dev/null
+++ b/src/com/android/settings/datausage/lib/NetworkStatsRepository.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2023 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.datausage.lib
+
+import android.app.usage.NetworkStats
+import android.app.usage.NetworkStatsManager
+import android.content.Context
+import android.net.NetworkTemplate
+import android.util.Log
+import android.util.Range
+
+class NetworkStatsRepository(context: Context, private val template: NetworkTemplate) {
+ private val networkStatsManager = context.getSystemService(NetworkStatsManager::class.java)!!
+
+ fun queryAggregateForUid(
+ range: Range<Long>,
+ uid: Int,
+ state: Int = NetworkStats.Bucket.STATE_ALL,
+ ): NetworkUsageData? = try {
+ networkStatsManager.queryDetailsForUidTagState(
+ template, range.lower, range.upper, uid, NetworkStats.Bucket.TAG_NONE, state,
+ ).aggregate()
+ } catch (e: Exception) {
+ Log.e(TAG, "Exception queryDetailsForUidTagState", e)
+ null
+ }
+
+ fun getTimeRange(): Range<Long>? = try {
+ networkStatsManager.queryDetailsForDevice(template, Long.MIN_VALUE, Long.MAX_VALUE)
+ .aggregate()?.timeRange
+ } catch (e: Exception) {
+ Log.e(TAG, "Exception queryDetailsForDevice", e)
+ null
+ }
+
+ fun querySummaryForDevice(startTime: Long, endTime: Long): Long = try {
+ networkStatsManager.querySummaryForDevice(template, startTime, endTime).bytes
+ } catch (e: Exception) {
+ Log.e(TAG, "Exception querySummaryForDevice", e)
+ 0
+ }
+
+ fun querySummary(startTime: Long, endTime: Long): List<Bucket> = try {
+ networkStatsManager.querySummary(template, startTime, endTime).convertToBuckets()
+ } catch (e: Exception) {
+ Log.e(TAG, "Exception querySummary", e)
+ emptyList()
+ }
+
+ companion object {
+ private const val TAG = "NetworkStatsRepository"
+
+ val AllTimeRange = Range(Long.MIN_VALUE, Long.MAX_VALUE)
+
+ data class Bucket(
+ val uid: Int,
+ val bytes: Long,
+ )
+
+ private fun NetworkStats.convertToBuckets(): List<Bucket> = use {
+ val buckets = mutableListOf<Bucket>()
+ val bucket = NetworkStats.Bucket()
+ while (getNextBucket(bucket)) {
+ buckets += Bucket(uid = bucket.uid, bytes = bucket.bytes)
+ }
+ buckets
+ }
+
+ private fun NetworkStats.aggregate(): NetworkUsageData? = use {
+ var startTime = Long.MAX_VALUE
+ var endTime = Long.MIN_VALUE
+ var usage = 0L
+ val bucket = NetworkStats.Bucket()
+ while (getNextBucket(bucket)) {
+ startTime = startTime.coerceAtMost(bucket.startTimeStamp)
+ endTime = endTime.coerceAtLeast(bucket.endTimeStamp)
+ usage += bucket.bytes
+ }
+ when {
+ startTime > endTime -> null
+ else -> NetworkUsageData(startTime, endTime, usage)
+ }
+ }
+
+ private val NetworkStats.Bucket.bytes: Long
+ get() = rxBytes + txBytes
+ }
+}
diff --git a/src/com/android/settings/datausage/lib/NetworkTemplates.kt b/src/com/android/settings/datausage/lib/NetworkTemplates.kt
new file mode 100644
index 0000000..9020070
--- /dev/null
+++ b/src/com/android/settings/datausage/lib/NetworkTemplates.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2023 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.datausage.lib
+
+import android.content.Context
+import android.net.NetworkTemplate
+import android.telephony.SubscriptionManager
+import androidx.annotation.StringRes
+import com.android.settings.R
+import com.android.settings.datausage.DataUsageUtils
+
+interface INetworkTemplates {
+ /**
+ * Returns the default network template based on the availability of mobile data, Wifi. Returns
+ * ethernet template if both mobile data and Wifi are not available.
+ */
+ fun getDefaultTemplate(context: Context): NetworkTemplate
+}
+
+object NetworkTemplates : INetworkTemplates {
+ @JvmStatic
+ @StringRes
+ fun NetworkTemplate.getTitleResId(): Int =
+ when (matchRule) {
+ NetworkTemplate.MATCH_MOBILE,
+ NetworkTemplate.MATCH_CARRIER -> R.string.cellular_data_usage
+
+ NetworkTemplate.MATCH_WIFI -> R.string.wifi_data_usage
+ NetworkTemplate.MATCH_ETHERNET -> R.string.ethernet_data_usage
+ else -> R.string.data_usage_app_summary_title
+ }
+
+ /**
+ * Returns the default network template based on the availability of mobile data, Wifi. Returns
+ * ethernet template if both mobile data and Wifi are not available.
+ */
+ override fun getDefaultTemplate(context: Context): NetworkTemplate =
+ DataUsageUtils.getDefaultTemplate(
+ context,
+ SubscriptionManager.getDefaultDataSubscriptionId(),
+ )
+}
diff --git a/src/com/android/settings/datausage/lib/NetworkUsageData.kt b/src/com/android/settings/datausage/lib/NetworkUsageData.kt
index fc5db2b..93cde5f 100644
--- a/src/com/android/settings/datausage/lib/NetworkUsageData.kt
+++ b/src/com/android/settings/datausage/lib/NetworkUsageData.kt
@@ -16,6 +16,12 @@
package com.android.settings.datausage.lib
+import android.content.Context
+import android.text.format.DateUtils
+import android.util.Range
+import com.android.settings.R
+import com.android.settings.datausage.DataUsageUtils
+
/**
* Base data structure representing usage data in a period.
*/
@@ -23,4 +29,30 @@
val startTime: Long,
val endTime: Long,
val usage: Long,
-)
+) {
+ val timeRange = Range(startTime, endTime)
+
+ fun formatStartDate(context: Context): String =
+ DateUtils.formatDateTime(context, startTime, DATE_FORMAT)
+
+ fun formatDateRange(context: Context): String =
+ DateUtils.formatDateRange(context, startTime, endTime, DATE_FORMAT)
+
+ fun formatUsage(context: Context): CharSequence = DataUsageUtils.formatDataUsage(context, usage)
+
+ fun getDataUsedString(context: Context): String =
+ context.getString(R.string.data_used_template, formatUsage(context))
+
+ private companion object {
+ const val DATE_FORMAT = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_ABBREV_MONTH
+ }
+}
+
+fun List<NetworkUsageData>.aggregate(): NetworkUsageData? = when {
+ isEmpty() -> null
+ else -> NetworkUsageData(
+ startTime = minOf { it.startTime },
+ endTime = maxOf { it.endTime },
+ usage = sumOf { it.usage },
+ )
+}
diff --git a/src/com/android/settings/datausage/lib/NetworkUsageDetailsData.kt b/src/com/android/settings/datausage/lib/NetworkUsageDetailsData.kt
new file mode 100644
index 0000000..19ff81c
--- /dev/null
+++ b/src/com/android/settings/datausage/lib/NetworkUsageDetailsData.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2023 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.datausage.lib
+
+import android.util.Range
+
+/**
+ * Details data structure representing usage data in a period.
+ */
+data class NetworkUsageDetailsData(
+ val range: Range<Long>,
+ val totalUsage: Long,
+ val foregroundUsage: Long,
+ val backgroundUsage: Long,
+) {
+ companion object {
+ val AllZero = NetworkUsageDetailsData(
+ range = Range(0, 0),
+ totalUsage = 0,
+ foregroundUsage = 0,
+ backgroundUsage = 0,
+ )
+ }
+}
diff --git a/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java b/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java
index d5d4025..a967888 100644
--- a/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java
+++ b/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java
@@ -16,11 +16,12 @@
package com.android.settings.development;
+import static com.android.internal.display.RefreshRateSettingsUtils.DEFAULT_REFRESH_RATE;
+import static com.android.internal.display.RefreshRateSettingsUtils.findHighestRefreshRateForDefaultDisplay;
+
import android.content.Context;
-import android.hardware.display.DisplayManager;
import android.provider.Settings;
import android.util.Log;
-import android.view.Display;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -35,9 +36,6 @@
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
@VisibleForTesting
- static float DEFAULT_REFRESH_RATE = 60f;
-
- @VisibleForTesting
static float NO_CONFIG = 0f;
@VisibleForTesting
@@ -48,17 +46,7 @@
public ForcePeakRefreshRatePreferenceController(Context context) {
super(context);
-
- final DisplayManager dm = context.getSystemService(DisplayManager.class);
- final Display display = dm.getDisplay(Display.DEFAULT_DISPLAY);
-
- if (display == null) {
- Log.w(TAG, "No valid default display device");
- mPeakRefreshRate = DEFAULT_REFRESH_RATE;
- } else {
- mPeakRefreshRate = findPeakRefreshRate(display.getSupportedModes());
- }
-
+ mPeakRefreshRate = findHighestRefreshRateForDefaultDisplay(context);
Log.d(TAG, "DEFAULT_REFRESH_RATE : " + DEFAULT_REFRESH_RATE
+ " mPeakRefreshRate : " + mPeakRefreshRate);
}
@@ -107,7 +95,7 @@
@VisibleForTesting
void forcePeakRefreshRate(boolean enable) {
- final float peakRefreshRate = enable ? mPeakRefreshRate : NO_CONFIG;
+ final float peakRefreshRate = enable ? Float.POSITIVE_INFINITY : NO_CONFIG;
Settings.System.putFloat(mContext.getContentResolver(),
Settings.System.MIN_REFRESH_RATE, peakRefreshRate);
}
@@ -116,17 +104,7 @@
final float peakRefreshRate = Settings.System.getFloat(mContext.getContentResolver(),
Settings.System.MIN_REFRESH_RATE, NO_CONFIG);
- return peakRefreshRate >= mPeakRefreshRate;
- }
-
- private float findPeakRefreshRate(Display.Mode[] modes) {
- float peakRefreshRate = DEFAULT_REFRESH_RATE;
- for (Display.Mode mode : modes) {
- if (Math.round(mode.getRefreshRate()) > peakRefreshRate) {
- peakRefreshRate = mode.getRefreshRate();
- }
- }
-
- return peakRefreshRate;
+ return Math.round(peakRefreshRate) == Math.round(mPeakRefreshRate)
+ || Float.isInfinite(peakRefreshRate);
}
}
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java
index 95cf64c..992136c 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java
@@ -170,9 +170,10 @@
((SwitchPreference) mPreference).setChecked(false);
}
- // Regardless of whether ANGLE is enabled, disable the developer option UI
- // as long as UI is not enabled via debug property.
- if (!isAngleDeveloperOptionEnabled()) {
+ // Disable the developer option toggle UI if ANGLE is disabled, this means next time the
+ // debug property needs to be set to true again to enable ANGLE. If ANGLE is enabled, don't
+ // disable the developer option toggle UI so that it can be turned off easily.
+ if (!isAngleDeveloperOptionEnabled() && !((SwitchPreference) mPreference).isChecked()) {
mPreference.setEnabled(false);
}
}
diff --git a/src/com/android/settings/deviceinfo/StorageCategoryFragment.java b/src/com/android/settings/deviceinfo/StorageCategoryFragment.java
index 52f453d..1280057 100644
--- a/src/com/android/settings/deviceinfo/StorageCategoryFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageCategoryFragment.java
@@ -37,6 +37,7 @@
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment.ProfileType;
import com.android.settings.deviceinfo.storage.ManageStoragePreferenceController;
import com.android.settings.deviceinfo.storage.NonCurrentUserController;
import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
@@ -85,7 +86,7 @@
private StorageItemPreferenceController mPreferenceController;
private List<NonCurrentUserController> mNonCurrentUsers;
- private boolean mIsWorkProfile;
+ private @ProfileType int mProfileType;
private int mUserId;
private boolean mIsLoadedFromCache;
private StorageCacheHelper mStorageCacheHelper;
@@ -163,9 +164,9 @@
// These member variables are initialized befoer super.onAttach for
// createPreferenceControllers to work correctly.
mUserManager = context.getSystemService(UserManager.class);
- mIsWorkProfile = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE)
- == ProfileSelectFragment.ProfileType.WORK;
- mUserId = Utils.getCurrentUserId(mUserManager, mIsWorkProfile);
+ mProfileType = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE);
+ mUserId = Utils.getCurrentUserIdOfType(mUserManager, mProfileType);
+
mStorageCacheHelper = new StorageCacheHelper(getContext(), mUserId);
super.onAttach(context);
@@ -229,8 +230,12 @@
@Override
public int getMetricsCategory() {
- return mIsWorkProfile ? SettingsEnums.SETTINGS_STORAGE_CATEGORY_WORK :
- SettingsEnums.SETTINGS_STORAGE_CATEGORY;
+ if (mProfileType == ProfileSelectFragment.ProfileType.WORK) {
+ return SettingsEnums.SETTINGS_STORAGE_CATEGORY_WORK;
+ } else if (mProfileType == ProfileSelectFragment.ProfileType.PRIVATE) {
+ return SettingsEnums.SETTINGS_STORAGE_CATEGORY_PRIVATE;
+ }
+ return SettingsEnums.SETTINGS_STORAGE_CATEGORY;
}
@Override
@@ -248,11 +253,12 @@
final List<AbstractPreferenceController> controllers = new ArrayList<>();
final StorageManager sm = context.getSystemService(StorageManager.class);
mPreferenceController = new StorageItemPreferenceController(context, this,
- null /* volume */, new StorageManagerVolumeProvider(sm), mIsWorkProfile);
+ null /* volume */, new StorageManagerVolumeProvider(sm), mProfileType);
controllers.add(mPreferenceController);
- mNonCurrentUsers = mIsWorkProfile ? EMPTY_LIST :
- NonCurrentUserController.getNonCurrentUserControllers(context, mUserManager);
+ mNonCurrentUsers = mProfileType == ProfileSelectFragment.ProfileType.PERSONAL
+ ? NonCurrentUserController.getNonCurrentUserControllers(context, mUserManager)
+ : EMPTY_LIST;
controllers.addAll(mNonCurrentUsers);
return controllers;
}
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index f31f2be..0da3667 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -308,7 +308,6 @@
// These member variables are initialized befoer super.onAttach for
// createPreferenceControllers to work correctly.
mUserManager = context.getSystemService(UserManager.class);
- mIsWorkProfile = false;
mUserId = UserHandle.myUserId();
mStorageCacheHelper = new StorageCacheHelper(getContext(), mUserId);
@@ -423,7 +422,7 @@
final List<AbstractPreferenceController> controllers = new ArrayList<>();
final StorageManager sm = context.getSystemService(StorageManager.class);
mPreferenceController = new StorageItemPreferenceController(context, this,
- null /* volume */, new StorageManagerVolumeProvider(sm), mIsWorkProfile);
+ null /* volume */, new StorageManagerVolumeProvider(sm));
controllers.add(mPreferenceController);
mNonCurrentUsers = NonCurrentUserController.getNonCurrentUserControllers(context,
@@ -467,8 +466,7 @@
final UserManager userManager = context.getSystemService(UserManager.class);
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new StorageItemPreferenceController(context, null /* host */,
- null /* volume */, new StorageManagerVolumeProvider(sm),
- false /* isWorkProfile */));
+ null /* volume */, new StorageManagerVolumeProvider(sm)));
controllers.addAll(NonCurrentUserController.getNonCurrentUserControllers(
context, userManager));
return controllers;
diff --git a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java
index ccae7e9..1955f36 100644
--- a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java
@@ -27,6 +27,7 @@
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment.ProfileType;
import com.android.settings.deviceinfo.storage.StorageCacheHelper;
import com.android.settingslib.deviceinfo.PrivateStorageInfo;
import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
@@ -62,8 +63,8 @@
@VisibleForTesting
protected Future refreshSummaryThread(Preference preference) {
- int userId = Utils.getCurrentUserId(mContext.getSystemService(UserManager.class),
- /* isWorkProfile */ false);
+ int userId = Utils.getCurrentUserIdOfType(
+ mContext.getSystemService(UserManager.class), ProfileType.PERSONAL);
final StorageCacheHelper storageCacheHelper = new StorageCacheHelper(mContext, userId);
long cachedUsedSize = storageCacheHelper.retrieveUsedSize();
long cachedTotalSize = storageCacheHelper.retrieveCachedSize().totalSize;
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index a57cd5b..fd42417 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -17,11 +17,13 @@
package com.android.settings.deviceinfo.storage;
import static com.android.settings.dashboard.profileselector.ProfileSelectFragment.PERSONAL_TAB;
+import static com.android.settings.dashboard.profileselector.ProfileSelectFragment.PRIVATE_TAB;
import static com.android.settings.dashboard.profileselector.ProfileSelectFragment.WORK_TAB;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.net.Uri;
@@ -47,6 +49,7 @@
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.deviceinfo.StorageItemPreference;
import com.android.settings.deviceinfo.storage.StorageUtils.SystemInfoFragment;
import com.android.settings.overlay.FeatureFactory;
@@ -108,33 +111,33 @@
private final Fragment mFragment;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private final StorageVolumeProvider mSvp;
- private VolumeInfo mVolume;
+ @Nullable private VolumeInfo mVolume;
private int mUserId;
private long mUsedBytes;
private long mTotalSize;
- private List<StorageItemPreference> mPrivateStorageItemPreferences;
- private PreferenceScreen mScreen;
+ @Nullable private List<StorageItemPreference> mPrivateStorageItemPreferences;
+ @Nullable private PreferenceScreen mScreen;
@VisibleForTesting
- Preference mPublicStoragePreference;
+ @Nullable Preference mPublicStoragePreference;
@VisibleForTesting
- StorageItemPreference mImagesPreference;
+ @Nullable StorageItemPreference mImagesPreference;
@VisibleForTesting
- StorageItemPreference mVideosPreference;
+ @Nullable StorageItemPreference mVideosPreference;
@VisibleForTesting
- StorageItemPreference mAudioPreference;
+ @Nullable StorageItemPreference mAudioPreference;
@VisibleForTesting
- StorageItemPreference mAppsPreference;
+ @Nullable StorageItemPreference mAppsPreference;
@VisibleForTesting
- StorageItemPreference mGamesPreference;
+ @Nullable StorageItemPreference mGamesPreference;
@VisibleForTesting
- StorageItemPreference mDocumentsAndOtherPreference;
+ @Nullable StorageItemPreference mDocumentsAndOtherPreference;
@VisibleForTesting
- StorageItemPreference mSystemPreference;
+ @Nullable StorageItemPreference mSystemPreference;
@VisibleForTesting
- StorageItemPreference mTrashPreference;
+ @Nullable StorageItemPreference mTrashPreference;
- private boolean mIsWorkProfile;
+ private final int mProfileType;
private StorageCacheHelper mStorageCacheHelper;
// The mIsDocumentsPrefShown being used here is to prevent a flicker problem from displaying
@@ -142,15 +145,24 @@
private boolean mIsDocumentsPrefShown;
private boolean mIsPreferenceOrderedBySize;
- public StorageItemPreferenceController(Context context, Fragment hostFragment,
- VolumeInfo volume, StorageVolumeProvider svp, boolean isWorkProfile) {
+ public StorageItemPreferenceController(
+ Context context, Fragment hostFragment, VolumeInfo volume, StorageVolumeProvider svp) {
+ this(context, hostFragment, volume, svp, ProfileSelectFragment.ProfileType.PERSONAL);
+ }
+
+ public StorageItemPreferenceController(
+ Context context,
+ Fragment hostFragment,
+ @Nullable VolumeInfo volume,
+ StorageVolumeProvider svp,
+ @ProfileSelectFragment.ProfileType int profileType) {
super(context);
mPackageManager = context.getPackageManager();
mUserManager = context.getSystemService(UserManager.class);
mFragment = hostFragment;
mVolume = volume;
mSvp = svp;
- mIsWorkProfile = isWorkProfile;
+ mProfileType = profileType;
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
mUserId = getCurrentUserId();
mIsDocumentsPrefShown = isDocumentsPrefShown();
@@ -168,7 +180,7 @@
@VisibleForTesting
int getCurrentUserId() {
- return Utils.getCurrentUserId(mUserManager, mIsWorkProfile);
+ return Utils.getCurrentUserIdOfType(mUserManager, mProfileType);
}
@Override
@@ -229,7 +241,9 @@
mVolume = volume;
if (mPublicStoragePreference != null) {
- mPublicStoragePreference.setVisible(isValidPublicVolume() && !mIsWorkProfile);
+ mPublicStoragePreference.setVisible(
+ isValidPublicVolume()
+ && mProfileType == ProfileSelectFragment.ProfileType.PERSONAL);
}
// If isValidPrivateVolume() is true, these preferences will become visible at
@@ -327,9 +341,16 @@
* Sets the user id for which this preference controller is handling.
*/
public void setUserId(UserHandle userHandle) {
- if (mIsWorkProfile && !mUserManager.isManagedProfile(userHandle.getIdentifier())) {
+ if (mProfileType == ProfileSelectFragment.ProfileType.WORK
+ && !mUserManager.isManagedProfile(userHandle.getIdentifier())) {
throw new IllegalArgumentException("Only accept work profile userHandle");
}
+
+ UserInfo userInfo = mUserManager.getUserInfo(userHandle.getIdentifier());
+ if (mProfileType == ProfileSelectFragment.ProfileType.PRIVATE
+ && (userInfo == null || userInfo.isPrivateProfile())) {
+ throw new IllegalArgumentException("Only accept private profile userHandle");
+ }
mUserId = userHandle.getIdentifier();
tintPreference(mPublicStoragePreference);
@@ -498,8 +519,13 @@
private Bundle getWorkAnnotatedBundle(int additionalCapacity) {
final Bundle args = new Bundle(1 + additionalCapacity);
- args.putInt(SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB,
- mIsWorkProfile ? WORK_TAB : PERSONAL_TAB);
+ if (mProfileType == ProfileSelectFragment.ProfileType.WORK) {
+ args.putInt(SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB, WORK_TAB);
+ } else if (mProfileType == ProfileSelectFragment.ProfileType.PRIVATE) {
+ args.putInt(SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB, PRIVATE_TAB);
+ } else {
+ args.putInt(SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB, PERSONAL_TAB);
+ }
return args;
}
diff --git a/src/com/android/settings/display/PeakRefreshRatePreferenceController.java b/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
index dfcc601..c24ad22 100644
--- a/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
+++ b/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
@@ -16,13 +16,15 @@
package com.android.settings.display;
+import static com.android.internal.display.RefreshRateSettingsUtils.DEFAULT_REFRESH_RATE;
+import static com.android.internal.display.RefreshRateSettingsUtils.findHighestRefreshRateForDefaultDisplay;
+
import android.content.Context;
import android.hardware.display.DisplayManager;
import android.os.Handler;
import android.provider.DeviceConfig;
import android.provider.Settings;
import android.util.Log;
-import android.view.Display;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -39,8 +41,6 @@
public class PeakRefreshRatePreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnStart, OnStop {
- @VisibleForTesting static float DEFAULT_REFRESH_RATE = 60f;
-
@VisibleForTesting float mPeakRefreshRate;
private static final String TAG = "RefreshRatePrefCtr";
@@ -48,7 +48,7 @@
private final Handler mHandler;
private final IDeviceConfigChange mOnDeviceConfigChange;
- private final DeviceConfigDisplaySettings mDeviceConfigDisplaySettings;
+ private DeviceConfigDisplaySettings mDeviceConfigDisplaySettings;
private Preference mPreference;
private interface IDeviceConfigChange {
@@ -65,17 +65,7 @@
updateState(mPreference);
}
};
-
- final DisplayManager dm = mContext.getSystemService(DisplayManager.class);
- final Display display = dm.getDisplay(Display.DEFAULT_DISPLAY);
-
- if (display == null) {
- Log.w(TAG, "No valid default display device");
- mPeakRefreshRate = DEFAULT_REFRESH_RATE;
- } else {
- mPeakRefreshRate = findPeakRefreshRate(display.getSupportedModes());
- }
-
+ mPeakRefreshRate = findHighestRefreshRateForDefaultDisplay(context);
Log.d(
TAG,
"DEFAULT_REFRESH_RATE : "
@@ -111,12 +101,13 @@
mContext.getContentResolver(),
Settings.System.PEAK_REFRESH_RATE,
getDefaultPeakRefreshRate());
- return Math.round(peakRefreshRate) == Math.round(mPeakRefreshRate);
+ return Math.round(peakRefreshRate) == Math.round(mPeakRefreshRate)
+ || Float.isInfinite(peakRefreshRate);
}
@Override
public boolean setChecked(boolean isChecked) {
- final float peakRefreshRate = isChecked ? mPeakRefreshRate : DEFAULT_REFRESH_RATE;
+ final float peakRefreshRate = isChecked ? Float.POSITIVE_INFINITY : DEFAULT_REFRESH_RATE;
Log.d(TAG, "setChecked to : " + peakRefreshRate);
return Settings.System.putFloat(
@@ -139,17 +130,13 @@
}
@VisibleForTesting
- float findPeakRefreshRate(Display.Mode[] modes) {
- float peakRefreshRate = DEFAULT_REFRESH_RATE;
- for (Display.Mode mode : modes) {
- if (Math.round(mode.getRefreshRate()) > peakRefreshRate) {
- peakRefreshRate = mode.getRefreshRate();
- }
- }
- return peakRefreshRate;
+ void injectDeviceConfigDisplaySettings(
+ DeviceConfigDisplaySettings deviceConfigDisplaySettings) {
+ mDeviceConfigDisplaySettings = deviceConfigDisplaySettings;
}
- private class DeviceConfigDisplaySettings
+ @VisibleForTesting
+ class DeviceConfigDisplaySettings
implements DeviceConfig.OnPropertiesChangedListener, Executor {
public void startListening() {
DeviceConfig.addOnPropertiesChangedListener(
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java
index f25e16f..eebf1f5 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java
@@ -131,14 +131,14 @@
final PowerUsageFeatureProvider featureProvider,
final @NonNull Set<String> systemAppsPackageNames,
final @NonNull Set<Integer> systemAppsUids) {
+ combineIntoUninstalledApps(context, mAppEntries);
combineIntoSystemApps(
context, featureProvider, systemAppsPackageNames, systemAppsUids, mAppEntries);
combineSystemItemsIntoOthers(context, featureProvider, mSystemEntries);
}
private static void purgeBatteryDiffData(
- final PowerUsageFeatureProvider featureProvider,
- final List<BatteryDiffEntry> entries) {
+ final PowerUsageFeatureProvider featureProvider, final List<BatteryDiffEntry> entries) {
final double screenOnTimeThresholdInMs =
featureProvider.getBatteryUsageListScreenOnTimeThresholdInMs();
final double consumePowerThreshold =
@@ -155,7 +155,7 @@
final String packageName = entry.getPackageName();
final Integer componentId = entry.mComponentId;
if ((screenOnTimeInMs < screenOnTimeThresholdInMs
- && comsumePower < consumePowerThreshold)
+ && comsumePower < consumePowerThreshold)
|| ConvertUtils.FAKE_PACKAGE_NAME.equals(packageName)
|| hideSystemComponentSet.contains(componentId)
|| (packageName != null && hideApplicationSet.contains(packageName))) {
@@ -178,18 +178,23 @@
final Iterator<BatteryDiffEntry> appListIterator = appEntries.iterator();
while (appListIterator.hasNext()) {
final BatteryDiffEntry batteryDiffEntry = appListIterator.next();
- if (needsCombineInSystemApp(batteryDiffEntry, systemAppsAllowlist,
- systemAppsPackageNames, systemAppsUids)) {
+ if (needsCombineInSystemApp(
+ batteryDiffEntry,
+ systemAppsAllowlist,
+ systemAppsPackageNames,
+ systemAppsUids)) {
if (systemAppsDiffEntry == null) {
- systemAppsDiffEntry = new BatteryDiffEntry(context,
- BatteryDiffEntry.SYSTEM_APPS_KEY, BatteryDiffEntry.SYSTEM_APPS_KEY,
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
+ systemAppsDiffEntry =
+ new BatteryDiffEntry(
+ context,
+ BatteryDiffEntry.SYSTEM_APPS_KEY,
+ BatteryDiffEntry.SYSTEM_APPS_KEY,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
}
systemAppsDiffEntry.mConsumePower += batteryDiffEntry.mConsumePower;
systemAppsDiffEntry.mForegroundUsageTimeInMs +=
batteryDiffEntry.mForegroundUsageTimeInMs;
- systemAppsDiffEntry.setTotalConsumePower(
- batteryDiffEntry.getTotalConsumePower());
+ systemAppsDiffEntry.setTotalConsumePower(batteryDiffEntry.getTotalConsumePower());
appListIterator.remove();
}
}
@@ -198,6 +203,35 @@
}
}
+ private static void combineIntoUninstalledApps(
+ final Context context, final @NonNull List<BatteryDiffEntry> appEntries) {
+ BatteryDiffEntry uninstalledAppDiffEntry = null;
+ final Iterator<BatteryDiffEntry> appListIterator = appEntries.iterator();
+ while (appListIterator.hasNext()) {
+ final BatteryDiffEntry batteryDiffEntry = appListIterator.next();
+ if (!batteryDiffEntry.isUninstalledEntry()) {
+ continue;
+ }
+
+ if (uninstalledAppDiffEntry == null) {
+ uninstalledAppDiffEntry =
+ new BatteryDiffEntry(
+ context,
+ BatteryDiffEntry.UNINSTALLED_APPS_KEY,
+ BatteryDiffEntry.UNINSTALLED_APPS_KEY,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
+ }
+ uninstalledAppDiffEntry.mConsumePower += batteryDiffEntry.mConsumePower;
+ uninstalledAppDiffEntry.mForegroundUsageTimeInMs +=
+ batteryDiffEntry.mForegroundUsageTimeInMs;
+ uninstalledAppDiffEntry.setTotalConsumePower(batteryDiffEntry.getTotalConsumePower());
+ appListIterator.remove();
+ }
+ if (uninstalledAppDiffEntry != null) {
+ appEntries.add(uninstalledAppDiffEntry);
+ }
+ }
+
private static void combineSystemItemsIntoOthers(
final Context context,
final PowerUsageFeatureProvider featureProvider,
@@ -210,17 +244,20 @@
while (systemListIterator.hasNext()) {
final BatteryDiffEntry batteryDiffEntry = systemListIterator.next();
final int componentId = batteryDiffEntry.mComponentId;
- if (othersSystemComponentSet.contains(componentId) || (
- componentId >= BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID
+ if (othersSystemComponentSet.contains(componentId)
+ || (componentId >= BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID
&& othersCustomComponentNameSet.contains(
batteryDiffEntry.getAppLabel()))) {
if (othersDiffEntry == null) {
- othersDiffEntry = new BatteryDiffEntry(context, BatteryDiffEntry.OTHERS_KEY,
- BatteryDiffEntry.OTHERS_KEY, ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
+ othersDiffEntry =
+ new BatteryDiffEntry(
+ context,
+ BatteryDiffEntry.OTHERS_KEY,
+ BatteryDiffEntry.OTHERS_KEY,
+ ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
}
othersDiffEntry.mConsumePower += batteryDiffEntry.mConsumePower;
- othersDiffEntry.setTotalConsumePower(
- batteryDiffEntry.getTotalConsumePower());
+ othersDiffEntry.setTotalConsumePower(batteryDiffEntry.getTotalConsumePower());
systemListIterator.remove();
}
}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java
index b284ea5..971ada9 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java
@@ -22,6 +22,7 @@
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.os.UserManager;
+import android.text.TextUtils;
import android.util.Log;
import android.util.Pair;
@@ -43,22 +44,33 @@
static Locale sCurrentLocale = null;
// Caches app label and icon to improve loading performance.
static final Map<String, BatteryEntry.NameAndIcon> sResourceCache = new HashMap<>();
+
// Whether a specific item is valid to launch restriction page?
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
static final Map<String, Boolean> sValidForRestriction = new HashMap<>();
+
/** A comparator for {@link BatteryDiffEntry} based on the sorting key. */
static final Comparator<BatteryDiffEntry> COMPARATOR =
(a, b) -> Double.compare(b.getSortingKey(), a.getSortingKey());
+
static final String SYSTEM_APPS_KEY = "A|SystemApps";
+ static final String UNINSTALLED_APPS_KEY = "A|UninstalledApps";
static final String OTHERS_KEY = "S|Others";
// key -> (label_id, icon_id)
- private static final Map<String, Pair<Integer, Integer>> SPECIAL_ENTRY_MAP = Map.of(
- SYSTEM_APPS_KEY,
- Pair.create(R.string.battery_usage_system_apps, R.drawable.ic_power_system),
- OTHERS_KEY,
- Pair.create(R.string.battery_usage_others,
- R.drawable.ic_settings_battery_usage_others));
+ private static final Map<String, Pair<Integer, Integer>> SPECIAL_ENTRY_MAP =
+ Map.of(
+ SYSTEM_APPS_KEY,
+ Pair.create(
+ R.string.battery_usage_system_apps, R.drawable.ic_power_system),
+ UNINSTALLED_APPS_KEY,
+ Pair.create(
+ R.string.battery_usage_uninstalled_apps,
+ R.drawable.ic_battery_uninstalled),
+ OTHERS_KEY,
+ Pair.create(
+ R.string.battery_usage_others,
+ R.drawable.ic_settings_battery_usage_others));
public long mUid;
public long mUserId;
@@ -146,8 +158,7 @@
/** Sets the total consumed power in a specific time slot. */
public void setTotalConsumePower(double totalConsumePower) {
mTotalConsumePower = totalConsumePower;
- mPercentage = totalConsumePower == 0
- ? 0 : (mConsumePower / mTotalConsumePower) * 100.0;
+ mPercentage = totalConsumePower == 0 ? 0 : (mConsumePower / mTotalConsumePower) * 100.0;
mAdjustPercentageOffset = 0;
}
@@ -173,8 +184,21 @@
/** Gets the key for sorting */
public double getSortingKey() {
- return getKey() != null && SPECIAL_ENTRY_MAP.containsKey(getKey())
- ? -1 : getPercentage() + getAdjustPercentageOffset();
+ String key = getKey();
+ if (key == null) {
+ return getPercentage() + getAdjustPercentageOffset();
+ }
+
+ // For special entries, put them to the end of the list.
+ switch (key) {
+ case UNINSTALLED_APPS_KEY:
+ case OTHERS_KEY:
+ return -1;
+ case SYSTEM_APPS_KEY:
+ return -2;
+ default:
+ return getPercentage() + getAdjustPercentageOffset();
+ }
}
/** Clones a new instance. */
@@ -222,8 +246,8 @@
/** Gets the searching package name for UID battery type. */
public String getPackageName() {
- final String packageName = mDefaultPackageName != null
- ? mDefaultPackageName : mLegacyPackageName;
+ final String packageName =
+ mDefaultPackageName != null ? mDefaultPackageName : mLegacyPackageName;
if (packageName == null) {
return packageName;
}
@@ -231,7 +255,8 @@
// From "com.opera.browser:privileged_process0" to "com.opera.browser"
final String[] splitPackageNames = packageName.split(":");
return splitPackageNames != null && splitPackageNames.length > 0
- ? splitPackageNames[0] : packageName;
+ ? splitPackageNames[0]
+ : packageName;
}
/** Whether this item is valid for users to launch restriction page? */
@@ -255,6 +280,17 @@
}
}
+ /** Whether the current BatteryDiffEntry is uninstalled app or not. */
+ public boolean isUninstalledEntry() {
+ final String packageName = getPackageName();
+ if (TextUtils.isEmpty(packageName) || isSystemEntry()) {
+ return false;
+ }
+
+ final int uid = BatteryUtils.getInstance(mContext).getPackageUid(packageName);
+ return uid == BatteryUtils.UID_REMOVED_APPS || uid == BatteryUtils.UID_NULL;
+ }
+
void loadLabelAndIcon() {
if (mIsLoaded) {
return;
@@ -286,8 +322,7 @@
mAppIconId = pair.second;
mAppIcon = mContext.getDrawable(mAppIconId);
sResourceCache.put(
- getKey(),
- new BatteryEntry.NameAndIcon(mAppLabel, mAppIcon, mAppIconId));
+ getKey(), new BatteryEntry.NameAndIcon(mAppLabel, mAppIcon, mAppIconId));
return;
}
@@ -301,7 +336,7 @@
mAppLabel = nameAndIconForUser.mName;
sResourceCache.put(
getKey(),
- new BatteryEntry.NameAndIcon(mAppLabel, mAppIcon, /*iconId=*/ 0));
+ new BatteryEntry.NameAndIcon(mAppLabel, mAppIcon, /* iconId= */ 0));
}
break;
case ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY:
@@ -329,7 +364,7 @@
if (mAppLabel != null || mAppIcon != null) {
sResourceCache.put(
getKey(),
- new BatteryEntry.NameAndIcon(mAppLabel, mAppIcon, /*iconId=*/ 0));
+ new BatteryEntry.NameAndIcon(mAppLabel, mAppIcon, /* iconId= */ 0));
}
break;
}
@@ -354,16 +389,20 @@
}
try {
mValidForRestriction =
- mContext.getPackageManager().getPackageInfo(
- getPackageName(),
- PackageManager.MATCH_DISABLED_COMPONENTS
- | PackageManager.MATCH_ANY_USER
- | PackageManager.GET_SIGNATURES
- | PackageManager.GET_PERMISSIONS)
+ mContext.getPackageManager()
+ .getPackageInfo(
+ getPackageName(),
+ PackageManager.MATCH_DISABLED_COMPONENTS
+ | PackageManager.MATCH_ANY_USER
+ | PackageManager.GET_SIGNATURES
+ | PackageManager.GET_PERMISSIONS)
!= null;
} catch (Exception e) {
- Log.e(TAG, String.format("getPackageInfo() error %s for package=%s",
- e.getCause(), getPackageName()));
+ Log.e(
+ TAG,
+ String.format(
+ "getPackageInfo() error %s for package=%s",
+ e.getCause(), getPackageName()));
mValidForRestriction = false;
}
}
@@ -371,8 +410,11 @@
private BatteryEntry.NameAndIcon getCache() {
final Locale locale = Locale.getDefault();
if (sCurrentLocale != locale) {
- Log.d(TAG, String.format("clearCache() locale is changed from %s to %s",
- sCurrentLocale, locale));
+ Log.d(
+ TAG,
+ String.format(
+ "clearCache() locale is changed from %s to %s",
+ sCurrentLocale, locale));
sCurrentLocale = locale;
clearCache();
}
@@ -421,8 +463,11 @@
mDefaultPackageName = nameAndIcon.mPackageName;
if (mDefaultPackageName != null
&& !mDefaultPackageName.equals(nameAndIcon.mPackageName)) {
- Log.w(TAG, String.format("found different package: %s | %s",
- mDefaultPackageName, nameAndIcon.mPackageName));
+ Log.w(
+ TAG,
+ String.format(
+ "found different package: %s | %s",
+ mDefaultPackageName, nameAndIcon.mPackageName));
}
}
}
@@ -459,7 +504,8 @@
private Drawable getBadgeIconForUser(Drawable icon) {
final int userId = UserHandle.getUserId((int) mUid);
- return userId == UserHandle.USER_OWNER ? icon :
- mUserManager.getBadgedIconForUser(icon, new UserHandle(userId));
+ return userId == UserHandle.USER_OWNER
+ ? icon
+ : mUserManager.getBadgedIconForUser(icon, new UserHandle(userId));
}
}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
index 63f0d40..006928a 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
@@ -63,6 +63,10 @@
}
final String action = intent.getAction();
Log.d(TAG, "onReceive:" + action);
+ if (DatabaseUtils.isWorkProfile(context)) {
+ Log.w(TAG, "do nothing for work profile action=" + action);
+ return;
+ }
DatabaseUtils.recordDateTime(context, action);
final String fullChargeIntentAction = FeatureFactory.getFeatureFactory()
.getPowerUsageFeatureProvider()
diff --git a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
index a1987c9..4eef3a0 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
@@ -111,8 +111,8 @@
values.put(BatteryHistEntry.KEY_UID, Long.valueOf(entry.getUid()));
values.put(BatteryHistEntry.KEY_USER_ID,
Long.valueOf(UserHandle.getUserId(entry.getUid())));
- values.put(BatteryHistEntry.KEY_PACKAGE_NAME,
- entry.getDefaultPackageName());
+ final String packageName = entry.getDefaultPackageName();
+ values.put(BatteryHistEntry.KEY_PACKAGE_NAME, packageName != null ? packageName : "");
values.put(BatteryHistEntry.KEY_CONSUMER_TYPE,
Integer.valueOf(entry.getConsumerType()));
} else {
diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
index 32cd1b9..6099192 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
@@ -626,17 +626,20 @@
final List<BatteryHistEntry> batteryHistEntryList,
final @NonNull Set<String> systemAppsPackageNames,
final @NonNull Set<Integer> systemAppsUids) {
+ final List<BatteryDiffEntry> appEntries = new ArrayList<>();
+ final List<BatteryDiffEntry> systemEntries = new ArrayList<>();
if (batteryHistEntryList == null || batteryHistEntryList.isEmpty()) {
Log.w(TAG, "batteryHistEntryList is null or empty in generateBatteryDiffData()");
- return null;
+ return new BatteryDiffData(context, startTimestamp, getCurrentTimeMillis(),
+ /* startBatteryLevel =*/ 100, getCurrentLevel(context), /* screenOnTime= */ 0L,
+ appEntries, systemEntries, systemAppsPackageNames, systemAppsUids,
+ /* isAccumulated= */ false);
}
final int currentUserId = context.getUserId();
final UserHandle userHandle =
Utils.getManagedProfile(context.getSystemService(UserManager.class));
final int workProfileUserId =
userHandle != null ? userHandle.getIdentifier() : Integer.MIN_VALUE;
- final List<BatteryDiffEntry> appEntries = new ArrayList<>();
- final List<BatteryDiffEntry> systemEntries = new ArrayList<>();
for (BatteryHistEntry entry : batteryHistEntryList) {
final boolean isFromOtherUsers = isConsumedFromOtherUsers(
@@ -670,11 +673,6 @@
}
}
}
-
- // If there is no data, return null instead of empty item.
- if (appEntries.isEmpty() && systemEntries.isEmpty()) {
- return null;
- }
return new BatteryDiffData(context, startTimestamp, getCurrentTimeMillis(),
/* startBatteryLevel =*/ 100, getCurrentLevel(context), /* screenOnTime= */ 0L,
appEntries, systemEntries, systemAppsPackageNames, systemAppsUids,
@@ -1318,7 +1316,9 @@
// We should not get the empty list since we have at least one fake data to record
// the battery level and status in each time slot, the empty list is used to
// represent there is no enough data to apply interpolation arithmetic.
- return null;
+ return new BatteryDiffData(context, startTimestamp, endTimestamp, startBatteryLevel,
+ endBatteryLevel, /* screenOnTime= */ 0L, appEntries, systemEntries,
+ systemAppsPackageNames, systemAppsUids, /* isAccumulated= */ false);
}
allBatteryHistEntryKeys.addAll(slotBatteryHistMap.keySet());
}
@@ -1458,12 +1458,6 @@
appEntries.add(currentBatteryDiffEntry);
}
}
-
- // If there is no data, return null instead of empty item.
- if (appEntries.isEmpty() && systemEntries.isEmpty()) {
- return null;
- }
-
return new BatteryDiffData(context, startTimestamp, endTimestamp, startBatteryLevel,
endBatteryLevel, slotScreenOnTime, appEntries, systemEntries,
systemAppsPackageNames, systemAppsUids, /* isAccumulated= */ false);
@@ -1563,9 +1557,9 @@
}
}
- return diffEntryList.isEmpty() ? null : new BatteryDiffData(context, startTimestamp,
- endTimestamp, startBatteryLevel, endBatteryLevel, totalScreenOnTime, appEntries,
- systemEntries, /* systemAppsPackageNames= */ new ArraySet<>(),
+ return new BatteryDiffData(context, startTimestamp, endTimestamp, startBatteryLevel,
+ endBatteryLevel, totalScreenOnTime, appEntries, systemEntries,
+ /* systemAppsPackageNames= */ new ArraySet<>(),
/* systemAppsUids= */ new ArraySet<>(), /* isAccumulated= */ true);
}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
index fb83302..056490b 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
@@ -236,10 +236,8 @@
final int hourlyIndex = mBatteryChartPreferenceController.getHourlyChartIndex();
final String slotInformation = mBatteryChartPreferenceController.getSlotInformation();
final BatteryDiffData slotUsageData = mBatteryUsageMap.get(dailyIndex).get(hourlyIndex);
- if (slotUsageData != null) {
- mScreenOnTimeController.handleSceenOnTimeUpdated(
- slotUsageData.getScreenOnTime(), slotInformation);
- }
+ mScreenOnTimeController.handleSceenOnTimeUpdated(
+ slotUsageData != null ? slotUsageData.getScreenOnTime() : 0L, slotInformation);
// Hide card tips if the related highlight slot was clicked.
if (isAppsAnomalyEventFocused()) {
mBatteryTipsController.acceptTipsCard();
diff --git a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
index 6efbc6d..7e27529 100644
--- a/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
@@ -84,6 +84,16 @@
newUserAwareContext = context.createContextAsUser(UserHandle.of(newUserId), 0);
break;
}
+ case ProfileSelectFragment.ProfileType.PRIVATE: {
+ // If the user is a private profile user, use currentUserId directly. Or get the
+ // private profile userId instead.
+ newUserId = userManager.isPrivateProfile()
+ ? currentUserId
+ : Utils.getCurrentUserIdOfType(
+ userManager, ProfileSelectFragment.ProfileType.PRIVATE);
+ newUserAwareContext = context.createContextAsUser(UserHandle.of(newUserId), 0);
+ break;
+ }
case ProfileSelectFragment.ProfileType.PERSONAL: {
// Use the parent user of the current user if the current user is profile.
final UserHandle currentUser = UserHandle.of(currentUserId);
diff --git a/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java b/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java
index f007bc8..abe640b 100644
--- a/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java
+++ b/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java
@@ -77,6 +77,15 @@
? currentUserId : Utils.getManagedProfileId(userManager, currentUserId);
break;
}
+ case ProfileSelectFragment.ProfileType.PRIVATE: {
+ // If the user is a private profile user, use currentUserId directly. Or get the
+ // private profile userId instead.
+ newUserId = userManager.isPrivateProfile()
+ ? currentUserId
+ : Utils.getCurrentUserIdOfType(
+ userManager, ProfileSelectFragment.ProfileType.PRIVATE);
+ break;
+ }
case ProfileSelectFragment.ProfileType.PERSONAL: {
final UserHandle primaryUser = userManager.getPrimaryUser().getUserHandle();
newUserId = primaryUser.getIdentifier();
diff --git a/src/com/android/settings/localepicker/LocaleNotificationDataManager.java b/src/com/android/settings/localepicker/LocaleNotificationDataManager.java
index 09d6280..4d948f1 100644
--- a/src/com/android/settings/localepicker/LocaleNotificationDataManager.java
+++ b/src/com/android/settings/localepicker/LocaleNotificationDataManager.java
@@ -31,7 +31,7 @@
* information.
*/
public class LocaleNotificationDataManager {
- private static final String LOCALE_NOTIFICATION = "locale_notification";
+ public static final String LOCALE_NOTIFICATION = "locale_notification";
private Context mContext;
/**
diff --git a/src/com/android/settings/network/apn/ApnEditPageProvider.kt b/src/com/android/settings/network/apn/ApnEditPageProvider.kt
index 9f3947f..753de22 100644
--- a/src/com/android/settings/network/apn/ApnEditPageProvider.kt
+++ b/src/com/android/settings/network/apn/ApnEditPageProvider.kt
@@ -19,6 +19,10 @@
import android.net.Uri
import android.os.Bundle
import androidx.compose.foundation.layout.Column
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Done
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.getValue
@@ -31,6 +35,8 @@
import androidx.navigation.NavType
import androidx.navigation.navArgument
import com.android.settings.R
+import com.android.settings.network.apn.ApnNetworkTypes.getNetworkTypeDisplayNames
+import com.android.settings.network.apn.ApnNetworkTypes.getNetworkTypeSelectedOptionsState
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.compose.stateOf
import com.android.settingslib.spa.widget.editor.SettingsExposedDropdownMenuBox
@@ -45,142 +51,132 @@
const val URI_TYPE = "uriType"
const val URI = "uri"
const val SUB_ID = "subId"
-const val MVNO_TYPE = "mvnoType"
-const val MVNO_MATCH_DATA = "mvnoMatchData"
const val EDIT_URL = "editUrl"
+const val INSERT_URL = "insertUrl"
object ApnEditPageProvider : SettingsPageProvider {
- override val name = "Apn"
- const val TAG = "ApnPageProvider"
+ override val name = "ApnEdit"
+ const val TAG = "ApnEditPageProvider"
override val parameter = listOf(
navArgument(URI_TYPE) { type = NavType.StringType },
navArgument(URI) { type = NavType.StringType },
navArgument(SUB_ID) { type = NavType.IntType },
- navArgument(MVNO_TYPE) { type = NavType.StringType },
- navArgument(MVNO_MATCH_DATA) { type = NavType.StringType },
)
@Composable
override fun Page(arguments: Bundle?) {
- val apnDataInit = ApnData()
+ val uriString = arguments!!.getString(URI)
+ val uriInit = Uri.parse(String(Base64.getDecoder().decode(uriString)))
+ val subId = arguments.getInt(SUB_ID)
+ val apnDataInit = getApnDataInit(arguments, LocalContext.current, uriInit, subId)
val apnDataCur = remember {
mutableStateOf(apnDataInit)
}
- ApnPage(apnDataCur)
+ ApnPage(apnDataInit, apnDataCur, uriInit)
}
fun getRoute(
uriType: String,
uri: Uri,
- subId: Int,
- mMvnoType: String,
- mMvnoMatchData: String
+ subId: Int
): String = "${name}/$uriType/${
Base64.getUrlEncoder().encodeToString(uri.toString().toByteArray())
- }/$subId/$mMvnoType/$mMvnoMatchData"
+ }/$subId"
}
@Composable
-fun ApnPage(apnDataCur: MutableState<ApnData>) {
+fun ApnPage(apnDataInit: ApnData, apnDataCur: MutableState<ApnData>, uriInit: Uri) {
var apnData by apnDataCur
val context = LocalContext.current
val authTypeOptions = stringArrayResource(R.array.apn_auth_entries).toList()
val apnProtocolOptions = stringArrayResource(R.array.apn_protocol_entries).toList()
- val bearerOptionsAll = stringArrayResource(R.array.bearer_entries)
- val bearerOptions = bearerOptionsAll.drop(1).toList()
- val bearerEmptyVal = bearerOptionsAll[0]
- val mvnoTypeOptions = stringArrayResource(R.array.mvno_type_entries).toList()
- val bearerSelectedOptionsState = remember {
- getBearerSelectedOptionsState(apnData.bearer, apnData.bearerBitmask, context)
+ val networkTypeSelectedOptionsState = remember {
+ getNetworkTypeSelectedOptionsState(apnData.networkType)
}
RegularScaffold(
title = stringResource(id = R.string.apn_edit),
+ actions = {
+ IconButton(onClick = {
+ validateAndSaveApnData(apnDataInit, apnData, context, uriInit)
+ }) { Icon(imageVector = Icons.Outlined.Done, contentDescription = "Save APN") }
+ }
) {
Column() {
SettingsOutlinedTextField(
- apnData.name,
- stringResource(R.string.apn_name),
+ value = apnData.name,
+ label = stringResource(R.string.apn_name),
enabled = apnData.nameEnabled
) { apnData = apnData.copy(name = it) }
SettingsOutlinedTextField(
- apnData.apn,
- stringResource(R.string.apn_apn),
+ value = apnData.apn,
+ label = stringResource(R.string.apn_apn),
enabled = apnData.apnEnabled
) { apnData = apnData.copy(apn = it) }
SettingsOutlinedTextField(
- apnData.proxy,
- stringResource(R.string.apn_http_proxy),
+ value = apnData.proxy,
+ label = stringResource(R.string.apn_http_proxy),
enabled = apnData.proxyEnabled
) { apnData = apnData.copy(proxy = it) }
SettingsOutlinedTextField(
- apnData.port,
- stringResource(R.string.apn_http_port),
+ value = apnData.port,
+ label = stringResource(R.string.apn_http_port),
enabled = apnData.portEnabled
) { apnData = apnData.copy(port = it) }
SettingsOutlinedTextField(
- apnData.userName,
- stringResource(R.string.apn_user),
+ value = apnData.userName,
+ label = stringResource(R.string.apn_user),
enabled = apnData.userNameEnabled
) { apnData = apnData.copy(userName = it) }
SettingsTextFieldPassword(
- apnData.passWord,
- stringResource(R.string.apn_password)
+ value = apnData.passWord,
+ label = stringResource(R.string.apn_password),
+ enabled = apnData.passWordEnabled
) { apnData = apnData.copy(passWord = it) }
SettingsOutlinedTextField(
- apnData.server,
- stringResource(R.string.apn_server),
+ value = apnData.server,
+ label = stringResource(R.string.apn_server),
enabled = apnData.serverEnabled
) { apnData = apnData.copy(server = it) }
SettingsOutlinedTextField(
- apnData.mmsc,
- stringResource(R.string.apn_mmsc),
+ value = apnData.mmsc,
+ label = stringResource(R.string.apn_mmsc),
enabled = apnData.mmscEnabled
) { apnData = apnData.copy(mmsc = it) }
SettingsOutlinedTextField(
- apnData.mmsProxy,
- stringResource(R.string.apn_mms_proxy),
+ value = apnData.mmsProxy,
+ label = stringResource(R.string.apn_mms_proxy),
enabled = apnData.mmsProxyEnabled
) { apnData = apnData.copy(mmsProxy = it) }
SettingsOutlinedTextField(
- apnData.mmsPort,
- stringResource(R.string.apn_mms_port),
+ value = apnData.mmsPort,
+ label = stringResource(R.string.apn_mms_port),
enabled = apnData.mmsPortEnabled
) { apnData = apnData.copy(mmsPort = it) }
- SettingsOutlinedTextField(
- apnData.mcc,
- stringResource(R.string.apn_mcc),
- enabled = apnData.mccEnabled
- ) { apnData = apnData.copy(mcc = it) }
- SettingsOutlinedTextField(
- apnData.mnc,
- stringResource(R.string.apn_mnc),
- enabled = apnData.mncEnabled
- ) { apnData = apnData.copy(mnc = it) }
// Warning: apnProtocol, apnRoaming, mvnoType string2Int
SettingsExposedDropdownMenuBox(
- stringResource(R.string.apn_auth_type),
- authTypeOptions,
- apnData.authType,
- apnData.authTypeEnabled,
+ label = stringResource(R.string.apn_auth_type),
+ options = authTypeOptions,
+ selectedOptionIndex = apnData.authType,
+ enabled = apnData.authTypeEnabled,
) { apnData = apnData.copy(authType = it) }
SettingsOutlinedTextField(
- apnData.apnType,
- stringResource(R.string.apn_type),
+ value = apnData.apnType,
+ label = stringResource(R.string.apn_type),
enabled = apnData.apnTypeEnabled
- ) { apnData = apnData.copy(apn = it) } // TODO: updateApnType
+ ) { apnData = apnData.copy(apnType = updateApnType(apnData.copy(apnType = it))) }
SettingsExposedDropdownMenuBox(
- stringResource(R.string.apn_protocol),
- apnProtocolOptions,
- apnData.apnProtocol,
- apnData.apnProtocolEnabled
+ label = stringResource(R.string.apn_protocol),
+ options = apnProtocolOptions,
+ selectedOptionIndex = apnData.apnProtocol,
+ enabled = apnData.apnProtocolEnabled
) { apnData = apnData.copy(apnProtocol = it) }
SettingsExposedDropdownMenuBox(
- stringResource(R.string.apn_roaming_protocol),
- apnProtocolOptions,
- apnData.apnRoaming,
- apnData.apnRoamingEnabled
+ label = stringResource(R.string.apn_roaming_protocol),
+ options = apnProtocolOptions,
+ selectedOptionIndex = apnData.apnRoaming,
+ enabled = apnData.apnRoamingEnabled
) { apnData = apnData.copy(apnRoaming = it) }
SwitchPreference(
object : SwitchPreferenceModel {
@@ -195,25 +191,12 @@
}
)
SettingsExposedDropdownMenuCheckBox(
- stringResource(R.string.bearer),
- bearerOptions,
- bearerSelectedOptionsState,
- bearerEmptyVal,
- apnData.bearerEnabled
+ label = stringResource(R.string.network_type),
+ options = getNetworkTypeDisplayNames(),
+ selectedOptionsState = networkTypeSelectedOptionsState,
+ emptyVal = stringResource(R.string.network_type_unspecified),
+ enabled = apnData.networkTypeEnabled
) {}
- SettingsExposedDropdownMenuBox(
- stringResource(R.string.mvno_type),
- mvnoTypeOptions,
- apnData.mvnoType,
- apnData.mvnoTypeEnabled
- ) {
- apnData = apnData.copy(mvnoType = it)
- } // TODO: mvnoDescription
- SettingsOutlinedTextField(
- apnData.mvnoValue,
- stringResource(R.string.mvno_match_data),
- enabled = apnData.mvnoValueEnabled
- ) { apnData = apnData.copy(mvnoValue = it) }
}
}
}
\ No newline at end of file
diff --git a/src/com/android/settings/network/apn/ApnNetworkTypes.kt b/src/com/android/settings/network/apn/ApnNetworkTypes.kt
new file mode 100644
index 0000000..560449a
--- /dev/null
+++ b/src/com/android/settings/network/apn/ApnNetworkTypes.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2023 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.network.apn
+
+import android.telephony.TelephonyManager
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.snapshots.SnapshotStateList
+
+object ApnNetworkTypes {
+ private val Types = listOf(
+ TelephonyManager.NETWORK_TYPE_LTE,
+ TelephonyManager.NETWORK_TYPE_HSPAP,
+ TelephonyManager.NETWORK_TYPE_HSPA,
+ TelephonyManager.NETWORK_TYPE_HSUPA,
+ TelephonyManager.NETWORK_TYPE_HSDPA,
+ TelephonyManager.NETWORK_TYPE_UMTS,
+ TelephonyManager.NETWORK_TYPE_EDGE,
+ TelephonyManager.NETWORK_TYPE_GPRS,
+ TelephonyManager.NETWORK_TYPE_EHRPD,
+ TelephonyManager.NETWORK_TYPE_EVDO_B,
+ TelephonyManager.NETWORK_TYPE_EVDO_A,
+ TelephonyManager.NETWORK_TYPE_EVDO_0,
+ TelephonyManager.NETWORK_TYPE_1xRTT,
+ TelephonyManager.NETWORK_TYPE_CDMA,
+ TelephonyManager.NETWORK_TYPE_NR,
+ )
+
+ fun getNetworkTypeDisplayNames(): List<String> =
+ Types.map { TelephonyManager.getNetworkTypeName(it) }
+
+ /**
+ * Gets the selected Network type Selected Options according to network type.
+ * @param networkType Initialized network type bitmask, often multiple network type options may
+ * be included.
+ */
+ fun getNetworkTypeSelectedOptionsState(networkType: Long): SnapshotStateList<Int> {
+ val networkTypeSelectedOptionsState = mutableStateListOf<Int>()
+ Types.forEachIndexed { index, type ->
+ if (networkType and TelephonyManager.getBitMaskForNetworkType(type) == 1L) {
+ networkTypeSelectedOptionsState.add(index)
+ }
+ }
+ return networkTypeSelectedOptionsState
+ }
+}
diff --git a/src/com/android/settings/network/apn/ApnPreference.java b/src/com/android/settings/network/apn/ApnPreference.java
index 07d371a..dcc50cd 100755
--- a/src/com/android/settings/network/apn/ApnPreference.java
+++ b/src/com/android/settings/network/apn/ApnPreference.java
@@ -157,7 +157,7 @@
final Uri url = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, pos);
if (Flags.newApnPageEnabled()) {
- String route = ApnEditPageProvider.INSTANCE.getRoute(EDIT_URL, url, mSubId, "_", "_");
+ String route = ApnEditPageProvider.INSTANCE.getRoute(EDIT_URL, url, mSubId);
SpaActivity.startSpaActivity(context, route);
} else {
final Intent editIntent = new Intent(Intent.ACTION_EDIT, url);
diff --git a/src/com/android/settings/network/apn/ApnRepository.kt b/src/com/android/settings/network/apn/ApnRepository.kt
new file mode 100644
index 0000000..e0121b4
--- /dev/null
+++ b/src/com/android/settings/network/apn/ApnRepository.kt
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2023 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.network.apn
+
+import android.content.ContentValues
+import android.content.Context
+import android.net.Uri
+import android.provider.Telephony
+import android.util.Log
+import com.android.settings.R
+import com.android.settingslib.utils.ThreadUtils
+import java.util.Locale
+
+const val NAME_INDEX = 1
+const val APN_INDEX = 2
+const val PROXY_INDEX = 3
+const val PORT_INDEX = 4
+const val USER_INDEX = 5
+const val SERVER_INDEX = 6
+const val PASSWORD_INDEX = 7
+const val MMSC_INDEX = 8
+const val MMSPROXY_INDEX = 9
+const val MMSPORT_INDEX = 10
+const val AUTH_TYPE_INDEX = 11
+const val TYPE_INDEX = 12
+const val PROTOCOL_INDEX = 13
+const val CARRIER_ENABLED_INDEX = 14
+const val NETWORK_TYPE_INDEX = 15
+const val ROAMING_PROTOCOL_INDEX = 16
+const val EDITED_INDEX = 17
+const val USER_EDITABLE_INDEX = 18
+const val CARRIER_ID_INDEX = 19
+
+val sProjection = arrayOf(
+ Telephony.Carriers._ID, // 0
+ Telephony.Carriers.NAME, // 1
+ Telephony.Carriers.APN, // 2
+ Telephony.Carriers.PROXY, // 3
+ Telephony.Carriers.PORT, // 4
+ Telephony.Carriers.USER, // 5
+ Telephony.Carriers.SERVER, // 6
+ Telephony.Carriers.PASSWORD, // 7
+ Telephony.Carriers.MMSC, // 8
+ Telephony.Carriers.MMSPROXY, // 9
+ Telephony.Carriers.MMSPORT, // 10
+ Telephony.Carriers.AUTH_TYPE, // 11
+ Telephony.Carriers.TYPE, // 12
+ Telephony.Carriers.PROTOCOL, // 13
+ Telephony.Carriers.CARRIER_ENABLED, // 14
+ Telephony.Carriers.NETWORK_TYPE_BITMASK, // 15
+ Telephony.Carriers.ROAMING_PROTOCOL, // 16
+ Telephony.Carriers.EDITED_STATUS, // 17
+ Telephony.Carriers.USER_EDITABLE, // 18
+ Telephony.Carriers.CARRIER_ID // 19
+)
+
+const val TAG = "ApnRepository"
+
+/**
+ * Query apn related information based on uri.
+ * @param uri URI data used for query.
+ *
+ * @return Stored apn related information.
+ */
+fun getApnDataFromUri(uri: Uri, context: Context): ApnData {
+ var apnData = ApnData()
+ val contentResolver = context.contentResolver
+ val apnProtocolOptions = context.resources.getStringArray(R.array.apn_protocol_entries).toList()
+
+ contentResolver.query(
+ uri,
+ sProjection,
+ null /* selection */,
+ null /* selectionArgs */,
+ null /* sortOrder */
+ ).use { cursor ->
+ if (cursor != null && cursor.moveToFirst()) {
+ val name = cursor.getString(NAME_INDEX)
+ val apn = cursor.getString(APN_INDEX)
+ val proxy = cursor.getString(PROXY_INDEX)
+ val port = cursor.getString(PORT_INDEX)
+ val userName = cursor.getString(USER_INDEX)
+ val server = cursor.getString(SERVER_INDEX)
+ val passWord = cursor.getString(PASSWORD_INDEX)
+ val mmsc = cursor.getString(MMSC_INDEX)
+ val mmsProxy = cursor.getString(MMSPROXY_INDEX)
+ val mmsPort = cursor.getString(MMSPORT_INDEX)
+ val authType = cursor.getInt(AUTH_TYPE_INDEX)
+ val apnType = cursor.getString(TYPE_INDEX)
+ val apnProtocol = convertProtocol2Options(cursor.getString(PROTOCOL_INDEX), context)
+ val apnRoaming =
+ convertProtocol2Options(cursor.getString(ROAMING_PROTOCOL_INDEX), context)
+ val apnEnable = cursor.getInt(CARRIER_ENABLED_INDEX) == 1
+ val networkType = cursor.getLong(NETWORK_TYPE_INDEX)
+
+ val edited = cursor.getInt(EDITED_INDEX)
+ val userEditable = cursor.getInt(USER_EDITABLE_INDEX)
+ val carrierId = cursor.getInt(CARRIER_ID_INDEX)
+
+ apnData = apnData.copy(
+ name = name,
+ apn = apn,
+ proxy = proxy,
+ port = port,
+ userName = userName,
+ passWord = passWord,
+ server = server,
+ mmsc = mmsc,
+ mmsProxy = mmsProxy,
+ mmsPort = mmsPort,
+ authType = authType,
+ apnType = apnType,
+ apnProtocol = apnProtocolOptions.indexOf(apnProtocol),
+ apnRoaming = apnProtocolOptions.indexOf(apnRoaming),
+ apnEnable = apnEnable,
+ networkType = networkType,
+ edited = edited,
+ userEditable = userEditable,
+ carrierId = carrierId
+ )
+ }
+ }
+ if (apnData.name == "") {
+ Log.d(TAG, "Can't get apnData from Uri $uri")
+ }
+ return apnData
+}
+
+/**
+ * Returns The UI choice (e.g., "IPv4/IPv6") corresponding to the given
+ * raw value of the protocol preference (e.g., "IPV4V6"). If unknown,
+ * return null.
+ *
+ * @return UI choice
+ */
+private fun convertProtocol2Options(raw: String, context: Context): String {
+ val apnProtocolOptions = context.resources.getStringArray(R.array.apn_protocol_entries).toList()
+ val apnProtocolValues = context.resources.getStringArray(R.array.apn_protocol_values).toList()
+
+ var uRaw = raw.uppercase(Locale.getDefault())
+ uRaw = if (uRaw == "IPV4") "IP" else uRaw
+ val protocolIndex = apnProtocolValues.indexOf(uRaw)
+ return if (protocolIndex == -1) {
+ ""
+ } else {
+ try {
+ apnProtocolOptions[protocolIndex]
+ } catch (e: ArrayIndexOutOfBoundsException) {
+ ""
+ }
+ }
+}
+
+fun convertOptions2Protocol(protocolIndex: Int, context: Context): String {
+ val apnProtocolValues = context.resources.getStringArray(R.array.apn_protocol_values).toList()
+
+ return if (protocolIndex == -1) {
+ ""
+ } else {
+ try {
+ apnProtocolValues[protocolIndex]
+ } catch (e: ArrayIndexOutOfBoundsException) {
+ ""
+ }
+ }
+}
+
+fun updateApnDataToDatabase(newApn: Boolean, values: ContentValues, context: Context, uriInit: Uri) {
+ ThreadUtils.postOnBackgroundThread {
+ if (newApn) {
+ // Add a new apn to the database
+ val newUri = context.contentResolver.insert(uriInit, values)
+ if (newUri == null) {
+ Log.e(TAG, "Can't add a new apn to database $uriInit")
+ }
+ } else {
+ // Update the existing apn
+ context.contentResolver.update(
+ uriInit, values, null /* where */, null /* selection Args */
+ )
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/network/apn/ApnSettings.java b/src/com/android/settings/network/apn/ApnSettings.java
index 4addf77..c3feae8 100755
--- a/src/com/android/settings/network/apn/ApnSettings.java
+++ b/src/com/android/settings/network/apn/ApnSettings.java
@@ -16,6 +16,8 @@
package com.android.settings.network.apn;
+import static com.android.settings.network.apn.ApnEditPageProviderKt.INSERT_URL;
+
import android.app.Activity;
import android.app.Dialog;
import android.app.ProgressDialog;
@@ -57,7 +59,9 @@
import com.android.settings.R;
import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.flags.Flags;
import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.spa.SpaActivity;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import java.util.ArrayList;
@@ -420,16 +424,22 @@
}
private void addNewApn() {
- final Intent intent = new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI);
final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
: SubscriptionManager.INVALID_SUBSCRIPTION_ID;
- intent.putExtra(SUB_ID, subId);
- intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- if (!TextUtils.isEmpty(mMvnoType) && !TextUtils.isEmpty(mMvnoMatchData)) {
- intent.putExtra(MVNO_TYPE, mMvnoType);
- intent.putExtra(MVNO_MATCH_DATA, mMvnoMatchData);
+ if (Flags.newApnPageEnabled()) {
+ String route = ApnEditPageProvider.INSTANCE.getRoute(
+ INSERT_URL, Telephony.Carriers.CONTENT_URI, subId);
+ SpaActivity.startSpaActivity(getContext(), route);
+ } else {
+ final Intent intent = new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI);
+ intent.putExtra(SUB_ID, subId);
+ intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ if (!TextUtils.isEmpty(mMvnoType) && !TextUtils.isEmpty(mMvnoMatchData)) {
+ intent.putExtra(MVNO_TYPE, mMvnoType);
+ intent.putExtra(MVNO_MATCH_DATA, mMvnoMatchData);
+ }
+ startActivity(intent);
}
- startActivity(intent);
}
@Override
diff --git a/src/com/android/settings/network/apn/ApnStatus.kt b/src/com/android/settings/network/apn/ApnStatus.kt
index 5d64142..991529a 100644
--- a/src/com/android/settings/network/apn/ApnStatus.kt
+++ b/src/com/android/settings/network/apn/ApnStatus.kt
@@ -16,12 +16,18 @@
package com.android.settings.network.apn
+import android.content.ContentValues
import android.content.Context
+import android.net.Uri
+import android.os.Bundle
import android.provider.Telephony
+import android.telephony.CarrierConfigManager
import android.telephony.TelephonyManager
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.snapshots.SnapshotStateList
+import android.text.TextUtils
+import android.util.Log
+import com.android.internal.util.ArrayUtils
import com.android.settings.R
+import java.util.Locale
data class ApnData(
val name: String = "",
@@ -34,72 +40,471 @@
val mmsc: String = "",
val mmsProxy: String = "",
val mmsPort: String = "",
- val mcc: String = "",
- val mnc: String = "",
val authType: Int = -1,
val apnType: String = "",
val apnProtocol: Int = -1,
val apnRoaming: Int = -1,
val apnEnable: Boolean = true,
- val bearer: Int = 0,
- val mvnoType: Int = -1,
- var mvnoValue: String = "",
- val bearerBitmask: Int = 0,
+ val networkType: Long = 0,
val edited: Int = Telephony.Carriers.USER_EDITED,
val userEditable: Int = 1,
- val carrierId: Int = TelephonyManager.UNKNOWN_CARRIER_ID
+ val carrierId: Int = TelephonyManager.UNKNOWN_CARRIER_ID,
+ val nameEnabled: Boolean = true,
+ val apnEnabled: Boolean = true,
+ val proxyEnabled: Boolean = true,
+ val portEnabled: Boolean = true,
+ val userNameEnabled: Boolean = true,
+ val passWordEnabled: Boolean = true,
+ val serverEnabled: Boolean = true,
+ val mmscEnabled: Boolean = true,
+ val mmsProxyEnabled: Boolean = true,
+ val mmsPortEnabled: Boolean = true,
+ val authTypeEnabled: Boolean = true,
+ val apnTypeEnabled: Boolean = true,
+ val apnProtocolEnabled: Boolean = true,
+ val apnRoamingEnabled: Boolean = true,
+ val apnEnableEnabled: Boolean = true,
+ val networkTypeEnabled: Boolean = true,
+ val newApn: Boolean = false,
+ val subId: Int = -1,
+ val customizedConfig: CustomizedConfig = CustomizedConfig()
) {
- var nameEnabled = true
- var apnEnabled = true
- var proxyEnabled = true
- var portEnabled = true
- var userNameEnabled = true
- var passWordEnabled = true
- var serverEnabled = true
- var mmscEnabled = true
- var mmsProxyEnabled = true
- var mmsPortEnabled = true
- var mccEnabled = true
- var mncEnabled = true
- var authTypeEnabled = true
- var apnTypeEnabled = true
- var apnProtocolEnabled = true
- var apnRoamingEnabled = true
- var apnEnableEnabled = true
- var bearerEnabled = true
- var mvnoTypeEnabled = true
- var mvnoValueEnabled = false
+ fun getContentValues(context: Context): ContentValues {
+ val values = ContentValues()
+ values.put(Telephony.Carriers.NAME, name)
+ values.put(Telephony.Carriers.APN, apn)
+ values.put(Telephony.Carriers.PROXY, proxy)
+ values.put(Telephony.Carriers.PORT, port)
+ values.put(Telephony.Carriers.MMSPROXY, mmsProxy)
+ values.put(Telephony.Carriers.MMSPORT, mmsPort)
+ values.put(Telephony.Carriers.USER, userName)
+ values.put(Telephony.Carriers.SERVER, server)
+ values.put(Telephony.Carriers.PASSWORD, passWord)
+ values.put(Telephony.Carriers.MMSC, mmsc)
+ values.put(Telephony.Carriers.AUTH_TYPE, authType)
+ values.put(Telephony.Carriers.PROTOCOL, convertOptions2Protocol(apnProtocol, context))
+ values.put(
+ Telephony.Carriers.ROAMING_PROTOCOL,
+ convertOptions2Protocol(apnRoaming, context)
+ )
+ values.put(Telephony.Carriers.TYPE, apnType)
+ values.put(Telephony.Carriers.NETWORK_TYPE_BITMASK, networkType)
+ values.put(Telephony.Carriers.CARRIER_ENABLED, apnEnable)
+ values.put(Telephony.Carriers.EDITED_STATUS, Telephony.Carriers.USER_EDITED)
+ return values
+ }
+}
+
+data class CustomizedConfig(
+ val newApn: Boolean = false,
+ val readOnlyApn: Boolean = false,
+ val isAddApnAllowed: Boolean = true,
+ val readOnlyApnTypes: List<String> = emptyList(),
+ val readOnlyApnFields: List<String> = emptyList(),
+ val defaultApnTypes: List<String> = emptyList(),
+ val defaultApnProtocol: String = "",
+ val defaultApnRoamingProtocol: String = "",
+)
+
+/**
+ * APN types for data connections. These are usage categories for an APN
+ * entry. One APN entry may support multiple APN types, eg, a single APN
+ * may service regular internet traffic ("default") as well as MMS-specific
+ * connections.<br></br>
+ * APN_TYPE_ALL is a special type to indicate that this APN entry can
+ * service all data connections.
+ */
+const val APN_TYPE_ALL = "*"
+
+/** APN type for default data traffic */
+const val APN_TYPE_DEFAULT = "default"
+
+/** APN type for MMS traffic */
+const val APN_TYPE_MMS = "mms"
+
+/** APN type for SUPL assisted GPS */
+const val APN_TYPE_SUPL = "supl"
+
+/** APN type for DUN traffic */
+const val APN_TYPE_DUN = "dun"
+
+/** APN type for HiPri traffic */
+const val APN_TYPE_HIPRI = "hipri"
+
+/** APN type for FOTA */
+const val APN_TYPE_FOTA = "fota"
+
+/** APN type for IMS */
+const val APN_TYPE_IMS = "ims"
+
+/** APN type for CBS */
+const val APN_TYPE_CBS = "cbs"
+
+/** APN type for IA Initial Attach APN */
+const val APN_TYPE_IA = "ia"
+
+/** APN type for Emergency PDN. This is not an IA apn, but is used
+ * for access to carrier services in an emergency call situation. */
+const val APN_TYPE_EMERGENCY = "emergency"
+
+/** APN type for Mission Critical Services */
+const val APN_TYPE_MCX = "mcx"
+
+/** APN type for XCAP */
+const val APN_TYPE_XCAP = "xcap"
+val APN_TYPES = arrayOf(
+ APN_TYPE_DEFAULT,
+ APN_TYPE_MMS,
+ APN_TYPE_SUPL,
+ APN_TYPE_DUN,
+ APN_TYPE_HIPRI,
+ APN_TYPE_FOTA,
+ APN_TYPE_IMS,
+ APN_TYPE_CBS,
+ APN_TYPE_IA,
+ APN_TYPE_EMERGENCY,
+ APN_TYPE_MCX,
+ APN_TYPE_XCAP
+)
+
+/**
+ * Initialize ApnData according to the arguments.
+ * @param arguments The data passed in when the user calls PageProvider.
+ * @param uriInit The decoded user incoming uri data in Page.
+ * @param subId The subId obtained in arguments.
+ *
+ * @return Initialized CustomizedConfig information.
+ */
+fun getApnDataInit(arguments: Bundle, context: Context, uriInit: Uri, subId: Int): ApnData {
+
+ val uriType = arguments.getString(URI_TYPE)!!
+
+ if (!uriInit.isPathPrefixMatch(Telephony.Carriers.CONTENT_URI)) {
+ Log.e(TAG, "Insert request not for carrier table. Uri: $uriInit")
+ return ApnData() //TODO: finish
+ }
+
+ var apnDataInit = when (uriType) {
+ EDIT_URL -> getApnDataFromUri(uriInit, context)
+ INSERT_URL -> ApnData()
+ else -> ApnData() //TODO: finish
+ }
+
+ if (uriType == INSERT_URL) {
+ apnDataInit = apnDataInit.copy(newApn = true)
+ }
+
+ apnDataInit = apnDataInit.copy(subId = subId)
+ val configManager =
+ context.getSystemService(Context.CARRIER_CONFIG_SERVICE) as CarrierConfigManager
+ apnDataInit =
+ apnDataInit.copy(customizedConfig = getCarrierCustomizedConfig(apnDataInit, configManager))
+
+ apnDataInit = apnDataInit.copy(
+ apnEnableEnabled =
+ context.resources.getBoolean(R.bool.config_allow_edit_carrier_enabled)
+ )
+ // TODO: mIsCarrierIdApn
+ disableInit(apnDataInit)
+ return apnDataInit
}
/**
- * Initialize the selected Bearer Selected Options according to bearer.
- * @param bearer Initialized bearer options.
- * @param bearerBitmask Initialized bearer bitmask, often multiple bearer options may be included.
- * @param context The context to get bearerValues.
+ * Validates the apn data and save it to the database if it's valid.
+ *
+ *
+ *
+ * A dialog with error message will be displayed if the APN data is invalid.
+ *
+ * @return true if there is no error
+ */
+fun validateAndSaveApnData(
+ apnDataInit: ApnData,
+ apnData: ApnData,
+ context: Context,
+ uriInit: Uri
+): Boolean {
+ // Nothing to do if it's a read only APN
+ if (apnData.customizedConfig.readOnlyApn) {
+ return true
+ }
+ val errorMsg = validateApnData(apnData, context)
+ if (errorMsg != null) {
+ //TODO: showError(this)
+ return false
+ }
+ if (apnData.newApn || (apnData != apnDataInit)) {
+ Log.d(TAG, "validateAndSaveApnData: apnData ${apnData.name}")
+ updateApnDataToDatabase(apnData.newApn, apnData.getContentValues(context), context, uriInit)
+ }
+ return true
+}
+
+/**
+ * Validates whether the apn data is valid.
*
* @return An error message if the apn data is invalid, otherwise return null.
*/
-fun getBearerSelectedOptionsState(
- bearer: Int,
- bearerBitmask: Int,
- context: Context
-): SnapshotStateList<Int> {
- val bearerValues = context.resources.getStringArray(R.array.bearer_values)
- val bearerSelectedOptionsState = mutableStateListOf<Int>()
- if (bearerBitmask != 0) {
- var i = 1
- var _bearerBitmask = bearerBitmask
- while (_bearerBitmask != 0) {
- if (_bearerBitmask and 1 == 1 && !bearerSelectedOptionsState.contains(i)) {
- bearerSelectedOptionsState.add(bearerValues.indexOf("$i") - 1)
+fun validateApnData(apnData: ApnData, context: Context): String? {
+ var errorMsg: String? = null
+ val name = apnData.name
+ val apn = apnData.apn
+ if (name == "") {
+ errorMsg = context.resources.getString(R.string.error_name_empty)
+ } else if (apn == "") {
+ errorMsg = context.resources.getString(R.string.error_apn_empty)
+ }
+ if (errorMsg == null) {
+ // if carrier does not allow editing certain apn types, make sure type does not include
+ // those
+ if (!ArrayUtils.isEmpty(apnData.customizedConfig.readOnlyApnTypes)
+ && apnTypesMatch(
+ apnData.customizedConfig.readOnlyApnTypes,
+ getUserEnteredApnType(apnData.apnType, apnData.customizedConfig.readOnlyApnTypes)
+ )
+ ) {
+ val stringBuilder = StringBuilder()
+ for (type in apnData.customizedConfig.readOnlyApnTypes) {
+ stringBuilder.append(type).append(", ")
+ Log.d(TAG, "validateApnData: appending type: $type")
}
- _bearerBitmask = _bearerBitmask shr 1
- i++
+ // remove last ", "
+ if (stringBuilder.length >= 2) {
+ stringBuilder.delete(stringBuilder.length - 2, stringBuilder.length)
+ }
+ errorMsg = String.format(
+ context.resources.getString(R.string.error_adding_apn_type),
+ stringBuilder
+ )
}
}
- if (bearer != 0 && !bearerSelectedOptionsState.contains(bearer)) {
- // add mBearerInitialVal to bearers
- bearerSelectedOptionsState.add(bearerValues.indexOf("$bearer") - 1)
- }
- return bearerSelectedOptionsState
+ return errorMsg
}
+
+private fun getUserEnteredApnType(apnType: String, readOnlyApnTypes: List<String>): String {
+ // if user has not specified a type, map it to "ALL APN TYPES THAT ARE NOT READ-ONLY"
+ // but if user enter empty type, map it just for default
+ var userEnteredApnType = apnType
+ if (userEnteredApnType != "") userEnteredApnType =
+ userEnteredApnType.trim { it <= ' ' }
+ if (TextUtils.isEmpty(userEnteredApnType) || APN_TYPE_ALL == userEnteredApnType) {
+ userEnteredApnType = getEditableApnType(readOnlyApnTypes)
+ }
+ Log.d(
+ TAG, "getUserEnteredApnType: changed apn type to editable apn types: "
+ + userEnteredApnType
+ )
+ return userEnteredApnType
+}
+
+private fun getEditableApnType(readOnlyApnTypes: List<String>): String {
+ val editableApnTypes = StringBuilder()
+ var first = true
+ for (apnType in APN_TYPES) {
+ // add APN type if it is not read-only and is not wild-cardable
+ if (!readOnlyApnTypes.contains(apnType)
+ && apnType != APN_TYPE_IA
+ && apnType != APN_TYPE_EMERGENCY
+ && apnType != APN_TYPE_MCX
+ && apnType != APN_TYPE_IMS
+ ) {
+ if (first) {
+ first = false
+ } else {
+ editableApnTypes.append(",")
+ }
+ editableApnTypes.append(apnType)
+ }
+ }
+ return editableApnTypes.toString()
+}
+
+/**
+ * Initialize CustomizedConfig information through subId.
+ * @param subId subId information obtained from arguments.
+ *
+ * @return Initialized CustomizedConfig information.
+ */
+fun getCarrierCustomizedConfig(
+ apnInit: ApnData,
+ configManager: CarrierConfigManager
+): CustomizedConfig {
+ val b = configManager.getConfigForSubId(
+ apnInit.subId,
+ CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY,
+ CarrierConfigManager.KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY,
+ CarrierConfigManager.KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY,
+ CarrierConfigManager.Apn.KEY_SETTINGS_DEFAULT_PROTOCOL_STRING,
+ CarrierConfigManager.Apn.KEY_SETTINGS_DEFAULT_ROAMING_PROTOCOL_STRING,
+ CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL
+ )
+ val customizedConfig = CustomizedConfig(
+ readOnlyApnTypes = b.getStringArray(
+ CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY
+ )?.toList() ?: emptyList(), readOnlyApnFields = b.getStringArray(
+ CarrierConfigManager.KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY
+ )?.toList() ?: emptyList(), defaultApnTypes = b.getStringArray(
+ CarrierConfigManager.KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY
+ )?.toList() ?: emptyList(), defaultApnProtocol = b.getString(
+ CarrierConfigManager.Apn.KEY_SETTINGS_DEFAULT_PROTOCOL_STRING
+ ) ?: "", defaultApnRoamingProtocol = b.getString(
+ CarrierConfigManager.Apn.KEY_SETTINGS_DEFAULT_ROAMING_PROTOCOL_STRING
+ ) ?: "", isAddApnAllowed = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL)
+ )
+ if (!ArrayUtils.isEmpty(customizedConfig.readOnlyApnTypes)) {
+ Log.d(
+ TAG,
+ "getCarrierCustomizedConfig: read only APN type: " + customizedConfig.readOnlyApnTypes.joinToString(
+ ", "
+ )
+ )
+ }
+ if (!ArrayUtils.isEmpty(customizedConfig.defaultApnTypes)) {
+ Log.d(
+ TAG,
+ "getCarrierCustomizedConfig: default apn types: " + customizedConfig.defaultApnTypes.joinToString(
+ ", "
+ )
+ )
+ }
+ if (!TextUtils.isEmpty(customizedConfig.defaultApnProtocol)) {
+ Log.d(
+ TAG,
+ "getCarrierCustomizedConfig: default apn protocol: ${customizedConfig.defaultApnProtocol}"
+ )
+ }
+ if (!TextUtils.isEmpty(customizedConfig.defaultApnRoamingProtocol)) {
+ Log.d(
+ TAG,
+ "getCarrierCustomizedConfig: default apn roaming protocol: ${customizedConfig.defaultApnRoamingProtocol}"
+ )
+ }
+ if (!customizedConfig.isAddApnAllowed) {
+ Log.d(TAG, "getCarrierCustomizedConfig: not allow to add new APN")
+ }
+ return customizedConfig
+}
+
+fun disableInit(apnDataInit: ApnData): ApnData {
+ var apnData = apnDataInit
+ val isUserEdited = apnDataInit.edited == Telephony.Carriers.USER_EDITED
+ Log.d(TAG, "disableInit: EDITED $isUserEdited")
+ // if it's not a USER_EDITED apn, check if it's read-only
+ if (!isUserEdited && (apnDataInit.userEditable == 0
+ || apnTypesMatch(apnDataInit.customizedConfig.readOnlyApnTypes, apnDataInit.apnType))
+ ) {
+ Log.d(TAG, "disableInit: read-only APN")
+ apnData =
+ apnDataInit.copy(customizedConfig = apnDataInit.customizedConfig.copy(readOnlyApn = true))
+ apnData = disableAllFields(apnData)
+ } else if (!ArrayUtils.isEmpty(apnData.customizedConfig.readOnlyApnFields)) {
+ Log.d(
+ TAG,
+ "disableInit: mReadOnlyApnFields ${
+ apnData.customizedConfig.readOnlyApnFields.joinToString(", ")
+ })"
+ )
+ apnData = disableFields(apnData.customizedConfig.readOnlyApnFields, apnData)
+ }
+ return apnData
+}
+
+/**
+ * Disables all fields so that user cannot modify the APN
+ */
+private fun disableAllFields(apnDataInit: ApnData): ApnData {
+ var apnData = apnDataInit
+ apnData = apnData.copy(nameEnabled = false)
+ apnData = apnData.copy(apnEnabled = false)
+ apnData = apnData.copy(proxyEnabled = false)
+ apnData = apnData.copy(portEnabled = false)
+ apnData = apnData.copy(userNameEnabled = false)
+ apnData = apnData.copy(passWordEnabled = false)
+ apnData = apnData.copy(serverEnabled = false)
+ apnData = apnData.copy(mmscEnabled = false)
+ apnData = apnData.copy(mmsProxyEnabled = false)
+ apnData = apnData.copy(mmsPortEnabled = false)
+ apnData = apnData.copy(authTypeEnabled = false)
+ apnData = apnData.copy(apnTypeEnabled = false)
+ apnData = apnData.copy(apnProtocolEnabled = false)
+ apnData = apnData.copy(apnRoamingEnabled = false)
+ apnData = apnData.copy(apnEnableEnabled = false)
+ apnData = apnData.copy(networkTypeEnabled = false)
+ return apnData
+}
+
+/**
+ * Disables given fields so that user cannot modify them
+ *
+ * @param apnFields fields to be disabled
+ */
+private fun disableFields(apnFields: List<String>, apnDataInit: ApnData): ApnData {
+ var apnData = apnDataInit
+ for (apnField in apnFields) {
+ apnData = disableByFieldName(apnField, apnDataInit)
+ }
+ return apnData
+}
+
+private fun disableByFieldName(apnField: String, apnDataInit: ApnData): ApnData {
+ var apnData = apnDataInit
+ when (apnField) {
+ Telephony.Carriers.NAME -> apnData = apnData.copy(nameEnabled = false)
+ Telephony.Carriers.APN -> apnData = apnData.copy(apnEnabled = false)
+ Telephony.Carriers.PROXY -> apnData = apnData.copy(proxyEnabled = false)
+ Telephony.Carriers.PORT -> apnData = apnData.copy(portEnabled = false)
+ Telephony.Carriers.USER -> apnData = apnData.copy(userNameEnabled = false)
+ Telephony.Carriers.SERVER -> apnData = apnData.copy(serverEnabled = false)
+ Telephony.Carriers.PASSWORD -> apnData = apnData.copy(passWordEnabled = false)
+ Telephony.Carriers.MMSPROXY -> apnData = apnData.copy(mmsProxyEnabled = false)
+ Telephony.Carriers.MMSPORT -> apnData = apnData.copy(mmsPortEnabled = false)
+ Telephony.Carriers.MMSC -> apnData = apnData.copy(mmscEnabled = false)
+ Telephony.Carriers.TYPE -> apnData = apnData.copy(apnTypeEnabled = false)
+ Telephony.Carriers.AUTH_TYPE -> apnData = apnData.copy(authTypeEnabled = false)
+ Telephony.Carriers.PROTOCOL -> apnData = apnData.copy(apnProtocolEnabled = false)
+ Telephony.Carriers.ROAMING_PROTOCOL -> apnData = apnData.copy(apnRoamingEnabled = false)
+ Telephony.Carriers.CARRIER_ENABLED -> apnData = apnData.copy(apnEnableEnabled = false)
+ Telephony.Carriers.BEARER, Telephony.Carriers.BEARER_BITMASK,
+ Telephony.Carriers.NETWORK_TYPE_BITMASK -> apnData = apnData.copy(
+ networkTypeEnabled =
+ false
+ )
+ }
+ return apnData
+}
+
+private fun apnTypesMatch(apnTypeList: List<String>, apnType: String): Boolean {
+ val normalizeApnTypeList = apnTypeList.map(::normalizeApnType)
+ return hasAllApns(normalizeApnTypeList) ||
+ apnType.split(",").map(::normalizeApnType).all { it in normalizeApnTypeList }
+}
+
+fun hasAllApns(apnTypes: List<String>): Boolean {
+ if (APN_TYPE_ALL in apnTypes) {
+ Log.d(TAG, "hasAllApns: true because apnTypes.contains(APN_TYPE_ALL)")
+ return true
+ }
+ return APN_TYPES.all { it in apnTypes }
+}
+
+private fun normalizeApnType(apnType: String): String =
+ apnType.trim().lowercase(Locale.getDefault())
+
+fun updateApnType(apnData: ApnData): String {
+ return if (apnData.apnType == "" && apnData.customizedConfig.defaultApnTypes.isNotEmpty())
+ getEditableApnType(apnData)
+ else
+ apnData.apnType
+}
+
+private fun getEditableApnType(apnData: ApnData): String {
+ val customizedConfig = apnData.customizedConfig
+ return customizedConfig.defaultApnTypes.filterNot { apnType ->
+ customizedConfig.readOnlyApnTypes.contains(apnType) || apnType in listOf(
+ APN_TYPE_IA,
+ APN_TYPE_EMERGENCY,
+ APN_TYPE_MCX,
+ APN_TYPE_IMS,
+ )
+ }.joinToString()
+}
\ No newline at end of file
diff --git a/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt b/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt
index 34433c4..d133955 100644
--- a/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt
+++ b/src/com/android/settings/network/telephony/DataUsagePreferenceController.kt
@@ -31,7 +31,8 @@
import com.android.settings.R
import com.android.settings.datausage.DataUsageUtils
import com.android.settings.datausage.lib.DataUsageLib
-import com.android.settingslib.net.DataUsageController
+import com.android.settings.datausage.lib.NetworkCycleDataRepository
+import com.android.settings.datausage.lib.NetworkStatsRepository.Companion.AllTimeRange
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
@@ -45,9 +46,6 @@
private lateinit var preference: Preference
private var networkTemplate: NetworkTemplate? = null
- @VisibleForTesting
- var dataUsageControllerFactory: (Context) -> DataUsageController = { DataUsageController(it) }
-
fun init(subId: Int) {
mSubId = subId
}
@@ -103,25 +101,21 @@
else -> null
}
+ @VisibleForTesting
+ fun createNetworkCycleDataRepository(): NetworkCycleDataRepository? =
+ networkTemplate?.let { NetworkCycleDataRepository(mContext, it) }
+
private fun getDataUsageSummary(): String? {
- val networkTemplate = networkTemplate ?: return null
- val controller = dataUsageControllerFactory(mContext).apply {
- setSubscriptionId(mSubId)
- }
- val usageInfo = controller.getDataUsageInfo(networkTemplate)
- if (usageInfo != null && usageInfo.usageLevel > 0) {
+ val repository = createNetworkCycleDataRepository() ?: return null
+ repository.loadFirstCycle()?.takeIf { it.usage > 0 }?.let { usageData ->
return mContext.getString(
R.string.data_usage_template,
- DataUsageUtils.formatDataUsage(mContext, usageInfo.usageLevel),
- usageInfo.period,
+ usageData.formatUsage(mContext),
+ usageData.formatDateRange(mContext),
)
}
- return controller.getHistoricalUsageLevel(networkTemplate).takeIf { it > 0 }?.let {
- mContext.getString(
- R.string.data_used_template,
- DataUsageUtils.formatDataUsage(mContext, it),
- )
- }
+ return repository.queryUsage(AllTimeRange).takeIf { it.usage > 0 }
+ ?.getDataUsedString(mContext)
}
}
diff --git a/src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleController.java b/src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleController.java
new file mode 100644
index 0000000..aaa8f87
--- /dev/null
+++ b/src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleController.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2023 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.notification;
+
+import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+
+import android.content.Context;
+import android.os.Vibrator;
+import android.provider.Settings;
+
+import com.android.server.notification.Flags;
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * Controls the toggle that determines whether notifications
+ * should only vibrate (no sound) when the device is unlocked.
+ */
+public class PoliteNotifVibrateUnlockedToggleController extends TogglePreferenceController {
+
+ public PoliteNotifVibrateUnlockedToggleController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ // TODO: b/291897570 - remove this when the feature flag is removed!
+ if (!Flags.politeNotifications()) {
+ return CONDITIONALLY_UNAVAILABLE;
+ }
+ return mContext.getSystemService(Vibrator.class).hasVibrator() ? AVAILABLE
+ : UNSUPPORTED_ON_DEVICE;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, OFF) != OFF;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, (isChecked ? ON : OFF));
+ }
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
+}
diff --git a/src/com/android/settings/notification/PoliteNotifWorkProfileToggleController.java b/src/com/android/settings/notification/PoliteNotifWorkProfileToggleController.java
new file mode 100644
index 0000000..65b4fb8
--- /dev/null
+++ b/src/com/android/settings/notification/PoliteNotifWorkProfileToggleController.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2023 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.notification;
+
+import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.server.notification.Flags;
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * Controls the toggle that determines whether notification cooldown
+ * should apply to work profiles.
+ */
+public class PoliteNotifWorkProfileToggleController extends TogglePreferenceController {
+
+ private final int mManagedProfileId;
+
+ public PoliteNotifWorkProfileToggleController(Context context, String preferenceKey) {
+ this(context, preferenceKey, new AudioHelper(context));
+ }
+
+ @VisibleForTesting
+ PoliteNotifWorkProfileToggleController(Context context, String preferenceKey,
+ AudioHelper helper) {
+ super(context, preferenceKey);
+ mManagedProfileId = helper.getManagedProfileId(UserManager.get(mContext));
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ // TODO: b/291897570 - remove this when the feature flag is removed!
+ if (!Flags.politeNotifications()) {
+ return CONDITIONALLY_UNAVAILABLE;
+ }
+
+ return (mManagedProfileId != UserHandle.USER_NULL) ? AVAILABLE : DISABLED_FOR_USER;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return Settings.System.getIntForUser(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF, mManagedProfileId) != OFF;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.System.putIntForUser(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, (isChecked ? ON : OFF),
+ mManagedProfileId);
+ }
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
+}
diff --git a/src/com/android/settings/notification/PoliteNotificationFilterController.java b/src/com/android/settings/notification/PoliteNotificationFilterController.java
new file mode 100644
index 0000000..8093f55
--- /dev/null
+++ b/src/com/android/settings/notification/PoliteNotificationFilterController.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2023 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.notification;
+
+import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.util.Log;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
+import com.android.server.notification.Flags;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+
+
+/**
+ * Controls whether polite notifications are enabled and apply to all apps or just to conversations.
+ */
+public class PoliteNotificationFilterController extends BasePreferenceController
+ implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+ static final String TAG = "PoliteNotificationFilterController";
+
+ private static final int POLITE_NOTIFICATIONS_ALL = 0;
+ private static final int POLITE_NOTIFICATIONS_CONVERSATIONS = 1;
+ private static final int POLITE_NOTIFICATIONS_DISABLED = 2;
+
+ public PoliteNotificationFilterController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ // TODO: b/291897570 - remove this when the feature flag is removed!
+ return Flags.politeNotifications() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ final ListPreference pref = (ListPreference) preference;
+
+ if (isPoliteNotifDisabled()) {
+ pref.setValue(Integer.toString(POLITE_NOTIFICATIONS_DISABLED));
+ } else if (shouldApplyForAllApps()) {
+ pref.setValue(Integer.toString(POLITE_NOTIFICATIONS_ALL));
+ } else {
+ pref.setValue(Integer.toString(POLITE_NOTIFICATIONS_CONVERSATIONS));
+ }
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ if (isPoliteNotifDisabled()) {
+ return mContext.getString(R.string.notification_polite_disabled_summary);
+ }
+ if (shouldApplyForAllApps()) {
+ return mContext.getString(R.string.notification_polite_all_apps_summary);
+ } else {
+ return mContext.getString(R.string.notification_polite_conversations_summary);
+ }
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ final int prefValue = Integer.parseInt((String) newValue);
+ if (prefValue == POLITE_NOTIFICATIONS_ALL) {
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON);
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ALL, ON);
+ } else if (prefValue == POLITE_NOTIFICATIONS_CONVERSATIONS) {
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON);
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ALL, OFF);
+ } else if (prefValue == POLITE_NOTIFICATIONS_DISABLED) {
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF);
+ } else {
+ Log.e(TAG, "Unexpected preference value: " + prefValue);
+ }
+ refreshSummary(preference);
+ return true;
+ }
+
+ private boolean isPoliteNotifDisabled() {
+ return Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON) == OFF;
+ }
+
+ private boolean shouldApplyForAllApps() {
+ return Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ALL, ON) != OFF;
+ }
+}
diff --git a/src/com/android/settings/notification/PoliteNotificationsPreferenceController.java b/src/com/android/settings/notification/PoliteNotificationsPreferenceController.java
new file mode 100644
index 0000000..e6e0947
--- /dev/null
+++ b/src/com/android/settings/notification/PoliteNotificationsPreferenceController.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2023 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.notification;
+
+import android.content.Context;
+
+import com.android.server.notification.Flags;
+import com.android.settings.core.BasePreferenceController;
+
+// TODO: b/291897570 - remove controller when the feature flag is removed!
+/**
+ * Controller for polite notifications settings page.
+ */
+public class PoliteNotificationsPreferenceController extends BasePreferenceController {
+
+ public PoliteNotificationsPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return Flags.politeNotifications() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ }
+
+}
diff --git a/src/com/android/settings/notification/PoliteNotificationsPreferenceFragment.java b/src/com/android/settings/notification/PoliteNotificationsPreferenceFragment.java
new file mode 100644
index 0000000..449e678
--- /dev/null
+++ b/src/com/android/settings/notification/PoliteNotificationsPreferenceFragment.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2023 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.notification;
+
+import android.app.settings.SettingsEnums;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/**
+ * Fragment for polite notifications.
+ */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class PoliteNotificationsPreferenceFragment extends DashboardFragment {
+
+ private static final String POLITE_NOTIF_PREFERENCE_KEY = "polite_notifications_pref_dlg";
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.SETTINGS_POLITE_NOTIFICATIONS;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.polite_notifications_settings;
+ }
+ @Override
+ protected String getLogTag() {
+ return "PoliteNotificationsPreferenceFragment";
+ }
+
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider(R.xml.polite_notifications_settings);
+}
diff --git a/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java b/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java
index 709814d..0abf8f7 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java
@@ -131,7 +131,17 @@
return false;
}
- static synchronized PrivateSpaceMaintainer getInstance(Context context) {
+ /** Returns true when the PS is locked or when PS doesn't exist, false otherwise. */
+ public synchronized boolean isPrivateSpaceLocked() {
+ if (!doesPrivateSpaceExist()) {
+ return true;
+ }
+
+ return mUserManager.isQuietModeEnabled(mUserHandle);
+ }
+
+ /** Returns the instance of {@link PrivateSpaceMaintainer} */
+ public static synchronized PrivateSpaceMaintainer getInstance(Context context) {
if (sPrivateSpaceMaintainer == null) {
sPrivateSpaceMaintainer = new PrivateSpaceMaintainer(context);
}
diff --git a/src/com/android/settings/spa/app/appinfo/AppDataUsagePreference.kt b/src/com/android/settings/spa/app/appinfo/AppDataUsagePreference.kt
index 5210dc7..ceb3986 100644
--- a/src/com/android/settings/spa/app/appinfo/AppDataUsagePreference.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppDataUsagePreference.kt
@@ -18,13 +18,10 @@
import android.content.Context
import android.content.pm.ApplicationInfo
-import android.net.NetworkStats
import android.net.NetworkTemplate
-import android.os.Process
-import android.text.format.DateUtils
-import android.text.format.Formatter
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -32,25 +29,47 @@
import com.android.settings.Utils
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settings.datausage.AppDataUsage
-import com.android.settings.datausage.DataUsageUtils
-import com.android.settingslib.net.NetworkCycleDataForUid
-import com.android.settingslib.net.NetworkCycleDataForUidLoader
+import com.android.settings.datausage.lib.AppDataUsageSummaryRepository
+import com.android.settings.datausage.lib.IAppDataUsageSummaryRepository
+import com.android.settings.datausage.lib.INetworkTemplates
+import com.android.settings.datausage.lib.NetworkTemplates
+import com.android.settings.datausage.lib.NetworkTemplates.getTitleResId
import com.android.settingslib.spa.framework.compose.toState
import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel
import com.android.settingslib.spaprivileged.model.app.hasFlag
+import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.shareIn
import kotlinx.coroutines.withContext
@Composable
-fun AppDataUsagePreference(app: ApplicationInfo) {
+fun AppDataUsagePreference(
+ app: ApplicationInfo,
+ networkTemplates: INetworkTemplates = NetworkTemplates,
+ repositoryFactory: (
+ context: Context,
+ networkTemplate: NetworkTemplate,
+ ) -> IAppDataUsageSummaryRepository = { context, networkTemplate ->
+ AppDataUsageSummaryRepository(context, networkTemplate)
+ }
+) {
val context = LocalContext.current
- val presenter = remember { AppDataUsagePresenter(context, app) }
+ val coroutineScope = rememberCoroutineScope()
+ val presenter = remember {
+ AppDataUsagePresenter(context, app, coroutineScope, networkTemplates, repositoryFactory)
+ }
if (!presenter.isAvailableFlow.collectAsStateWithLifecycle(initialValue = false).value) return
Preference(object : PreferenceModel {
- override val title = stringResource(R.string.data_usage_app_summary_title)
+ override val title = stringResource(
+ presenter.titleResIdFlow.collectAsStateWithLifecycle(
+ initialValue = R.string.summary_placeholder,
+ ).value
+ )
override val summary = presenter.summaryFlow.collectAsStateWithLifecycle(
initialValue = stringResource(R.string.computing_size),
)
@@ -62,6 +81,12 @@
private class AppDataUsagePresenter(
private val context: Context,
private val app: ApplicationInfo,
+ coroutineScope: CoroutineScope,
+ networkTemplates: INetworkTemplates,
+ private val repositoryFactory: (
+ context: Context,
+ networkTemplate: NetworkTemplate,
+ ) -> IAppDataUsageSummaryRepository,
) {
val isAvailableFlow = flow { emit(isAvailable()) }
@@ -71,51 +96,28 @@
fun isEnabled() = app.hasFlag(ApplicationInfo.FLAG_INSTALLED)
- val summaryFlow = flow { emit(getSummary()) }
+ private val templateFlow = flow {
+ emit(withContext(Dispatchers.IO) {
+ networkTemplates.getDefaultTemplate(context)
+ })
+ }.shareIn(coroutineScope, SharingStarted.WhileSubscribed(), 1)
- private suspend fun getSummary() = withContext(Dispatchers.IO) {
- val appUsageData = getAppUsageData()
- val totalBytes = appUsageData.sumOf { it.totalUsage }
- if (totalBytes == 0L) {
+ val titleResIdFlow = templateFlow.map { it.getTitleResId() }
+ val summaryFlow = templateFlow.map { getSummary(it) }
+
+ private suspend fun getSummary(template: NetworkTemplate) = withContext(Dispatchers.IO) {
+ val appUsageData = repositoryFactory(context, template).querySummary(app.uid)
+ if (appUsageData == null || appUsageData.usage == 0L) {
context.getString(R.string.no_data_usage)
} else {
- val startTime = appUsageData.minOfOrNull { it.startTime } ?: System.currentTimeMillis()
context.getString(
R.string.data_summary_format,
- Formatter.formatFileSize(context, totalBytes, Formatter.FLAG_IEC_UNITS),
- DateUtils.formatDateTime(context, startTime, DATE_FORMAT),
+ appUsageData.formatUsage(context),
+ appUsageData.formatStartDate(context),
)
}
}
- private suspend fun getAppUsageData(): List<NetworkCycleDataForUid> =
- withContext(Dispatchers.IO) {
- createLoader().loadInBackground() ?: emptyList()
- }
-
- private fun createLoader(): NetworkCycleDataForUidLoader =
- NetworkCycleDataForUidLoader.builder(context).apply {
- setRetrieveDetail(false)
- setNetworkTemplate(getTemplate())
- addUid(app.uid)
- if (Process.isApplicationUid(app.uid)) {
- // Also add in network usage for the app's SDK sandbox
- addUid(Process.toSdkSandboxUid(app.uid))
- }
- }.build()
-
- private fun getTemplate(): NetworkTemplate = when {
- DataUsageUtils.hasReadyMobileRadio(context) -> {
- NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE)
- .setMeteredness(NetworkStats.METERED_YES)
- .build()
- }
- DataUsageUtils.hasWifiRadio(context) -> {
- NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build()
- }
- else -> NetworkTemplate.Builder(NetworkTemplate.MATCH_ETHERNET).build()
- }
-
fun startActivity() {
AppInfoDashboardFragment.startAppInfoFragment(
AppDataUsage::class.java,
@@ -124,8 +126,4 @@
AppInfoSettingsProvider.METRICS_CATEGORY,
)
}
-
- private companion object {
- const val DATE_FORMAT = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_ABBREV_MONTH
- }
}
diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
index 33648fe..f6416db 100644
--- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
+++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
@@ -165,16 +165,16 @@
private void updateDefaultEngine(String engine) {
Log.d(TAG, "Updating default synth to : " + engine);
- // Keep track of the previous engine that was being used. So that
- // we can reuse the previous engine.
- //
- // Note that if TextToSpeech#getCurrentEngine is not null, it means at
- // the very least that we successfully bound to the engine service.
- mPreviousEngine = mTts.getCurrentEngine();
-
// Step 1: Shut down the existing TTS engine.
Log.i(TAG, "Shutting down current tts engine");
if (mTts != null) {
+ // Keep track of the previous engine that was being used. So that
+ // we can reuse the previous engine.
+ //
+ // Note that if TextToSpeech#getCurrentEngine is not null, it means at
+ // the very least that we successfully bound to the engine service.
+ mPreviousEngine = mTts.getCurrentEngine();
+
try {
mTts.shutdown();
mTts = null;
diff --git a/src/com/android/settings/users/AutoSyncPrivateDataPreferenceController.kt b/src/com/android/settings/users/AutoSyncPrivateDataPreferenceController.kt
new file mode 100644
index 0000000..3eabafe
--- /dev/null
+++ b/src/com/android/settings/users/AutoSyncPrivateDataPreferenceController.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2023 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.users
+
+import android.content.Context
+import androidx.preference.PreferenceFragmentCompat
+import com.android.settings.Utils
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment
+
+class AutoSyncPrivateDataPreferenceController(
+ context: Context?, parent: PreferenceFragmentCompat?)
+ : AutoSyncDataPreferenceController(context, parent) {
+ init {
+ mUserHandle = Utils
+ .getProfileOfType(mUserManager, ProfileSelectFragment.ProfileType.PRIVATE)
+ }
+
+ override fun getPreferenceKey(): String {
+ return KEY_AUTO_SYNC_PRIVATE_ACCOUNT
+ }
+
+ override fun isAvailable(): Boolean {
+ return (mUserHandle != null
+ && mUserManager.getUserInfo(mUserHandle.identifier).isPrivateProfile)
+ }
+
+ companion object {
+ private const val KEY_AUTO_SYNC_PRIVATE_ACCOUNT = "auto_sync_private_account_data"
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index b2b7346..d2beec8 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -653,6 +653,9 @@
case AccessPoint.SECURITY_EAP:
case AccessPoint.SECURITY_EAP_WPA3_ENTERPRISE:
case AccessPoint.SECURITY_EAP_SUITE_B:
+ if (mEapMethodSpinner == null || mPhase2Spinner == null) {
+ break;
+ }
if (mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B) {
// allowedSuiteBCiphers will be set according to certificate type
config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
diff --git a/tests/anomaly-tester/Android.bp b/tests/anomaly-tester/Android.bp
index f17f4b2..0b05e04 100644
--- a/tests/anomaly-tester/Android.bp
+++ b/tests/anomaly-tester/Android.bp
@@ -18,7 +18,7 @@
"androidx.test.rules",
"mockito-target",
"androidx.test.uiautomator_uiautomator",
- "truth-prebuilt",
+ "truth",
],
srcs: ["**/*.java"],
diff --git a/tests/componenttests/Android.bp b/tests/componenttests/Android.bp
index 5c03aa9..300a338 100644
--- a/tests/componenttests/Android.bp
+++ b/tests/componenttests/Android.bp
@@ -19,7 +19,7 @@
],
static_libs: [
- "truth-prebuilt",
+ "truth",
"androidx.test.core",
"androidx.test.espresso.core",
"androidx.test.espresso.intents-nodeps",
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index fbfd888..68793a1 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -25,6 +25,8 @@
"androidx.fragment_fragment-testing",
"frameworks-base-testutils",
"androidx.fragment_fragment",
+ "androidx.lifecycle_lifecycle-runtime-testing",
+ "kotlinx_coroutines_test",
],
aaptflags: ["--extra-packages com.android.settings"],
@@ -59,16 +61,21 @@
"androidx.test.rules",
"androidx.test.runner",
"flag-junit",
+ "flag-junit-base",
"aconfig_settings_flags_lib",
"platform-test-annotations",
"Settings-testutils2",
+ "notification_flags_lib",
],
libs: [
"ims-common",
],
- java_resource_dirs: ["config", "resources"],
+ java_resource_dirs: [
+ "config",
+ "resources",
+ ],
instrumentation_for: "SettingsRoboTestStub",
@@ -93,6 +100,6 @@
"Robolectric_all-target_upstream",
"Settings-core",
"mockito-robolectric-prebuilt",
- "truth-prebuilt",
+ "truth",
],
}
diff --git a/tests/robotests/src/com/android/settings/applications/AppDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/AppDashboardFragmentTest.java
index 0eca43c..5137516 100644
--- a/tests/robotests/src/com/android/settings/applications/AppDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppDashboardFragmentTest.java
@@ -16,12 +16,24 @@
package com.android.settings.applications;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
import static com.google.common.truth.Truth.assertThat;
-import android.content.Context;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import com.android.settings.applications.appcompat.UserAspectRatioAppsPreferenceController;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settings.widget.PreferenceCategoryController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.drawer.CategoryKey;
@@ -31,6 +43,7 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
import java.util.ArrayList;
import java.util.List;
@@ -66,4 +79,22 @@
assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
}
+
+ @Test
+ @Config(shadows = ShadowUserManager.class)
+ public void testAdvancedAppsCategory() {
+ AppDashboardFragment fragment = FragmentController.of(new AppDashboardFragment(),
+ new Bundle()).create().get();
+ UserAspectRatioAppsPreferenceController controller =
+ mock(UserAspectRatioAppsPreferenceController.class);
+ final PreferenceCategoryController advancedController =
+ fragment.getAdvancedAppsPreferenceCategoryController();
+ advancedController.setChildren(List.of(controller));
+
+ when(controller.getAvailabilityStatus()).thenReturn(AVAILABLE);
+ assertTrue(advancedController.isAvailable());
+
+ when(controller.getAvailabilityStatus()).thenReturn(CONDITIONALLY_UNAVAILABLE);
+ assertFalse(advancedController.isAvailable());
+ }
}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint2/fragment/FingerprintEnrollIntroFragmentTest.kt b/tests/robotests/src/com/android/settings/biometrics/fingerprint2/fragment/FingerprintEnrollIntroFragmentTest.kt
new file mode 100644
index 0000000..cea6676
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint2/fragment/FingerprintEnrollIntroFragmentTest.kt
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2023 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.biometrics.fingerprint2.fragment
+
+import android.content.Context
+import android.os.Bundle
+import androidx.fragment.app.testing.FragmentScenario
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.Visibility
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.runner.AndroidJUnit4
+import com.android.settings.R
+import com.android.settings.biometrics.fingerprint2.ui.enrollment.fragment.FingerprintEnrollIntroV2Fragment
+import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.FingerprintEnrollNavigationViewModel
+import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.FingerprintEnrollViewModel
+import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.FingerprintGatekeeperViewModel
+import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.FingerprintScrollViewModel
+import com.android.settings.biometrics.fingerprint2.ui.enrollment.viewmodel.GatekeeperInfo
+import com.android.settings.testutils2.FakeFingerprintManagerInteractor
+import com.google.android.setupdesign.GlifLayout
+import com.google.android.setupdesign.template.RequireScrollMixin
+import kotlinx.coroutines.test.StandardTestDispatcher
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class FingerprintEnrollIntroFragmentTest {
+ private var context: Context = ApplicationProvider.getApplicationContext()
+ private var interactor = FakeFingerprintManagerInteractor()
+
+ private val gatekeeperViewModel =
+ FingerprintGatekeeperViewModel(
+ GatekeeperInfo.GatekeeperPasswordInfo(byteArrayOf(1, 2, 3), 100L),
+ interactor
+ )
+ private val backgroundDispatcher = StandardTestDispatcher()
+ private lateinit var fragmentScenario: FragmentScenario<FingerprintEnrollIntroV2Fragment>
+
+ private val navigationViewModel =
+ FingerprintEnrollNavigationViewModel(
+ backgroundDispatcher,
+ interactor,
+ gatekeeperViewModel,
+ canSkipConfirm = true,
+ )
+ private var fingerprintViewModel = FingerprintEnrollViewModel(interactor, backgroundDispatcher)
+ private var fingerprintScrollViewModel = FingerprintScrollViewModel()
+
+ @Before
+ fun setup() {
+ val factory =
+ object : ViewModelProvider.Factory {
+ @Suppress("UNCHECKED_CAST")
+ override fun <T : ViewModel> create(
+ modelClass: Class<T>,
+ ): T {
+ return when (modelClass) {
+ FingerprintEnrollViewModel::class.java -> fingerprintViewModel
+ FingerprintScrollViewModel::class.java -> fingerprintScrollViewModel
+ FingerprintEnrollNavigationViewModel::class.java -> navigationViewModel
+ FingerprintGatekeeperViewModel::class.java -> gatekeeperViewModel
+ else -> null
+ }
+ as T
+ }
+ }
+
+ fragmentScenario =
+ launchFragmentInContainer(Bundle(), R.style.SudThemeGlif) {
+ FingerprintEnrollIntroV2Fragment(factory)
+ }
+ }
+
+ @Test
+ fun testScrollToBottomButtonChangesText() {
+ fragmentScenario.onFragment { fragment ->
+ onView(withText("I agree")).check(doesNotExist())
+ val someView = (fragment.requireView().findViewById<GlifLayout>(R.id.setup_wizard_layout))!!
+ val scrollMixin = someView.getMixin(RequireScrollMixin::class.java)!!
+ val listener = scrollMixin.onRequireScrollStateChangedListener
+ // This actually changes the button text
+ listener.onRequireScrollStateChanged(false)
+
+ onView(withText("I agree")).check(matches(isDisplayed()))
+ }
+ }
+
+ @Test
+ fun testBasicTitle() {
+ onView(withText(R.string.security_settings_fingerprint_enroll_introduction_title))
+ .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
+ }
+
+ @Test
+ fun testFooterMessageTwo() {
+ onView(withId(R.id.footer_message_2))
+ .check(
+ matches(
+ withText(
+ context.getString(
+ (R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_2)
+ )
+ )
+ )
+ )
+ }
+
+ @Test
+ fun testFooterMessageThree() {
+ onView(withId(R.id.footer_message_3))
+ .check(
+ matches(
+ withText(
+ context.getString(
+ (R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_3)
+ )
+ )
+ )
+ )
+ }
+
+ @Test
+ fun testFooterMessageFour() {
+ onView(withId(R.id.footer_message_4))
+ .check(
+ matches(
+ withText(
+ context.getString(
+ (R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_4)
+ )
+ )
+ )
+ )
+ }
+
+ @Test
+ fun testFooterMessageFive() {
+ onView(withId(R.id.footer_message_5))
+ .check(
+ matches(
+ withText(
+ context.getString(
+ (R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_5)
+ )
+ )
+ )
+ )
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherControllerTest.java
index 2bd2d74..c02ec32 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherControllerTest.java
@@ -20,6 +20,8 @@
import static org.mockito.Mockito.when;
+import android.bluetooth.BluetoothDevice;
+
import com.android.settings.R;
import com.android.settings.applications.SpacePreference;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -65,7 +67,7 @@
/** Test the pair other side button title during initialization. */
@Test
- public void init_leftSideDevice_pairRightSideButtonTitle() {
+ public void init_deviceIsLeftSide_showPairRightSideTitle() {
when(mCachedDevice.getDeviceSide()).thenReturn(HearingAidInfo.DeviceSide.SIDE_LEFT);
mController.init(mScreen);
@@ -76,7 +78,7 @@
/** Test the pair other side button title during initialization. */
@Test
- public void init_rightSideDevice_pairLeftSideButtonTitle() {
+ public void init_deviceIsRightSide_showPairLeftSideTitle() {
when(mCachedDevice.getDeviceSide()).thenReturn(HearingAidInfo.DeviceSide.SIDE_RIGHT);
mController.init(mScreen);
@@ -87,7 +89,7 @@
/** Test the pair other side button visibility during initialization. */
@Test
- public void init_isNotConnectedHearingAidDevice_preferenceIsNotVisible() {
+ public void init_deviceIsNotConnectedHearingAid_preferenceIsNotVisible() {
when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(false);
mController.init(mScreen);
@@ -99,13 +101,13 @@
/**
* Test if the controller is available.
* Conditions:
- * 1. Hearing aids is not connected
+ * 1. The device is not a connected hearing aid
* Expected result:
* The controller is not available. No need to show pair other side hint for
- * not connected device.
+ * non-hearing aid device or not connected device.
*/
@Test
- public void isAvailable_isNotConnectedHearingAidDevice_notAvailable() {
+ public void isAvailable_deviceIsNotConnectedHearingAid_notAvailable() {
when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
@@ -114,13 +116,13 @@
/**
* Test if the controller is available.
* Conditions:
- * 1. Monaural hearing aids
+ * 1. Monaural hearing aid
* Expected result:
* The controller is not available. No need to show pair other side hint for
* monaural device.
*/
@Test
- public void isAvailable_isConnectedHearingAidDevice_isMonaural_notAvailable() {
+ public void isAvailable_deviceIsConnectedHearingAid_isMonaural_notAvailable() {
when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(true);
when(mCachedDevice.getDeviceMode()).thenReturn(HearingAidInfo.DeviceMode.MODE_MONAURAL);
@@ -130,18 +132,17 @@
/**
* Test if the controller is available.
* Conditions:
- * 1. Binaural ASHA hearing aids
+ * 1. Binaural hearing aids
* 2. Sub device is added
- * 3. Sub device is connected
+ * 3. Sub device is bonded
* Expected result:
- * The controller is not available. Both sides are already paired and connected.
+ * The controller is not available. Both sides are already paired.
*/
@Test
- public void isAvailable_ashaDevice_otherDeviceIsConnected_notAvailable() {
+ public void isAvailable_deviceIsConnectedHearingAid_subDeviceIsBonded_notAvailable() {
when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(true);
- when(mCachedDevice.isConnectedAshaHearingAidDevice()).thenReturn(true);
when(mCachedDevice.getDeviceMode()).thenReturn(HearingAidInfo.DeviceMode.MODE_BINAURAL);
- when(mSubCachedDevice.isConnectedAshaHearingAidDevice()).thenReturn(true);
+ when(mSubCachedDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
when(mCachedDevice.getSubDevice()).thenReturn(mSubCachedDevice);
assertThat(mController.isAvailable()).isFalse();
@@ -150,18 +151,17 @@
/**
* Test if the controller is available.
* Conditions:
- * 1. Binaural ASHA hearing aids
+ * 1. Binaural hearing aids
* 2. Sub device is added
- * 3. Sub device is not connected
+ * 3. Sub device is not bonded
* Expected result:
* The controller is available. Need to show the hint to pair the other side.
*/
@Test
- public void isAvailable_ashaDevice_otherDeviceIsNotConnected_available() {
+ public void isAvailable_deviceIsConnectedHearingAid_subDeviceIsNotBonded_available() {
when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(true);
- when(mCachedDevice.isConnectedAshaHearingAidDevice()).thenReturn(true);
when(mCachedDevice.getDeviceMode()).thenReturn(HearingAidInfo.DeviceMode.MODE_BINAURAL);
- when(mSubCachedDevice.isConnectedAshaHearingAidDevice()).thenReturn(false);
+ when(mSubCachedDevice.getBondState()).thenReturn(BluetoothDevice.BOND_NONE);
when(mCachedDevice.getSubDevice()).thenReturn(mSubCachedDevice);
assertThat(mController.isAvailable()).isTrue();
@@ -170,74 +170,55 @@
/**
* Test if the controller is available.
* Conditions:
- * 1. Binaural ASHA hearing aids
- * 2. No sub device added
+ * 1. Binaural hearing aids
+ * 2. Member device is added
+ * 3. Member device is bonded
+ * Expected result:
+ * The controller is not available. Both sides are already paired.
+ */
+ @Test
+ public void isAvailable_deviceIsConnectedHearingAid_memberDeviceIsBonded_notAvailable() {
+ when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(true);
+ when(mCachedDevice.getDeviceMode()).thenReturn(HearingAidInfo.DeviceMode.MODE_BINAURAL);
+ when(mSubCachedDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
+ when(mCachedDevice.getMemberDevice()).thenReturn(Set.of(mSubCachedDevice));
+
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ /**
+ * Test if the controller is available.
+ * Conditions:
+ * 1. Binaural hearing aids
+ * 2. Member device is added
+ * 3. Member device is not bonded
* Expected result:
* The controller is available. Need to show the hint to pair the other side.
*/
@Test
- public void isAvailable_ashaDevice_otherDeviceIsNotExist_available() {
+ public void isAvailable_deviceIsConnectedHearingAid_memberDeviceIsNotBonded_available() {
when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(true);
- when(mCachedDevice.isConnectedAshaHearingAidDevice()).thenReturn(true);
+ when(mCachedDevice.getDeviceMode()).thenReturn(HearingAidInfo.DeviceMode.MODE_BINAURAL);
+ when(mSubCachedDevice.getBondState()).thenReturn(BluetoothDevice.BOND_NONE);
+ when(mCachedDevice.getMemberDevice()).thenReturn(Set.of(mSubCachedDevice));
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ /**
+ * Test if the controller is available.
+ * Conditions:
+ * 1. Binaural hearing aids
+ * 2. No sub device is added
+ * 2. No member device is added
+ * Expected result:
+ * The controller is available. Need to show the hint to pair the other side.
+ */
+ @Test
+ public void isAvailable_deviceIsConnectedHearingAid_otherDeviceIsNotExist_available() {
+ when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(true);
when(mCachedDevice.getDeviceMode()).thenReturn(HearingAidInfo.DeviceMode.MODE_BINAURAL);
when(mCachedDevice.getSubDevice()).thenReturn(null);
-
- assertThat(mController.isAvailable()).isTrue();
- }
-
- /**
- * Test if the controller is available.
- * Conditions:
- * 1. Binaural LE Audio hearing aids
- * 2. Member device is added
- * 3. Member device is connected
- * Expected result:
- * The controller is not available. Both sides are already paired and connected.
- */
- @Test
- public void isAvailable_leAudioDevice_otherDeviceIsConnected_notAvailable() {
- when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(true);
- when(mCachedDevice.isConnectedLeAudioHearingAidDevice()).thenReturn(true);
- when(mCachedDevice.getDeviceMode()).thenReturn(HearingAidInfo.DeviceMode.MODE_BINAURAL);
- when(mSubCachedDevice.isConnectedLeAudioHearingAidDevice()).thenReturn(true);
- when(mCachedDevice.getMemberDevice()).thenReturn(Set.of(mSubCachedDevice));
-
- assertThat(mController.isAvailable()).isFalse();
- }
-
- /**
- * Test if the controller is available.
- * Conditions:
- * 1. Binaural LE Audio hearing aids
- * 2. Member device is added
- * 3. Member device is not connected
- * Expected result:
- * The controller is available. Need to show the hint to pair the other side.
- */
- @Test
- public void isAvailable_leAudioDevice_otherDeviceIsNotConnected_available() {
- when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(true);
- when(mCachedDevice.isConnectedLeAudioHearingAidDevice()).thenReturn(true);
- when(mCachedDevice.getDeviceMode()).thenReturn(HearingAidInfo.DeviceMode.MODE_BINAURAL);
- when(mSubCachedDevice.isConnectedLeAudioHearingAidDevice()).thenReturn(false);
- when(mCachedDevice.getMemberDevice()).thenReturn(Set.of(mSubCachedDevice));
-
- assertThat(mController.isAvailable()).isTrue();
- }
-
- /**
- * Test if the controller is available.
- * Conditions:
- * 1. Binaural LE Audio hearing aids
- * 2. No member device added
- * Expected result:
- * The controller is available. Need to show the hint to pair the other side.
- */
- @Test
- public void isAvailable_leAudioDevice_otherDeviceIsNotExist_available() {
- when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(true);
- when(mCachedDevice.isConnectedLeAudioHearingAidDevice()).thenReturn(true);
- when(mCachedDevice.getDeviceMode()).thenReturn(HearingAidInfo.DeviceMode.MODE_BINAURAL);
when(mCachedDevice.getMemberDevice()).thenReturn(new HashSet<>());
assertThat(mController.isAvailable()).isTrue();
@@ -245,7 +226,7 @@
/** Test the pair other side button title after refreshing. */
@Test
- public void refresh_rightSideDevice_pairLeftSideButtonTitle() {
+ public void refresh_deviceIsRightSide_showPairLeftSideTitle() {
when(mCachedDevice.getDeviceSide()).thenReturn(HearingAidInfo.DeviceSide.SIDE_RIGHT);
mController.init(mScreen);
@@ -257,7 +238,7 @@
/** Test the pair other side button visibility after refreshing. */
@Test
- public void refresh_isNotConnectedHearingAidDevice_preferenceIsNotVisible() {
+ public void refresh_deviceIsNotConnectedHearingAid_preferenceIsNotVisible() {
when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(false);
mController.init(mScreen);
diff --git a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectFragmentTest.java
index b595d06..056935c 100644
--- a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectFragmentTest.java
@@ -19,6 +19,7 @@
import static android.content.Intent.EXTRA_USER_ID;
import static com.android.settings.dashboard.profileselector.ProfileSelectFragment.PERSONAL_TAB;
+import static com.android.settings.dashboard.profileselector.ProfileSelectFragment.PRIVATE_TAB;
import static com.android.settings.dashboard.profileselector.ProfileSelectFragment.WORK_TAB;
import static com.google.common.truth.Truth.assertThat;
@@ -29,6 +30,9 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.os.Flags;
+import android.os.UserHandle;
+import android.platform.test.flag.junit.SetFlagsRule;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
@@ -38,6 +42,7 @@
import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
@@ -60,6 +65,7 @@
private TestProfileSelectFragment mFragment;
private FragmentActivity mActivity;
private ShadowUserManager mUserManager;
+ @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Before
public void setUp() {
@@ -86,6 +92,14 @@
}
@Test
+ public void getTabId_setArgumentPrivate_setCorrectTab() {
+ final Bundle bundle = new Bundle();
+ bundle.putInt(SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB, PRIVATE_TAB);
+
+ assertThat(mFragment.getTabId(mActivity, bundle)).isEqualTo(PRIVATE_TAB);
+ }
+
+ @Test
public void getTabId_setArgumentPersonal_setCorrectTab() {
final Bundle bundle = new Bundle();
bundle.putInt(SettingsActivity.EXTRA_SHOW_FRAGMENT_TAB, PERSONAL_TAB);
@@ -105,6 +119,16 @@
}
@Test
+ public void getTabId_setPrivateId_getCorrectTab() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+ final Bundle bundle = new Bundle();
+ bundle.putInt(EXTRA_USER_ID, 11);
+ mUserManager.setPrivateProfile(11, "private", 0);
+
+ assertThat(mFragment.getTabId(mActivity, bundle)).isEqualTo(PRIVATE_TAB);
+ }
+
+ @Test
public void getTabId_setPersonalId_getCorrectTab() {
final Bundle bundle = new Bundle();
bundle.putInt(EXTRA_USER_ID, 0);
@@ -124,12 +148,120 @@
assertThat(mFragment.getTabId(mActivity, null)).isEqualTo(WORK_TAB);
}
+ @Test
+ public void testGetFragments_whenOnlyPersonal_returnsOneFragment() {
+ mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+ Fragment[] fragments = ProfileSelectFragment.getFragments(
+ mContext,
+ null /* bundle */,
+ TestProfileSelectFragment::new,
+ TestProfileSelectFragment::new,
+ TestProfileSelectFragment::new);
+ assertThat(fragments).hasLength(1);
+ }
+
+ @Test
+ public void testGetFragments_whenPrivateDisabled_returnsOneFragment() {
+ Fragment[] fragments = ProfileSelectFragment.getFragments(
+ mContext,
+ null /* bundle */,
+ TestProfileSelectFragment::new,
+ TestProfileSelectFragment::new,
+ TestProfileSelectFragment::new,
+ new ProfileSelectFragment.PrivateSpaceInfoProvider() {
+ @Override
+ public boolean isPrivateSpaceLocked(Context context) {
+ return true;
+ }
+ },
+ new ProfileSelectFragment.ManagedProfileInfoProvider() {
+ @Override
+ public UserHandle getManagedProfile(Context context) {
+ return null;
+ }
+ });
+ assertThat(fragments).hasLength(1);
+ }
+
+ @Test
+ public void testGetFragments_whenPrivateEnabled_returnsTwoFragments() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+ Fragment[] fragments = ProfileSelectFragment.getFragments(
+ mContext,
+ null /* bundle */,
+ TestProfileSelectFragment::new,
+ TestProfileSelectFragment::new,
+ TestProfileSelectFragment::new,
+ new ProfileSelectFragment.PrivateSpaceInfoProvider() {
+ @Override
+ public boolean isPrivateSpaceLocked(Context context) {
+ return false;
+ }
+ },
+ new ProfileSelectFragment.ManagedProfileInfoProvider() {
+ @Override
+ public UserHandle getManagedProfile(Context context) {
+ return null;
+ }
+ });
+ assertThat(fragments).hasLength(2);
+ }
+
+ @Test
+ public void testGetFragments_whenManagedProfile_returnsTwoFragments() {
+ mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+ Fragment[] fragments = ProfileSelectFragment.getFragments(
+ mContext,
+ null /* bundle */,
+ TestProfileSelectFragment::new,
+ TestProfileSelectFragment::new,
+ TestProfileSelectFragment::new,
+ new ProfileSelectFragment.PrivateSpaceInfoProvider() {
+ @Override
+ public boolean isPrivateSpaceLocked(Context context) {
+ return false;
+ }
+ },
+ new ProfileSelectFragment.ManagedProfileInfoProvider() {
+ @Override
+ public UserHandle getManagedProfile(Context context) {
+ return new UserHandle(123);
+ }
+ });
+ assertThat(fragments).hasLength(2);
+ }
+
+ @Test
+ public void testGetFragments_whenAllProfiles_returnsThreeFragments() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
+ Fragment[] fragments = ProfileSelectFragment.getFragments(
+ mContext,
+ null /* bundle */,
+ TestProfileSelectFragment::new,
+ TestProfileSelectFragment::new,
+ TestProfileSelectFragment::new,
+ new ProfileSelectFragment.PrivateSpaceInfoProvider() {
+ @Override
+ public boolean isPrivateSpaceLocked(Context context) {
+ return false;
+ }
+ },
+ new ProfileSelectFragment.ManagedProfileInfoProvider() {
+ @Override
+ public UserHandle getManagedProfile(Context context) {
+ return new UserHandle(123);
+ }
+ });
+ assertThat(fragments).hasLength(3);
+ }
+
public static class TestProfileSelectFragment extends ProfileSelectFragment {
@Override
public Fragment[] getFragments() {
return new Fragment[]{
new SettingsPreferenceFragmentTest.TestFragment(), //0
+ new SettingsPreferenceFragmentTest.TestFragment(),
new SettingsPreferenceFragmentTest.TestFragment()
};
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragmentTest.java
index f463bec..fa2782f 100644
--- a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragmentTest.java
@@ -39,10 +39,12 @@
@Test
public void getFragments_containsCorrectBundle() {
- assertThat(mProfileSelectLocationFragment.getFragments().length).isEqualTo(2);
+ assertThat(mProfileSelectLocationFragment.getFragments().length).isEqualTo(3);
assertThat(mProfileSelectLocationFragment.getFragments()[0].getArguments().getInt(
EXTRA_PROFILE, -1)).isEqualTo(ProfileSelectFragment.ProfileType.PERSONAL);
assertThat(mProfileSelectLocationFragment.getFragments()[1].getArguments().getInt(
EXTRA_PROFILE, -1)).isEqualTo(ProfileSelectFragment.ProfileType.WORK);
+ assertThat(mProfileSelectLocationFragment.getFragments()[1].getArguments().getInt(
+ EXTRA_PROFILE, -1)).isEqualTo(ProfileSelectFragment.ProfileType.PRIVATE);
}
}
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
index 6a1c0a6..7b7c7a6 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
@@ -41,8 +41,8 @@
import android.os.Bundle;
import android.os.Process;
import android.telephony.SubscriptionManager;
-import android.text.format.DateUtils;
import android.util.ArraySet;
+import android.util.Range;
import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
@@ -51,6 +51,7 @@
import androidx.recyclerview.widget.RecyclerView;
import com.android.settings.applications.AppInfoBase;
+import com.android.settings.datausage.lib.NetworkUsageDetailsData;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
@@ -60,8 +61,7 @@
import com.android.settingslib.AppItem;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedSwitchPreference;
-import com.android.settingslib.net.NetworkCycleDataForUid;
-import com.android.settingslib.net.NetworkCycleDataForUidLoader;
+import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider;
@@ -79,7 +79,6 @@
import org.robolectric.shadows.ShadowSubscriptionManager;
import org.robolectric.util.ReflectionHelpers;
-import java.util.ArrayList;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
@@ -109,10 +108,7 @@
@Test
@Config(shadows = ShadowFragment.class)
public void onCreate_appUid_shouldGetAppLabelFromAppInfo() throws NameNotFoundException {
- mFragment = spy(new AppDataUsage() {
- @Override
- public boolean isSimHardwareVisible(Context context) { return true; }
- });
+ mFragment = spy(new TestFragment());
final FragmentActivity activity = spy(Robolectric.setupActivity(FragmentActivity.class));
doReturn(mPackageManager).when(activity).getPackageManager();
doReturn(activity).when(mFragment).getActivity();
@@ -142,10 +138,7 @@
@Test
@Config(shadows = ShadowFragment.class)
public void onCreate_notAppUid_shouldGetAppLabelFromUidDetailProvider() {
- mFragment = spy(new AppDataUsage() {
- @Override
- public boolean isSimHardwareVisible(Context context) { return true; }
- });
+ mFragment = spy(new TestFragment());
ReflectionHelpers.setField(mFragment, "mDashboardFeatureProvider",
FakeFeatureFactory.setupForTest().dashboardFeatureProvider);
doReturn(Robolectric.setupActivity(FragmentActivity.class)).when(mFragment).getActivity();
@@ -172,10 +165,7 @@
@Test
public void bindAppHeader_allWorkApps_shouldNotShowAppInfoLink() {
- mFragment = spy(new AppDataUsage() {
- @Override
- public boolean isSimHardwareVisible(Context context) { return true; }
- });
+ mFragment = spy(new TestFragment());
when(mFragment.getPreferenceManager())
.thenReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS));
@@ -192,10 +182,7 @@
throws PackageManager.NameNotFoundException {
final int fakeUserId = 100;
- mFragment = spy(new AppDataUsage() {
- @Override
- public boolean isSimHardwareVisible(Context context) { return true; }
- });
+ mFragment = spy(new TestFragment());
final ArraySet<String> packages = new ArraySet<>();
packages.add("pkg");
final AppItem appItem = new AppItem(123456789);
@@ -221,10 +208,7 @@
@Test
public void changePreference_backgroundData_shouldUpdateUI() {
- mFragment = spy(new AppDataUsage() {
- @Override
- public boolean isSimHardwareVisible(Context context) { return true; }
- });
+ mFragment = spy(new TestFragment());
final AppItem appItem = new AppItem(123456789);
final RestrictedSwitchPreference pref = mock(RestrictedSwitchPreference.class);
final DataSaverBackend dataSaverBackend = mock(DataSaverBackend.class);
@@ -241,10 +225,7 @@
@Test
public void updatePrefs_restrictedByAdmin_shouldDisablePreference() {
- mFragment = spy(new AppDataUsage() {
- @Override
- public boolean isSimHardwareVisible(Context context) { return true; }
- });
+ mFragment = spy(new TestFragment());
final int testUid = 123123;
final AppItem appItem = new AppItem(testUid);
final RestrictedSwitchPreference restrictBackgroundPref
@@ -271,50 +252,27 @@
}
@Test
- public void bindData_noAppUsageData_shouldHideCycleSpinner() {
- mFragment = spy(new AppDataUsage() {
- @Override
- public boolean isSimHardwareVisible(Context context) { return true; }
- });
- final SpinnerPreference cycle = mock(SpinnerPreference.class);
- ReflectionHelpers.setField(mFragment, "mCycle", cycle);
- final Preference preference = mock(Preference.class);
- ReflectionHelpers.setField(mFragment, "mBackgroundUsage", preference);
- ReflectionHelpers.setField(mFragment, "mForegroundUsage", preference);
- ReflectionHelpers.setField(mFragment, "mTotalUsage", preference);
- ReflectionHelpers.setField(mFragment, "mContext", RuntimeEnvironment.application);
-
- mFragment.bindData(0 /* position */);
-
- verify(cycle).setHasCycles(false);
- }
-
- @Test
- public void bindData_hasAppUsageData_shouldShowCycleSpinnerAndUpdateUsageSummary() {
- mFragment = spy(new AppDataUsage() {
- @Override
- public boolean isSimHardwareVisible(Context context) { return true; }
- });
+ public void bindData_shouldUpdateUsageSummary() {
+ mFragment = spy(new TestFragment());
final Context context = RuntimeEnvironment.application;
ReflectionHelpers.setField(mFragment, "mContext", context);
final long backgroundBytes = 1234L;
final long foregroundBytes = 5678L;
- final List<NetworkCycleDataForUid> appUsage = new ArrayList<>();
- appUsage.add(new NetworkCycleDataForUid.Builder()
- .setBackgroundUsage(backgroundBytes).setForegroundUsage(foregroundBytes).build());
- ReflectionHelpers.setField(mFragment, "mUsageData", appUsage);
+ final NetworkUsageDetailsData appUsage = new NetworkUsageDetailsData(
+ new Range<>(1L, 2L),
+ backgroundBytes + foregroundBytes,
+ foregroundBytes,
+ backgroundBytes
+ );
final Preference backgroundPref = mock(Preference.class);
ReflectionHelpers.setField(mFragment, "mBackgroundUsage", backgroundPref);
final Preference foregroundPref = mock(Preference.class);
ReflectionHelpers.setField(mFragment, "mForegroundUsage", foregroundPref);
final Preference totalPref = mock(Preference.class);
ReflectionHelpers.setField(mFragment, "mTotalUsage", totalPref);
- final SpinnerPreference cycle = mock(SpinnerPreference.class);
- ReflectionHelpers.setField(mFragment, "mCycle", cycle);
- mFragment.bindData(0 /* position */);
+ mFragment.bindData(appUsage);
- verify(cycle).setHasCycles(true);
verify(totalPref).setSummary(
DataUsageUtils.formatDataUsage(context, backgroundBytes + foregroundBytes));
verify(backgroundPref).setSummary(DataUsageUtils.formatDataUsage(context, backgroundBytes));
@@ -322,143 +280,14 @@
}
@Test
- public void onCreateLoader_categoryApp_shouldQueryDataUsageUsingAppKey() {
- mFragment = new AppDataUsage() {
- @Override
- public boolean isSimHardwareVisible(Context context) { return true; }
- };
- final Context context = RuntimeEnvironment.application;
- final int testUid = 123123;
- final AppItem appItem = new AppItem(testUid);
- appItem.addUid(testUid);
- appItem.category = AppItem.CATEGORY_APP;
- ReflectionHelpers.setField(mFragment, "mContext", context);
- ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
- ReflectionHelpers.setField(mFragment, "mTemplate",
- new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
- final long end = System.currentTimeMillis();
- final long start = end - (DateUtils.WEEK_IN_MILLIS * 4);
-
- final NetworkCycleDataForUidLoader loader = (NetworkCycleDataForUidLoader)
- mFragment.mUidDataCallbacks.onCreateLoader(0, Bundle.EMPTY);
-
- final List<Integer> uids = loader.getUids();
- assertThat(uids).hasSize(1);
- assertThat(uids.get(0)).isEqualTo(testUid);
- }
-
- @Test
- public void onCreateLoader_categoryUser_shouldQueryDataUsageUsingAssociatedUids() {
- mFragment = new AppDataUsage() {
- @Override
- public boolean isSimHardwareVisible(Context context) { return true; }
- };
- final Context context = RuntimeEnvironment.application;
- final int testUserId = 11;
- final AppItem appItem = new AppItem(testUserId);
- appItem.category = AppItem.CATEGORY_USER;
- appItem.addUid(123);
- appItem.addUid(456);
- appItem.addUid(789);
- ReflectionHelpers.setField(mFragment, "mContext", context);
- ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
- ReflectionHelpers.setField(mFragment, "mTemplate",
- new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
- final long end = System.currentTimeMillis();
- final long start = end - (DateUtils.WEEK_IN_MILLIS * 4);
-
- final NetworkCycleDataForUidLoader loader = (NetworkCycleDataForUidLoader)
- mFragment.mUidDataCallbacks.onCreateLoader(0, Bundle.EMPTY);
-
- final List<Integer> uids = loader.getUids();
- assertThat(uids).hasSize(3);
- assertThat(uids.get(0)).isEqualTo(123);
- assertThat(uids.get(1)).isEqualTo(456);
- assertThat(uids.get(2)).isEqualTo(789);
- }
-
- @Test
- public void onCreateLoader_hasCyclesSpecified_shouldQueryDataUsageForSpecifiedCycles() {
- final long startTime = 1521583200000L;
- final long endTime = 1521676800000L;
- ArrayList<Long> testCycles = new ArrayList<>();
- testCycles.add(endTime);
- testCycles.add(startTime);
- final int uid = 123;
- final AppItem appItem = new AppItem(uid);
- appItem.category = AppItem.CATEGORY_APP;
- appItem.addUid(uid);
-
- mFragment = new AppDataUsage() {
- @Override
- public boolean isSimHardwareVisible(Context context) { return true; }
- };
- ReflectionHelpers.setField(mFragment, "mContext", RuntimeEnvironment.application);
- ReflectionHelpers.setField(mFragment, "mCycles", testCycles);
- ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
- ReflectionHelpers.setField(mFragment, "mTemplate",
- new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI).build());
-
- final NetworkCycleDataForUidLoader loader = (NetworkCycleDataForUidLoader)
- mFragment.mUidDataCallbacks.onCreateLoader(0 /* id */, Bundle.EMPTY /* args */);
-
- final ArrayList<Long> cycles = loader.getCycles();
- assertThat(cycles).hasSize(2);
- assertThat(cycles.get(0)).isEqualTo(endTime);
- assertThat(cycles.get(1)).isEqualTo(startTime);
- }
-
- @Test
- public void onLoadFinished_hasSelectedCycleSpecified_shouldSelectSpecifiedCycle() {
- final long now = System.currentTimeMillis();
- final long tenDaysAgo = now - (DateUtils.DAY_IN_MILLIS * 10);
- final long twentyDaysAgo = now - (DateUtils.DAY_IN_MILLIS * 20);
- final long thirtyDaysAgo = now - (DateUtils.DAY_IN_MILLIS * 30);
- final List<NetworkCycleDataForUid> data = new ArrayList<>();
- NetworkCycleDataForUid.Builder builder = new NetworkCycleDataForUid.Builder();
- builder.setStartTime(thirtyDaysAgo).setEndTime(twentyDaysAgo).setTotalUsage(9876L);
- data.add(builder.build());
- builder = new NetworkCycleDataForUid.Builder();
- builder.setStartTime(twentyDaysAgo).setEndTime(tenDaysAgo).setTotalUsage(5678L);
- data.add(builder.build());
- builder = new NetworkCycleDataForUid.Builder();
- builder.setStartTime(tenDaysAgo).setEndTime(now).setTotalUsage(1234L);
- data.add(builder.build());
-
- mFragment = new AppDataUsage() {
- @Override
- public boolean isSimHardwareVisible(Context context) { return true; }
- };
- ReflectionHelpers.setField(mFragment, "mContext", RuntimeEnvironment.application);
- ReflectionHelpers.setField(mFragment, "mCycleAdapter", mock(CycleAdapter.class));
- ReflectionHelpers.setField(mFragment, "mSelectedCycle", tenDaysAgo);
- final Preference backgroundPref = mock(Preference.class);
- ReflectionHelpers.setField(mFragment, "mBackgroundUsage", backgroundPref);
- final Preference foregroundPref = mock(Preference.class);
- ReflectionHelpers.setField(mFragment, "mForegroundUsage", foregroundPref);
- final Preference totalPref = mock(Preference.class);
- ReflectionHelpers.setField(mFragment, "mTotalUsage", totalPref);
- final SpinnerPreference cycle = mock(SpinnerPreference.class);
- ReflectionHelpers.setField(mFragment, "mCycle", cycle);
-
- mFragment.mUidDataCallbacks.onLoadFinished(null /* loader */, data);
-
- verify(cycle).setSelection(1);
- }
-
- @Test
@Config(shadows = {ShadowDataUsageUtils.class, ShadowSubscriptionManager.class,
ShadowFragment.class})
public void onCreate_noNetworkTemplateAndInvalidDataSubscription_shouldUseWifiTemplate() {
ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true;
ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
- ShadowDataUsageUtils.HAS_SIM = false;
ShadowSubscriptionManager.setDefaultDataSubscriptionId(
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
- mFragment = spy(new AppDataUsage() {
- @Override
- public boolean isSimHardwareVisible(Context context) { return true; }
- });
+ mFragment = spy(new TestFragment());
doReturn(Robolectric.setupActivity(FragmentActivity.class)).when(mFragment).getActivity();
doReturn(RuntimeEnvironment.application).when(mFragment).getContext();
final UidDetailProvider uidDetailProvider = mock(UidDetailProvider.class);
@@ -478,4 +307,20 @@
assertTrue(mFragment.mTemplate.getSubscriberIds().isEmpty());
assertTrue(mFragment.mTemplate.getWifiNetworkKeys().isEmpty());
}
+
+ private static class TestFragment extends AppDataUsage {
+ @Override
+ protected <T extends AbstractPreferenceController> T use(Class<T> clazz) {
+ return mock(clazz);
+ }
+
+ @Override
+ void initCycle(List<Integer> uidList) {
+ }
+
+ @Override
+ public boolean isSimHardwareVisible(Context context) {
+ return true;
+ }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index 4ac7387..2a9cca9 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -27,15 +27,11 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
-import android.app.usage.NetworkStatsManager;
import android.content.Context;
import android.content.res.Resources;
-import android.net.NetworkPolicyManager;
import android.os.UserManager;
import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import androidx.fragment.app.FragmentActivity;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
@@ -45,7 +41,6 @@
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -53,13 +48,9 @@
import org.mockito.Spy;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
-import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import org.robolectric.shadows.ShadowSubscriptionManager;
-import org.robolectric.shadows.ShadowTelephonyManager;
@Config(shadows = {
ShadowUtils.class,
@@ -75,13 +66,6 @@
Context mContext = ApplicationProvider.getApplicationContext();
@Mock
private UserManager mUserManager;
- @Mock
- private NetworkPolicyManager mNetworkPolicyManager;
- @Mock
- private NetworkStatsManager mNetworkStatsManager;
- private TelephonyManager mTelephonyManager;
- private Resources mResources;
- private FragmentActivity mActivity;
private DataUsageSummary mDataUsageSummary;
@@ -95,23 +79,12 @@
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
doReturn(false).when(mUserManager).isGuestUser();
- ShadowApplication shadowContext = ShadowApplication.getInstance();
ShadowUserManager.getShadow().setIsAdminUser(true);
- shadowContext.setSystemService(Context.NETWORK_POLICY_SERVICE, mNetworkPolicyManager);
- mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
- final ShadowTelephonyManager shadowTelephonyManager = Shadows.shadowOf(mTelephonyManager);
- shadowTelephonyManager.setTelephonyManagerForSubscriptionId(
- SubscriptionManager.INVALID_SUBSCRIPTION_ID, mTelephonyManager);
- shadowTelephonyManager.setTelephonyManagerForSubscriptionId(1, mTelephonyManager);
- mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());
-
- mResources = spy(mContext.getResources());
+ Resources mResources = spy(mContext.getResources());
doReturn(mResources).when(mContext).getResources();
doReturn(true).when(mResources).getBoolean(R.bool.config_show_sim_info);
- doReturn(mNetworkStatsManager).when(mActivity).getSystemService(NetworkStatsManager.class);
-
mDataUsageSummary = spy(new DataUsageSummary());
doReturn(mContext).when(mDataUsageSummary).getContext();
doNothing().when(mDataUsageSummary).enableProxySubscriptionManager(any());
@@ -130,12 +103,10 @@
@Test
@Config(shadows = ShadowSubscriptionManager.class)
- @Ignore
public void configuration_withSim_shouldShowMobileAndWifi() {
ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true;
ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
ShadowSubscriptionManager.setDefaultDataSubscriptionId(1);
- ShadowDataUsageUtils.HAS_SIM = true;
final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
doNothing().when(dataUsageSummary).enableProxySubscriptionManager(any());
@@ -156,7 +127,6 @@
public void configuration_withoutSim_shouldShowWifiSectionOnly() {
ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true;
ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
- ShadowDataUsageUtils.HAS_SIM = false;
final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
doNothing().when(dataUsageSummary).enableProxySubscriptionManager(any());
@@ -177,7 +147,6 @@
public void configuration_withoutMobile_shouldShowWifiSectionOnly() {
ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = false;
ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
- ShadowDataUsageUtils.HAS_SIM = false;
final DataUsageSummary dataUsageSummary = spy(new DataUsageSummary());
doNothing().when(dataUsageSummary).enableProxySubscriptionManager(any());
@@ -199,7 +168,6 @@
public void configuration_invalidDataSusbscription_shouldShowWifiSectionOnly() {
ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true;
ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
- ShadowDataUsageUtils.HAS_SIM = false;
ShadowSubscriptionManager.setDefaultDataSubscriptionId(
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
diff --git a/tests/robotests/src/com/android/settings/development/ForcePeakRefreshRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForcePeakRefreshRatePreferenceControllerTest.java
index 2e93d5e..c5cc856 100644
--- a/tests/robotests/src/com/android/settings/development/ForcePeakRefreshRatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ForcePeakRefreshRatePreferenceControllerTest.java
@@ -16,8 +16,9 @@
package com.android.settings.development;
-import static com.android.settings.development.ForcePeakRefreshRatePreferenceController.DEFAULT_REFRESH_RATE;
+import static com.android.internal.display.RefreshRateSettingsUtils.DEFAULT_REFRESH_RATE;
import static com.android.settings.development.ForcePeakRefreshRatePreferenceController.NO_CONFIG;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verify;
@@ -38,8 +39,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import android.util.Log;
-
@RunWith(RobolectricTestRunner.class)
public class ForcePeakRefreshRatePreferenceControllerTest {
@@ -68,7 +67,7 @@
mController.onPreferenceChange(mPreference, true);
assertThat(Settings.System.getFloat(mContext.getContentResolver(),
- Settings.System.MIN_REFRESH_RATE, NO_CONFIG)).isEqualTo(88f);
+ Settings.System.MIN_REFRESH_RATE, NO_CONFIG)).isPositiveInfinity();
}
@Test
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 5db0243..b61f5ab 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -52,6 +52,7 @@
import com.android.settings.SubSettings;
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment.ProfileType;
import com.android.settings.deviceinfo.StorageItemPreference;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.deviceinfo.StorageVolumeProvider;
@@ -99,7 +100,7 @@
// Note: null is passed as the Lifecycle because we are handling it outside of the normal
// Settings fragment lifecycle for test purposes.
mController = new StorageItemPreferenceController(mContext, mFragment, mVolume, mSvp,
- false /* isWorkProfile */);
+ ProfileSelectFragment.ProfileType.PERSONAL);
mPreference = new StorageItemPreference(mContext);
// Inflate the preference and the widget.
@@ -175,7 +176,7 @@
mPreference.setKey(StorageItemPreferenceController.IMAGES_KEY);
final Context mockContext = getMockContext();
mController = new StorageItemPreferenceController(mockContext, mFragment, mVolume,
- mSvp, false /* isWorkProfile */);
+ mSvp, ProfileSelectFragment.ProfileType.PERSONAL);
mController.handlePreferenceTreeClick(mPreference);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
@@ -192,7 +193,7 @@
mPreference.setKey(StorageItemPreferenceController.AUDIO_KEY);
final Context mockContext = getMockContext();
mController = new StorageItemPreferenceController(mockContext, mFragment, mVolume,
- mSvp, false /* isWorkProfile */);
+ mSvp, ProfileSelectFragment.ProfileType.PERSONAL);
mController.handlePreferenceTreeClick(mPreference);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
@@ -242,7 +243,7 @@
@Test
public void launchAppsIntent_forWork_settingsIntent() {
mController = new FakeStorageItemPreferenceController(mContext, mFragment, mVolume, mSvp,
- true /* isWorkProfile */);
+ ProfileType.WORK);
mPreference.setKey(StorageItemPreferenceController.APPS_KEY);
mController.handlePreferenceTreeClick(mPreference);
@@ -272,7 +273,7 @@
mPreference.setKey(StorageItemPreferenceController.DOCUMENTS_AND_OTHER_KEY);
final Context mockContext = getMockContext();
mController = new StorageItemPreferenceController(mockContext, mFragment, mVolume,
- mSvp, false /* isWorkProfile */);
+ mSvp, ProfileSelectFragment.ProfileType.PERSONAL);
mController.handlePreferenceTreeClick(mPreference);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
@@ -307,7 +308,7 @@
mPreference.setKey(StorageItemPreferenceController.VIDEOS_KEY);
final Context mockContext = getMockContext();
mController = new StorageItemPreferenceController(mockContext, mFragment, mVolume,
- mSvp, false /* isWorkProfile */);
+ mSvp, ProfileSelectFragment.ProfileType.PERSONAL);
mController.handlePreferenceTreeClick(mPreference);
final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
@@ -457,8 +458,8 @@
private static final int CURRENT_USER_ID = 10;
FakeStorageItemPreferenceController(Context context, Fragment hostFragment,
- VolumeInfo volume, StorageVolumeProvider svp, boolean isWorkProfile) {
- super(context, hostFragment, volume, svp, isWorkProfile);
+ VolumeInfo volume, StorageVolumeProvider svp, @ProfileType int profileType) {
+ super(context, hostFragment, volume, svp, profileType);
}
@Override
diff --git a/tests/robotests/src/com/android/settings/display/PeakRefreshRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/PeakRefreshRatePreferenceControllerTest.java
index aaeeea4..8b2c445 100644
--- a/tests/robotests/src/com/android/settings/display/PeakRefreshRatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/PeakRefreshRatePreferenceControllerTest.java
@@ -16,21 +16,24 @@
package com.android.settings.display;
+import static com.android.internal.display.RefreshRateSettingsUtils.DEFAULT_REFRESH_RATE;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-import static com.android.settings.display.PeakRefreshRatePreferenceController.DEFAULT_REFRESH_RATE;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.provider.Settings;
-import android.view.Display;
import androidx.preference.SwitchPreference;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@@ -42,10 +45,16 @@
private PeakRefreshRatePreferenceController mController;
private SwitchPreference mPreference;
+ @Mock
+ private PeakRefreshRatePreferenceController.DeviceConfigDisplaySettings
+ mDeviceConfigDisplaySettings;
+
@Before
public void setUp() {
+ MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new PeakRefreshRatePreferenceController(mContext, "key");
+ mController.injectDeviceConfigDisplaySettings(mDeviceConfigDisplaySettings);
mPreference = new SwitchPreference(RuntimeEnvironment.application);
}
@@ -70,13 +79,13 @@
}
@Test
- public void setChecked_enableSmoothDisplay_setCurrentRefreshRate() {
+ public void setChecked_enableSmoothDisplay_setRefreshRateToInfinity() {
mController.mPeakRefreshRate = 88f;
mController.setChecked(true);
assertThat(Settings.System.getFloat(mContext.getContentResolver(),
Settings.System.PEAK_REFRESH_RATE, DEFAULT_REFRESH_RATE))
- .isEqualTo(88.0f);
+ .isPositiveInfinity();
}
@Test
@@ -104,18 +113,20 @@
}
@Test
- public void findPeakRefreshRate_moreThanOneHigherThanDefault() {
- Display.Mode lower = new Display.Mode(0, 0, 0, DEFAULT_REFRESH_RATE - 1);
- Display.Mode def = new Display.Mode(0, 0, 0, DEFAULT_REFRESH_RATE);
- Display.Mode higher = new Display.Mode(0, 0, 0, DEFAULT_REFRESH_RATE + 1);
- Display.Mode higher1 = new Display.Mode(0, 0, 0, DEFAULT_REFRESH_RATE + 2);
+ public void isChecked_default_returnTrue() {
+ mController.mPeakRefreshRate = 88f;
+ when(mDeviceConfigDisplaySettings.getDefaultPeakRefreshRate())
+ .thenReturn(mController.mPeakRefreshRate);
- assertThat(mController.findPeakRefreshRate(
- new Display.Mode[] {lower, def, higher, higher1}))
- .isEqualTo(DEFAULT_REFRESH_RATE + 2);
- assertThat(mController.findPeakRefreshRate(
- new Display.Mode[] {lower, def, higher1, higher}))
- .isEqualTo(DEFAULT_REFRESH_RATE + 2);
+ assertThat(mController.isChecked()).isTrue();
+ }
+
+ @Test
+ public void isChecked_default_returnFalse() {
+ mController.mPeakRefreshRate = 88f;
+ when(mDeviceConfigDisplaySettings.getDefaultPeakRefreshRate()).thenReturn(60f);
+
+ assertThat(mController.isChecked()).isFalse();
}
private void enableSmoothDisplayPreference() {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffDataTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffDataTest.java
index d4bae29..04d601f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffDataTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffDataTest.java
@@ -60,10 +60,11 @@
@Test
public void needsCombineInSystemApp_isHidden_returnTrue() {
final BatteryDiffEntry hiddenDiffEntry =
- createBatteryDiffEntry(mContext, /*consumePower=*/ 0, /*isHidden=*/ true);
+ createBatteryDiffEntry(mContext, /* consumePower= */ 0, /* isHidden= */ true);
- final boolean needsCombineInSystemApp = BatteryDiffData.needsCombineInSystemApp(
- hiddenDiffEntry, List.of(), Set.of(), Set.of());
+ final boolean needsCombineInSystemApp =
+ BatteryDiffData.needsCombineInSystemApp(
+ hiddenDiffEntry, List.of(), Set.of(), Set.of());
assertThat(needsCombineInSystemApp).isTrue();
}
@@ -71,13 +72,17 @@
@Test
public void needsCombineInSystemApp_isSystemApp_returnTrue() {
final BatteryDiffEntry batteryDiffEntry =
- createBatteryDiffEntry(mContext, /*consumePower=*/ 0, /*isHidden=*/ false);
+ createBatteryDiffEntry(mContext, /* consumePower= */ 0, /* isHidden= */ false);
doReturn(mAppEntry).when(mApplicationsState).getEntry(anyString(), anyInt());
mAppEntry.info = mApplicationInfo;
mApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
- final boolean needsCombineInSystemApp = BatteryDiffData.needsCombineInSystemApp(
- batteryDiffEntry, List.of(), Set.of(ConvertUtils.FAKE_PACKAGE_NAME), Set.of());
+ final boolean needsCombineInSystemApp =
+ BatteryDiffData.needsCombineInSystemApp(
+ batteryDiffEntry,
+ List.of(),
+ Set.of(ConvertUtils.FAKE_PACKAGE_NAME),
+ Set.of());
assertThat(needsCombineInSystemApp).isTrue();
}
@@ -85,13 +90,14 @@
@Test
public void needsCombineInSystemApp_notSystemApp_returnFalse() {
final BatteryDiffEntry batteryDiffEntry =
- createBatteryDiffEntry(mContext, /*consumePower=*/ 0, /*isHidden=*/ false);
+ createBatteryDiffEntry(mContext, /* consumePower= */ 0, /* isHidden= */ false);
doReturn(mAppEntry).when(mApplicationsState).getEntry(anyString(), anyInt());
mAppEntry.info = mApplicationInfo;
mApplicationInfo.flags = 0;
- final boolean needsCombineInSystemApp = BatteryDiffData.needsCombineInSystemApp(
- batteryDiffEntry, List.of(), Set.of(), Set.of());
+ final boolean needsCombineInSystemApp =
+ BatteryDiffData.needsCombineInSystemApp(
+ batteryDiffEntry, List.of(), Set.of(), Set.of());
assertThat(needsCombineInSystemApp).isFalse();
}
@@ -100,11 +106,11 @@
public void processPercentsAndSort_sumLessThan100_adjustTo100() {
List<BatteryDiffEntry> batteryDiffEntries = new ArrayList<>();
batteryDiffEntries.add(
- createBatteryDiffEntry(mContext, /*consumePower=*/ 33.33, /*isHidden=*/ false));
+ createBatteryDiffEntry(mContext, /* consumePower= */ 33.33, /* isHidden= */ false));
batteryDiffEntries.add(
- createBatteryDiffEntry(mContext, /*consumePower=*/ 33.34, /*isHidden=*/ false));
+ createBatteryDiffEntry(mContext, /* consumePower= */ 33.34, /* isHidden= */ false));
batteryDiffEntries.add(
- createBatteryDiffEntry(mContext, /*consumePower=*/ 33.33, /*isHidden=*/ false));
+ createBatteryDiffEntry(mContext, /* consumePower= */ 33.33, /* isHidden= */ false));
BatteryDiffData.processAndSortEntries(batteryDiffEntries);
@@ -120,11 +126,11 @@
public void processPercentsAndSort_sumGreaterThan100_adjustTo100() {
List<BatteryDiffEntry> batteryDiffEntries = new ArrayList<>();
batteryDiffEntries.add(
- createBatteryDiffEntry(mContext, /*consumePower=*/ 48.5, /*isHidden=*/ false));
+ createBatteryDiffEntry(mContext, /* consumePower= */ 48.5, /* isHidden= */ false));
batteryDiffEntries.add(
- createBatteryDiffEntry(mContext, /*consumePower=*/ 3, /*isHidden=*/ false));
+ createBatteryDiffEntry(mContext, /* consumePower= */ 3, /* isHidden= */ false));
batteryDiffEntries.add(
- createBatteryDiffEntry(mContext, /*consumePower=*/ 48.5, /*isHidden=*/ false));
+ createBatteryDiffEntry(mContext, /* consumePower= */ 48.5, /* isHidden= */ false));
BatteryDiffData.processAndSortEntries(batteryDiffEntries);
@@ -136,47 +142,101 @@
assertThat(batteryDiffEntries.get(2).getAdjustPercentageOffset()).isEqualTo(0);
}
+ @Test
+ public void processPercentsAndSort_uninstalledApps_sortAsExpected() {
+ List<BatteryDiffEntry> batteryDiffEntries = new ArrayList<>();
+ batteryDiffEntries.add(
+ createBatteryDiffEntry(mContext, /* consumePower= */ 28.5, /* key= */ "APP_1"));
+ batteryDiffEntries.add(
+ createBatteryDiffEntry(
+ mContext,
+ /* consumePower= */ 20,
+ BatteryDiffEntry.UNINSTALLED_APPS_KEY));
+ batteryDiffEntries.add(
+ createBatteryDiffEntry(mContext, /* consumePower= */ 3, /* key= */ "APP_2"));
+ batteryDiffEntries.add(
+ createBatteryDiffEntry(
+ mContext,
+ /* consumePower= */ 28.5,
+ BatteryDiffEntry.SYSTEM_APPS_KEY));
+ batteryDiffEntries.add(
+ createBatteryDiffEntry(mContext, /* consumePower= */ 20, /* key= */ "APP_3"));
+
+ BatteryDiffData.processAndSortEntries(batteryDiffEntries);
+
+ assertThat(batteryDiffEntries.get(0).getKey()).isEqualTo("APP_1");
+ assertThat(batteryDiffEntries.get(1).getKey()).isEqualTo("APP_3");
+ assertThat(batteryDiffEntries.get(2).getKey()).isEqualTo("APP_2");
+ assertThat(batteryDiffEntries.get(3).getKey())
+ .isEqualTo(BatteryDiffEntry.UNINSTALLED_APPS_KEY);
+ assertThat(batteryDiffEntries.get(4).getKey()).isEqualTo(BatteryDiffEntry.SYSTEM_APPS_KEY);
+ }
+
private static BatteryDiffEntry createBatteryDiffEntry(
Context context, double consumePower, boolean isHidden) {
+ return createBatteryDiffEntry(context, consumePower, isHidden, /* key= */ null);
+ }
+
+ private static BatteryDiffEntry createBatteryDiffEntry(
+ Context context, double consumePower, String key) {
+ return createBatteryDiffEntry(context, consumePower, /* isHidden= */ false, key);
+ }
+
+ private static BatteryDiffEntry createBatteryDiffEntry(
+ Context context, double consumePower, boolean isHidden, String key) {
final int currentUserId = context.getUserId();
- final BatteryHistEntry batteryHistEntry = createBatteryHistEntry(
- ConvertUtils.FAKE_PACKAGE_NAME, "fake_label", consumePower,
- /*foregroundUsageConsumePower=*/ 0, /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0, /*cachedUsageConsumePower=*/ 0,
- /*uid=*/ 0L, currentUserId, ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
- /*foregroundUsageTimeInMs=*/ 0L, /*backgroundUsageTimeInMs=*/ 0L, isHidden);
+ final BatteryHistEntry batteryHistEntry =
+ createBatteryHistEntry(
+ ConvertUtils.FAKE_PACKAGE_NAME,
+ "fake_label",
+ consumePower,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0,
+ /* uid= */ 0L,
+ currentUserId,
+ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
+ /* foregroundUsageTimeInMs= */ 0L,
+ /* backgroundUsageTimeInMs= */ 0L,
+ isHidden);
return new BatteryDiffEntry(
context,
batteryHistEntry.mUid,
batteryHistEntry.mUserId,
- batteryHistEntry.getKey(),
+ key == null ? batteryHistEntry.getKey() : key,
batteryHistEntry.mIsHidden,
batteryHistEntry.mDrainType,
batteryHistEntry.mPackageName,
batteryHistEntry.mAppLabel,
batteryHistEntry.mConsumerType,
- /*foregroundUsageTimeInMs=*/ 0,
- /*backgroundUsageTimeInMs=*/ 0,
- /*screenOnTimeInMs=*/ 0,
- /*consumePower=*/ consumePower,
- /*foregroundUsageConsumePower=*/ 0,
- /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0,
- /*cachedUsageConsumePower=*/ 0);
+ /* foregroundUsageTimeInMs= */ 0,
+ /* backgroundUsageTimeInMs= */ 0,
+ /* screenOnTimeInMs= */ 0,
+ consumePower,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0);
}
private static BatteryHistEntry createBatteryHistEntry(
- final String packageName, final String appLabel, final double consumePower,
+ final String packageName,
+ final String appLabel,
+ final double consumePower,
final double foregroundUsageConsumePower,
final double foregroundServiceUsageConsumePower,
- final double backgroundUsageConsumePower, final double cachedUsageConsumePower,
- final long uid, final long userId, final int consumerType,
- final long foregroundUsageTimeInMs, final long backgroundUsageTimeInMs,
+ final double backgroundUsageConsumePower,
+ final double cachedUsageConsumePower,
+ final long uid,
+ final long userId,
+ final int consumerType,
+ final long foregroundUsageTimeInMs,
+ final long backgroundUsageTimeInMs,
final boolean isHidden) {
// Only insert required fields.
final BatteryInformation batteryInformation =
- BatteryInformation
- .newBuilder()
+ BatteryInformation.newBuilder()
.setAppLabel(appLabel)
.setConsumePower(consumePower)
.setForegroundUsageConsumePower(foregroundUsageConsumePower)
@@ -192,7 +252,8 @@
values.put(BatteryHistEntry.KEY_UID, uid);
values.put(BatteryHistEntry.KEY_USER_ID, userId);
values.put(BatteryHistEntry.KEY_CONSUMER_TYPE, consumerType);
- values.put(BatteryHistEntry.KEY_BATTERY_INFORMATION,
+ values.put(
+ BatteryHistEntry.KEY_BATTERY_INFORMATION,
ConvertUtils.convertBatteryInformationToString(batteryInformation));
return new BatteryHistEntry(values);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
index 9bb4b73..2cafadb 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
@@ -58,35 +58,37 @@
@Config(shadows = {BatteryDiffEntryTest.ShadowUserHandle.class})
public final class BatteryDiffEntryTest {
+ private static final int UID = 100;
+ private static final int UNINSTALLED_UID = 101;
+ private static final String PACKAGE_NAME = "com.android.testing";
+ private static final String UNINSTALLED_PACKAGE_NAME = "com.android.testing.uninstalled";
+
private Context mContext;
- @Mock
- private ApplicationInfo mMockAppInfo;
- @Mock
- private PackageManager mMockPackageManager;
- @Mock
- private UserManager mMockUserManager;
- @Mock
- private Drawable mMockDrawable;
- @Mock
- private Drawable mMockDrawable2;
- @Mock
- private Drawable mMockBadgedDrawable;
- @Mock
- private BatteryHistEntry mBatteryHistEntry;
- @Mock
- private PackageInfo mMockPackageInfo;
- @Mock
- private ConstantState mMockConstantState;
+ @Mock private ApplicationInfo mMockAppInfo;
+ @Mock private PackageManager mMockPackageManager;
+ @Mock private UserManager mMockUserManager;
+ @Mock private Drawable mMockDrawable;
+ @Mock private Drawable mMockDrawable2;
+ @Mock private Drawable mMockBadgedDrawable;
+ @Mock private BatteryHistEntry mBatteryHistEntry;
+ @Mock private PackageInfo mMockPackageInfo;
+ @Mock private ConstantState mMockConstantState;
@Before
- public void setUp() {
+ public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
ShadowUserHandle.reset();
mContext = spy(RuntimeEnvironment.application);
doReturn(mContext).when(mContext).getApplicationContext();
doReturn(mMockUserManager).when(mContext).getSystemService(UserManager.class);
doReturn(mMockPackageManager).when(mContext).getPackageManager();
+ doReturn(UID)
+ .when(mMockPackageManager)
+ .getPackageUid(PACKAGE_NAME, PackageManager.GET_META_DATA);
+ doReturn(BatteryUtils.UID_NULL)
+ .when(mMockPackageManager)
+ .getPackageUid(UNINSTALLED_PACKAGE_NAME, PackageManager.GET_META_DATA);
BatteryDiffEntry.clearCache();
}
@@ -95,22 +97,22 @@
final BatteryDiffEntry entry =
new BatteryDiffEntry(
mContext,
- /*uid=*/ 0,
- /*userId=*/ 0,
- /*key=*/ "key",
- /*isHidden=*/ false,
- /*componentId=*/ -1,
- /*legacyPackageName=*/ null,
- /*legacyLabel=*/ null,
+ /* uid= */ 0,
+ /* userId= */ 0,
+ /* key= */ "key",
+ /* isHidden= */ false,
+ /* componentId= */ -1,
+ /* legacyPackageName= */ null,
+ /* legacyLabel= */ null,
/*consumerType*/ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
- /*foregroundUsageTimeInMs=*/ 10001L,
- /*backgroundUsageTimeInMs=*/ 20002L,
- /*screenOnTimeInMs=*/ 30003L,
- /*consumePower=*/ 22.0,
- /*foregroundUsageConsumePower=*/ 10.0,
- /*foregroundServiceUsageConsumePower=*/ 10.0,
- /*backgroundUsageConsumePower=*/ 1.0,
- /*cachedUsageConsumePower=*/ 1.0);
+ /* foregroundUsageTimeInMs= */ 10001L,
+ /* backgroundUsageTimeInMs= */ 20002L,
+ /* screenOnTimeInMs= */ 30003L,
+ /* consumePower= */ 22.0,
+ /* foregroundUsageConsumePower= */ 10.0,
+ /* foregroundServiceUsageConsumePower= */ 10.0,
+ /* backgroundUsageConsumePower= */ 1.0,
+ /* cachedUsageConsumePower= */ 1.0);
entry.setTotalConsumePower(100.0);
assertThat(entry.getPercentage()).isEqualTo(22.0);
@@ -121,22 +123,22 @@
final BatteryDiffEntry entry =
new BatteryDiffEntry(
mContext,
- /*uid=*/ 0,
- /*userId=*/ 0,
- /*key=*/ "key",
- /*isHidden=*/ false,
- /*componentId=*/ -1,
- /*legacyPackageName=*/ null,
- /*legacyLabel=*/ null,
+ /* uid= */ 0,
+ /* userId= */ 0,
+ /* key= */ "key",
+ /* isHidden= */ false,
+ /* componentId= */ -1,
+ /* legacyPackageName= */ null,
+ /* legacyLabel= */ null,
/*consumerType*/ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
- /*foregroundUsageTimeInMs=*/ 10001L,
- /*backgroundUsageTimeInMs=*/ 20002L,
- /*screenOnTimeInMs=*/ 30003L,
- /*consumePower=*/ 22.0,
- /*foregroundUsageConsumePower=*/ 10.0,
- /*foregroundServiceUsageConsumePower=*/ 10.0,
- /*backgroundUsageConsumePower=*/ 1.0,
- /*cachedUsageConsumePower=*/ 1.0);
+ /* foregroundUsageTimeInMs= */ 10001L,
+ /* backgroundUsageTimeInMs= */ 20002L,
+ /* screenOnTimeInMs= */ 30003L,
+ /* consumePower= */ 22.0,
+ /* foregroundUsageConsumePower= */ 10.0,
+ /* foregroundServiceUsageConsumePower= */ 10.0,
+ /* backgroundUsageConsumePower= */ 1.0,
+ /* cachedUsageConsumePower= */ 1.0);
entry.setTotalConsumePower(0);
assertThat(entry.getPercentage()).isEqualTo(0);
@@ -149,22 +151,22 @@
BatteryDiffEntry systemAppsBatteryDiffEntry =
new BatteryDiffEntry(
mContext,
- /*uid=*/ 0,
- /*userId=*/ 0,
- /*key=*/ BatteryDiffEntry.SYSTEM_APPS_KEY,
- /*isHidden=*/ false,
- /*componentId=*/ -1,
- /*legacyPackageName=*/ null,
- /*legacyLabel=*/ BatteryDiffEntry.SYSTEM_APPS_KEY,
+ /* uid= */ 0,
+ /* userId= */ 0,
+ /* key= */ BatteryDiffEntry.SYSTEM_APPS_KEY,
+ /* isHidden= */ false,
+ /* componentId= */ -1,
+ /* legacyPackageName= */ null,
+ /* legacyLabel= */ BatteryDiffEntry.SYSTEM_APPS_KEY,
/*consumerType*/ ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
- /*foregroundUsageTimeInMs=*/ 0,
- /*backgroundUsageTimeInMs=*/ 0,
- /*screenOnTimeInMs=*/ 0,
- /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0,
- /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0,
- /*cachedUsageConsumePower=*/ 0);
+ /* foregroundUsageTimeInMs= */ 0,
+ /* backgroundUsageTimeInMs= */ 0,
+ /* screenOnTimeInMs= */ 0,
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0);
systemAppsBatteryDiffEntry.mConsumePower = 16;
systemAppsBatteryDiffEntry.setTotalConsumePower(100);
entryList.add(systemAppsBatteryDiffEntry);
@@ -184,14 +186,14 @@
public void testLoadLabelAndIcon_forSystemBattery_returnExpectedResult() {
final String expectedName = "Ambient display";
// Generates fake testing data.
- final ContentValues values = getContentValuesWithType(
- ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
final BatteryInformation batteryInformation =
- BatteryInformation
- .newBuilder()
+ BatteryInformation.newBuilder()
.setDrainType(BatteryConsumer.POWER_COMPONENT_AMBIENT_DISPLAY)
.build();
- values.put(BatteryHistEntry.KEY_BATTERY_INFORMATION,
+ values.put(
+ BatteryHistEntry.KEY_BATTERY_INFORMATION,
ConvertUtils.convertBatteryInformationToString(batteryInformation));
final BatteryHistEntry batteryHistEntry = new BatteryHistEntry(values);
@@ -215,8 +217,8 @@
final String expectedName = "Removed user";
doReturn(null).when(mMockUserManager).getUserInfo(1001);
// Generates fake testing data.
- final ContentValues values = getContentValuesWithType(
- ConvertUtils.CONSUMER_TYPE_USER_BATTERY);
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_USER_BATTERY);
values.put(BatteryHistEntry.KEY_USER_ID, Integer.valueOf(1001));
final BatteryHistEntry batteryHistEntry = new BatteryHistEntry(values);
@@ -240,14 +242,12 @@
public void testGetAppLabel_loadDataFromApplicationInfo() throws Exception {
final String expectedAppLabel = "fake app label";
final String fakePackageName = "com.fake.google.com";
- final ContentValues values = getContentValuesWithType(
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
values.put(BatteryHistEntry.KEY_UID, /*invalid uid*/ 10001);
values.put(BatteryHistEntry.KEY_PACKAGE_NAME, fakePackageName);
- doReturn(mMockAppInfo).when(mMockPackageManager)
- .getApplicationInfo(fakePackageName, 0);
- doReturn(expectedAppLabel).when(mMockPackageManager)
- .getApplicationLabel(mMockAppInfo);
+ doReturn(mMockAppInfo).when(mMockPackageManager).getApplicationInfo(fakePackageName, 0);
+ doReturn(expectedAppLabel).when(mMockPackageManager).getApplicationLabel(mMockAppInfo);
final BatteryHistEntry batteryHistEntry = new BatteryHistEntry(values);
final BatteryDiffEntry entry = createBatteryDiffEntry(10, batteryHistEntry);
@@ -267,8 +267,8 @@
@Test
public void testGetAppLabel_loadDataFromPreDefinedNameAndUid() {
final String expectedAppLabel = "Android OS";
- final ContentValues values = getContentValuesWithType(
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
final BatteryHistEntry batteryHistEntry = new BatteryHistEntry(values);
final BatteryDiffEntry entry = createBatteryDiffEntry(10, batteryHistEntry);
@@ -284,14 +284,12 @@
@Test
public void testGetAppLabel_nullAppLabel_returnAppLabelInBatteryHistEntry() {
final String expectedAppLabel = "fake app label";
- final ContentValues values = getContentValuesWithType(
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
final BatteryInformation batteryInformation =
- BatteryInformation
- .newBuilder()
- .setAppLabel(expectedAppLabel)
- .build();
- values.put(BatteryHistEntry.KEY_BATTERY_INFORMATION,
+ BatteryInformation.newBuilder().setAppLabel(expectedAppLabel).build();
+ values.put(
+ BatteryHistEntry.KEY_BATTERY_INFORMATION,
ConvertUtils.convertBatteryInformationToString(batteryInformation));
final BatteryHistEntry batteryHistEntry = new BatteryHistEntry(values);
@@ -304,8 +302,8 @@
@Test
public void testGetAppIcon_nonUidConsumer_returnAppIconInBatteryDiffEntry() {
- final ContentValues values = getContentValuesWithType(
- ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
final BatteryHistEntry batteryHistEntry = new BatteryHistEntry(values);
mockConstantState(mMockDrawable);
@@ -324,7 +322,8 @@
final BatteryDiffEntry entry = createBatteryDiffEntry(mMockDrawable);
mockConstantState(mMockDrawable);
mockConstantState(mMockBadgedDrawable);
- doReturn(mMockBadgedDrawable).when(mMockUserManager)
+ doReturn(mMockBadgedDrawable)
+ .when(mMockUserManager)
.getBadgedIconForUser(eq(mMockDrawable), any());
entry.mAppIcon = null;
@@ -350,9 +349,8 @@
public void testClearCache_clearDataForResourcesAndFlags() {
BatteryDiffEntry.sResourceCache.put(
"fake application key",
- new BatteryEntry.NameAndIcon("app label", null, /*iconId=*/ 0));
- BatteryDiffEntry.sValidForRestriction.put(
- "fake application key", Boolean.valueOf(false));
+ new BatteryEntry.NameAndIcon("app label", null, /* iconId= */ 0));
+ BatteryDiffEntry.sValidForRestriction.put("fake application key", Boolean.valueOf(false));
BatteryDiffEntry.clearCache();
@@ -386,7 +384,8 @@
final BatteryDiffEntry entry =
createBatteryDiffEntry(
ConvertUtils.CONSUMER_TYPE_USER_BATTERY,
- /*uid=*/ 0, /*isHidden=*/ false);
+ /* uid= */ 0,
+ /* isHidden= */ false);
assertThat(entry.isSystemEntry()).isTrue();
}
@@ -395,7 +394,8 @@
final BatteryDiffEntry entry =
createBatteryDiffEntry(
ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY,
- /*uid=*/ 0, /*isHidden=*/ false);
+ /* uid= */ 0,
+ /* isHidden= */ false);
assertThat(entry.isSystemEntry()).isTrue();
}
@@ -404,7 +404,8 @@
final BatteryDiffEntry entry =
createBatteryDiffEntry(
ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
- /*uid=*/ 123, /*isHidden=*/ false);
+ /* uid= */ 123,
+ /* isHidden= */ false);
assertThat(entry.isSystemEntry()).isFalse();
}
@@ -413,39 +414,80 @@
final BatteryDiffEntry entry =
createBatteryDiffEntry(
ConvertUtils.CONSUMER_TYPE_UID_BATTERY,
- /*uid=*/ 1230, /*isHidden=*/ false);
+ /* uid= */ 1230,
+ /* isHidden= */ false);
assertThat(entry.isSystemEntry()).isFalse();
}
@Test
+ public void testIsUninstalledEntry_systemApp_returnFalse() {
+ final BatteryDiffEntry entry =
+ createBatteryDiffEntry(
+ ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY,
+ /* uid= */ 0,
+ /* isHidden= */ false);
+ assertThat(entry.isSystemEntry()).isTrue();
+ assertThat(entry.isUninstalledEntry()).isFalse();
+ }
+
+ @Test
+ public void testIsUninstalledEntry_installedApp_returnFalse() throws Exception {
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
+ values.put(BatteryHistEntry.KEY_UID, UID);
+ values.put(BatteryHistEntry.KEY_PACKAGE_NAME, PACKAGE_NAME);
+ final BatteryDiffEntry entry = createBatteryDiffEntry(10, new BatteryHistEntry(values));
+
+ assertThat(entry.isSystemEntry()).isFalse();
+ assertThat(entry.isUninstalledEntry()).isFalse();
+ }
+
+ @Test
+ public void testIsUninstalledEntry_uninstalledApp_returnTrue() throws Exception {
+ doReturn(BatteryUtils.UID_NULL)
+ .when(mMockPackageManager)
+ .getPackageUid(PACKAGE_NAME, PackageManager.GET_META_DATA);
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
+ values.put(BatteryHistEntry.KEY_UID, UNINSTALLED_UID);
+ values.put(BatteryHistEntry.KEY_PACKAGE_NAME, UNINSTALLED_PACKAGE_NAME);
+ final BatteryDiffEntry entry = createBatteryDiffEntry(10, new BatteryHistEntry(values));
+
+ assertThat(entry.isSystemEntry()).isFalse();
+ assertThat(entry.isUninstalledEntry()).isTrue();
+ }
+
+ @Test
public void testUpdateRestrictionFlagState_updateFlagAsExpected() throws Exception {
final String expectedAppLabel = "fake app label";
final String fakePackageName = "com.fake.google.com";
- final ContentValues values = getContentValuesWithType(
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
values.put(BatteryHistEntry.KEY_UID, /*invalid uid*/ 10001);
values.put(BatteryHistEntry.KEY_PACKAGE_NAME, fakePackageName);
- final BatteryDiffEntry entry =
- createBatteryDiffEntry(10, new BatteryHistEntry(values));
+ final BatteryDiffEntry entry = createBatteryDiffEntry(10, new BatteryHistEntry(values));
entry.updateRestrictionFlagState();
// Sets false if the app entry cannot be found.
assertThat(entry.mValidForRestriction).isFalse();
- doReturn(BatteryUtils.UID_NULL).when(mMockPackageManager).getPackageUid(
- entry.getPackageName(), PackageManager.GET_META_DATA);
+ doReturn(BatteryUtils.UID_NULL)
+ .when(mMockPackageManager)
+ .getPackageUid(entry.getPackageName(), PackageManager.GET_META_DATA);
entry.updateRestrictionFlagState();
// Sets false if the app is invalid package name.
assertThat(entry.mValidForRestriction).isFalse();
- doReturn(1000).when(mMockPackageManager).getPackageUid(
- entry.getPackageName(), PackageManager.GET_META_DATA);
+ doReturn(1000)
+ .when(mMockPackageManager)
+ .getPackageUid(entry.getPackageName(), PackageManager.GET_META_DATA);
entry.updateRestrictionFlagState();
// Sets false if the app PackageInfo cannot be found.
assertThat(entry.mValidForRestriction).isFalse();
- doReturn(mMockPackageInfo).when(mMockPackageManager).getPackageInfo(
- eq(entry.getPackageName()), anyInt());
+ doReturn(mMockPackageInfo)
+ .when(mMockPackageManager)
+ .getPackageInfo(eq(entry.getPackageName()), anyInt());
entry.updateRestrictionFlagState();
// Sets true if package is valid and PackageInfo can be found.
assertThat(entry.mValidForRestriction).isTrue();
@@ -454,11 +496,10 @@
@Test
public void testGetPackageName_returnExpectedResult() {
final String expectedPackageName = "com.fake.google.com";
- final ContentValues values = getContentValuesWithType(
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
values.put(BatteryHistEntry.KEY_PACKAGE_NAME, expectedPackageName);
- final BatteryDiffEntry entry =
- createBatteryDiffEntry(10, new BatteryHistEntry(values));
+ final BatteryDiffEntry entry = createBatteryDiffEntry(10, new BatteryHistEntry(values));
assertThat(entry.getPackageName()).isEqualTo(expectedPackageName);
}
@@ -466,59 +507,56 @@
@Test
public void testGetPackageName_withProcessName_returnExpectedResult() {
final String expectedPackageName = "com.fake.google.com";
- final ContentValues values = getContentValuesWithType(
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
- values.put(
- BatteryHistEntry.KEY_PACKAGE_NAME,
- expectedPackageName + ":privileged_process0");
- final BatteryDiffEntry entry =
- createBatteryDiffEntry(10, new BatteryHistEntry(values));
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
+ values.put(BatteryHistEntry.KEY_PACKAGE_NAME, expectedPackageName + ":privileged_process0");
+ final BatteryDiffEntry entry = createBatteryDiffEntry(10, new BatteryHistEntry(values));
assertThat(entry.getPackageName()).isEqualTo(expectedPackageName);
}
- private BatteryDiffEntry createBatteryDiffEntry(
- int consumerType, long uid, boolean isHidden) {
+ private BatteryDiffEntry createBatteryDiffEntry(int consumerType, long uid, boolean isHidden) {
return new BatteryDiffEntry(
mContext,
- /*uid=*/ uid,
- /*userId=*/ 0,
- /*key=*/ "key",
- /*isHidden=*/ isHidden,
- /*componentId=*/ -1,
- /*legacyPackageName=*/ null,
- /*legacyLabel=*/ null,
+ /* uid= */ uid,
+ /* userId= */ 0,
+ /* key= */ "key",
+ /* isHidden= */ isHidden,
+ /* componentId= */ -1,
+ /* legacyPackageName= */ null,
+ /* legacyLabel= */ null,
/*consumerType*/ consumerType,
- /*foregroundUsageTimeInMs=*/ 0,
- /*backgroundUsageTimeInMs=*/ 0,
- /*screenOnTimeInMs=*/ 0,
- /*consumePower=*/ 0,
- /*foregroundUsageConsumePower=*/ 0,
- /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0,
- /*cachedUsageConsumePower=*/ 0);
+ /* foregroundUsageTimeInMs= */ 0,
+ /* backgroundUsageTimeInMs= */ 0,
+ /* screenOnTimeInMs= */ 0,
+ /* consumePower= */ 0,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0);
}
private BatteryDiffEntry createBatteryDiffEntry(
double consumePower, BatteryHistEntry batteryHistEntry) {
- final BatteryDiffEntry entry = new BatteryDiffEntry(
- mContext,
- batteryHistEntry.mUid,
- batteryHistEntry.mUserId,
- batteryHistEntry.getKey(),
- batteryHistEntry.mIsHidden,
- batteryHistEntry.mDrainType,
- batteryHistEntry.mPackageName,
- batteryHistEntry.mAppLabel,
- batteryHistEntry.mConsumerType,
- /*foregroundUsageTimeInMs=*/ 0,
- /*backgroundUsageTimeInMs=*/ 0,
- /*screenOnTimeInMs=*/ 0,
- consumePower,
- /*foregroundUsageConsumePower=*/ 0,
- /*foregroundServiceUsageConsumePower=*/ 0,
- /*backgroundUsageConsumePower=*/ 0,
- /*cachedUsageConsumePower=*/ 0);
+ final BatteryDiffEntry entry =
+ new BatteryDiffEntry(
+ mContext,
+ batteryHistEntry.mUid,
+ batteryHistEntry.mUserId,
+ batteryHistEntry.getKey(),
+ batteryHistEntry.mIsHidden,
+ batteryHistEntry.mDrainType,
+ batteryHistEntry.mPackageName,
+ batteryHistEntry.mAppLabel,
+ batteryHistEntry.mConsumerType,
+ /* foregroundUsageTimeInMs= */ 0,
+ /* backgroundUsageTimeInMs= */ 0,
+ /* screenOnTimeInMs= */ 0,
+ consumePower,
+ /* foregroundUsageConsumePower= */ 0,
+ /* foregroundServiceUsageConsumePower= */ 0,
+ /* backgroundUsageConsumePower= */ 0,
+ /* cachedUsageConsumePower= */ 0);
entry.setTotalConsumePower(100.0);
return entry;
}
@@ -530,15 +568,14 @@
}
private BatteryDiffEntry createBatteryDiffEntry(Drawable drawable) throws Exception {
- final ContentValues values = getContentValuesWithType(
- ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
+ final ContentValues values =
+ getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
values.put(BatteryHistEntry.KEY_UID, 1001);
values.put(BatteryHistEntry.KEY_PACKAGE_NAME, "com.a.b.c");
final BatteryHistEntry batteryHistEntry = new BatteryHistEntry(values);
doReturn(drawable).when(mMockPackageManager).getDefaultActivityIcon();
doReturn(null).when(mMockPackageManager).getApplicationInfo("com.a.b.c", 0);
- doReturn(new String[]{"com.a.b.c"}).when(mMockPackageManager)
- .getPackagesForUid(1001);
+ doReturn(new String[] {"com.a.b.c"}).when(mMockPackageManager).getPackagesForUid(1001);
return createBatteryDiffEntry(10, batteryHistEntry);
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
index f00c049..c4cb89e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
@@ -30,6 +30,7 @@
import android.os.SystemClock;
import android.text.format.DateUtils;
+import com.android.settings.testutils.BatteryTestUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
@@ -68,6 +69,16 @@
}
@Test
+ public void onReceive_workProfile_doNothing() {
+ BatteryTestUtils.setWorkProfile(mContext);
+
+ mBatteryUsageBroadcastReceiver.onReceive(mContext,
+ new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
+
+ assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
+ }
+
+ @Test
public void onReceive_aospNotFullCharged_notFetchUsageData() {
when(mFakeFeatureFactory.powerUsageFeatureProvider.getFullChargeIntentAction())
.thenReturn(Intent.ACTION_BATTERY_LEVEL_CHANGED);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
index cd594d3..c648cde 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
@@ -32,6 +32,7 @@
import android.content.Context;
import android.content.pm.PackageManager;
import android.database.MatrixCursor;
+import android.os.BatteryConsumer;
import android.os.BatteryManager;
import android.os.BatteryUsageStats;
import android.os.LocaleList;
@@ -80,8 +81,7 @@
}
@Test
- public void convertBatteryEntryToContentValues_returnsExpectedContentValues() {
- final int expectedType = 3;
+ public void convertBatteryEntryToContentValues_appEntry_returnsExpectedContentValues() {
when(mMockBatteryEntry.getUid()).thenReturn(1001);
when(mMockBatteryEntry.getLabel()).thenReturn("Settings");
when(mMockBatteryEntry.getDefaultPackageName())
@@ -96,9 +96,9 @@
mMockBatteryEntry.mPercent = 0.3;
when(mMockBatteryEntry.getTimeInForegroundMs()).thenReturn(1234L);
when(mMockBatteryEntry.getTimeInBackgroundMs()).thenReturn(5689L);
- when(mMockBatteryEntry.getPowerComponentId()).thenReturn(expectedType);
+ when(mMockBatteryEntry.getPowerComponentId()).thenReturn(-1);
when(mMockBatteryEntry.getConsumerType())
- .thenReturn(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
+ .thenReturn(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
final ContentValues values =
ConvertUtils.convertBatteryEntryToContentValues(
@@ -122,7 +122,7 @@
.isEqualTo("com.google.android.settings.battery");
assertThat(values.getAsLong(BatteryHistEntry.KEY_TIMESTAMP)).isEqualTo(10001L);
assertThat(values.getAsInteger(BatteryHistEntry.KEY_CONSUMER_TYPE))
- .isEqualTo(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
+ .isEqualTo(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
assertThat(values.getAsBoolean(BatteryHistEntry.KEY_IS_FULL_CHARGE_CYCLE_START)).isTrue();
assertThat(batteryInformation.getAppLabel()).isEqualTo("Settings");
assertThat(batteryInformation.getIsHidden()).isTrue();
@@ -137,7 +137,71 @@
assertThat(batteryInformation.getPercentOfTotal()).isEqualTo(0.3);
assertThat(batteryInformation.getForegroundUsageTimeInMs()).isEqualTo(1234L);
assertThat(batteryInformation.getBackgroundUsageTimeInMs()).isEqualTo(5689L);
- assertThat(batteryInformation.getDrainType()).isEqualTo(expectedType);
+ assertThat(batteryInformation.getDrainType()).isEqualTo(-1);
+ assertThat(deviceBatteryState.getBatteryLevel()).isEqualTo(12);
+ assertThat(deviceBatteryState.getBatteryStatus())
+ .isEqualTo(BatteryManager.BATTERY_STATUS_FULL);
+ assertThat(deviceBatteryState.getBatteryHealth())
+ .isEqualTo(BatteryManager.BATTERY_HEALTH_COLD);
+ }
+
+ @Test
+ public void convertBatteryEntryToContentValues_systemEntry_returnsExpectedContentValues() {
+ when(mMockBatteryEntry.getUid()).thenReturn(-1);
+ when(mMockBatteryEntry.getLabel()).thenReturn("CPU");
+ when(mMockBatteryEntry.getDefaultPackageName()).thenReturn(null);
+ when(mMockBatteryEntry.getPowerComponentId()).thenReturn(
+ BatteryConsumer.POWER_COMPONENT_CPU);
+ when(mBatteryUsageStats.getConsumedPower()).thenReturn(5.1);
+ when(mMockBatteryEntry.getConsumedPower()).thenReturn(1.1);
+ when(mMockBatteryEntry.getConsumedPowerInForeground()).thenReturn(1.2);
+ when(mMockBatteryEntry.getConsumedPowerInForegroundService()).thenReturn(1.3);
+ when(mMockBatteryEntry.getConsumedPowerInBackground()).thenReturn(1.4);
+ when(mMockBatteryEntry.getConsumedPowerInCached()).thenReturn(1.5);
+ mMockBatteryEntry.mPercent = 0.3;
+ when(mMockBatteryEntry.getTimeInForegroundMs()).thenReturn(1234L);
+ when(mMockBatteryEntry.getTimeInBackgroundMs()).thenReturn(5689L);
+ when(mMockBatteryEntry.getConsumerType())
+ .thenReturn(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
+
+ final ContentValues values =
+ ConvertUtils.convertBatteryEntryToContentValues(
+ mMockBatteryEntry,
+ mBatteryUsageStats,
+ /*batteryLevel=*/ 12,
+ /*batteryStatus=*/ BatteryManager.BATTERY_STATUS_FULL,
+ /*batteryHealth=*/ BatteryManager.BATTERY_HEALTH_COLD,
+ /*bootTimestamp=*/ 101L,
+ /*timestamp=*/ 10001L,
+ /*isFullChargeStart=*/ true);
+ final BatteryInformation batteryInformation =
+ ConvertUtils.getBatteryInformation(
+ values, BatteryHistEntry.KEY_BATTERY_INFORMATION);
+ final DeviceBatteryState deviceBatteryState = batteryInformation.getDeviceBatteryState();
+
+ assertThat(values.getAsLong(BatteryHistEntry.KEY_UID)).isEqualTo(-1);
+ assertThat(values.getAsLong(BatteryHistEntry.KEY_USER_ID))
+ .isEqualTo(UserHandle.getUserId(1001));
+ assertThat(values.getAsString(BatteryHistEntry.KEY_PACKAGE_NAME)).isEqualTo("");
+ assertThat(values.getAsLong(BatteryHistEntry.KEY_TIMESTAMP)).isEqualTo(10001L);
+ assertThat(values.getAsInteger(BatteryHistEntry.KEY_CONSUMER_TYPE))
+ .isEqualTo(ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY);
+ assertThat(values.getAsBoolean(BatteryHistEntry.KEY_IS_FULL_CHARGE_CYCLE_START)).isTrue();
+ assertThat(batteryInformation.getAppLabel()).isEqualTo("CPU");
+ assertThat(batteryInformation.getIsHidden()).isFalse();
+ assertThat(batteryInformation.getBootTimestamp()).isEqualTo(101L);
+ assertThat(batteryInformation.getZoneId()).isEqualTo(TimeZone.getDefault().getID());
+ assertThat(batteryInformation.getTotalPower()).isEqualTo(5.1);
+ assertThat(batteryInformation.getConsumePower()).isEqualTo(1.1);
+ assertThat(batteryInformation.getForegroundUsageConsumePower()).isEqualTo(1.2);
+ assertThat(batteryInformation.getForegroundServiceUsageConsumePower()).isEqualTo(1.3);
+ assertThat(batteryInformation.getBackgroundUsageConsumePower()).isEqualTo(1.4);
+ assertThat(batteryInformation.getCachedUsageConsumePower()).isEqualTo(1.5);
+ assertThat(batteryInformation.getPercentOfTotal()).isEqualTo(0.3);
+ assertThat(batteryInformation.getForegroundUsageTimeInMs()).isEqualTo(1234L);
+ assertThat(batteryInformation.getBackgroundUsageTimeInMs()).isEqualTo(5689L);
+ assertThat(batteryInformation.getDrainType()).isEqualTo(
+ BatteryConsumer.POWER_COMPONENT_CPU);
assertThat(deviceBatteryState.getBatteryLevel()).isEqualTo(12);
assertThat(deviceBatteryState.getBatteryStatus())
.isEqualTo(BatteryManager.BATTERY_STATUS_FULL);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
index c4394f7..636a7a3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
@@ -1397,12 +1397,14 @@
}
@Test
- public void generateBatteryDiffData_emptyBatteryEntryList_returnNull() {
- assertThat(DataProcessor.generateBatteryDiffData(mContext,
+ public void generateBatteryDiffData_emptyBatteryEntryList_returnEmptyBatteryDiffData() {
+ final BatteryDiffData batteryDiffData = DataProcessor.generateBatteryDiffData(mContext,
System.currentTimeMillis(),
DataProcessor.convertToBatteryHistEntry(null, mBatteryUsageStats),
/* systemAppsPackageNames= */ Set.of(),
- /* systemAppsUids= */ Set.of())).isNull();
+ /* systemAppsUids= */ Set.of());
+ assertThat(batteryDiffData.getAppDiffEntryList()).isEmpty();
+ assertThat(batteryDiffData.getSystemDiffEntryList()).isEmpty();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleControllerTest.java b/tests/robotests/src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleControllerTest.java
new file mode 100644
index 0000000..f92ed25
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleControllerTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2023 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.notification;
+
+import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Vibrator;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
+
+import com.android.server.notification.Flags;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class PoliteNotifVibrateUnlockedToggleControllerTest {
+
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+ private static final String PREFERENCE_KEY = "preference_key";
+
+ private PoliteNotifVibrateUnlockedToggleController mController;
+ private Context mContext;
+ @Mock
+ private Vibrator mVibrator;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+ mController = new PoliteNotifVibrateUnlockedToggleController(mContext, PREFERENCE_KEY);
+ when(mContext.getSystemService(Vibrator.class)).thenReturn(mVibrator);
+ }
+
+ @Test
+ public void isAvailable_flagEnabled_vibrationSupported_shouldReturnTrue() {
+ // TODO: b/291907312 - remove feature flags
+ mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
+ when(mVibrator.hasVibrator()).thenReturn(true);
+ assertThat(mController.isAvailable()).isTrue();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void isAvailable_flagEnabled_vibrationNotSupported_shouldReturnFalse() {
+ // TODO: b/291907312 - remove feature flags
+ mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
+ when(mVibrator.hasVibrator()).thenReturn(false);
+ assertThat(mController.isAvailable()).isFalse();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void isAvailable_flagDisabled_shouldReturnFalse() {
+ // TODO: b/291907312 - remove feature flags
+ mSetFlagsRule.disableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
+ assertThat(mController.isAvailable()).isFalse();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void isChecked_vibrateEnabled_shouldReturnTrue() {
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, ON);
+ assertThat(mController.isChecked()).isTrue();
+ }
+
+ @Test
+ public void isChecked_vibrateDisabled_shouldReturnFalse() {
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, OFF);
+ assertThat(mController.isChecked()).isFalse();
+ }
+
+ @Test
+ public void setChecked_setTrue_shouldEnableVibrateSetting() {
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, OFF);
+ mController.setChecked(true);
+ assertThat(Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, OFF)).isEqualTo(ON);
+ }
+
+ @Test
+ public void setChecked_setFalse_shouldDisableVibrateSetting() {
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, ON);
+ mController.setChecked(false);
+ assertThat(Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, ON)).isEqualTo(OFF);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/PoliteNotifWorkProfileToggleControllerTest.java b/tests/robotests/src/com/android/settings/notification/PoliteNotifWorkProfileToggleControllerTest.java
new file mode 100644
index 0000000..5cda1ea
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/PoliteNotifWorkProfileToggleControllerTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2023 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.notification;
+
+import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
+
+import com.android.server.notification.Flags;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.shadow.ShadowSystemSettings;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+public class PoliteNotifWorkProfileToggleControllerTest {
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+ private static final String PREFERENCE_KEY = "preference_key";
+
+ private Context mContext;
+ PoliteNotifWorkProfileToggleController mController;
+ @Mock
+ private AudioHelper mAudioHelper;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ when(mAudioHelper.getManagedProfileId(any())).thenReturn(UserHandle.MIN_SECONDARY_USER_ID);
+ mController = new PoliteNotifWorkProfileToggleController(mContext, PREFERENCE_KEY,
+ mAudioHelper);
+ }
+
+ @Test
+ public void isAvailable_flagEnabled_workProfileExists_shouldReturnTrue() {
+ // TODO: b/291907312 - remove feature flags
+ mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
+ assertThat(mController.isAvailable()).isTrue();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void isAvailable_flagEnabled_workProfileMissing_shouldReturnFalse() {
+ // TODO: b/291907312 - remove feature flags
+ mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
+ when(mAudioHelper.getManagedProfileId(any())).thenReturn(UserHandle.USER_NULL);
+ mController = new PoliteNotifWorkProfileToggleController(mContext, PREFERENCE_KEY,
+ mAudioHelper);
+ assertThat(mController.isAvailable()).isFalse();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.DISABLED_FOR_USER);
+ }
+
+ @Test
+ public void isAvailable_flagDisabled_shouldReturnFalse() {
+ // TODO: b/291907312 - remove feature flags
+ mSetFlagsRule.disableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
+ assertThat(mController.isAvailable()).isFalse();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ @Config(shadows = ShadowSystemSettings.class)
+ public void isChecked_enabledForWorkProfile_shouldReturnTrue() {
+ Settings.System.putIntForUser(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON,
+ UserHandle.MIN_SECONDARY_USER_ID);
+ assertThat(mController.isChecked()).isTrue();
+ }
+
+ @Test
+ @Config(shadows = ShadowSystemSettings.class)
+ public void isChecked_disabledForWorkProfile_shouldReturnFalse() {
+ Settings.System.putIntForUser(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF,
+ UserHandle.MIN_SECONDARY_USER_ID);
+ assertThat(mController.isChecked()).isFalse();
+ }
+
+ @Test
+ @Config(shadows = ShadowSystemSettings.class)
+ public void setChecked_setTrue_shouldEnablePoliteNotifForWorkProfile() {
+ Settings.System.putIntForUser(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF,
+ UserHandle.MIN_SECONDARY_USER_ID);
+ mController.setChecked(true);
+ assertThat(Settings.System.getIntForUser(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON,
+ UserHandle.MIN_SECONDARY_USER_ID)).isEqualTo(ON);
+ }
+
+ @Test
+ @Config(shadows = ShadowSystemSettings.class)
+ public void setChecked_setFalse_shouldDisablePoliteNotifForWorkProfile() {
+ Settings.System.putIntForUser(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON,
+ UserHandle.MIN_SECONDARY_USER_ID);
+ mController.setChecked(false);
+ assertThat(Settings.System.getIntForUser(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON,
+ UserHandle.MIN_SECONDARY_USER_ID)).isEqualTo(OFF);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/PoliteNotificationFilterControllerTest.java b/tests/robotests/src/com/android/settings/notification/PoliteNotificationFilterControllerTest.java
new file mode 100644
index 0000000..646e927
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/PoliteNotificationFilterControllerTest.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2023 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.notification;
+
+import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+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.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.server.notification.Flags;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class PoliteNotificationFilterControllerTest {
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+ private static final String PREFERENCE_KEY = "preference_key";
+ private static final int POLITE_NOTIFICATIONS_ALL = 0;
+ private static final int POLITE_NOTIFICATIONS_CONVERSATIONS = 1;
+ private static final int POLITE_NOTIFICATIONS_DISABLED = 2;
+
+ @Mock
+ private PreferenceScreen mScreen;
+
+ private PoliteNotificationFilterController mController;
+ private Preference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+
+ mController = new PoliteNotificationFilterController(mContext, PREFERENCE_KEY);
+ mPreference = new Preference(mContext);
+ mPreference.setKey(mController.getPreferenceKey());
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+ }
+
+ @Test
+ public void isAvailable_flagEnabled_shouldReturnTrue() {
+ // TODO: b/291907312 - remove feature flags
+ mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
+ assertThat(mController.isAvailable()).isTrue();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void isAvailable_flagDisabled_shouldReturnFalse() {
+ // TODO: b/291907312 - remove feature flags
+ mSetFlagsRule.disableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
+ assertThat(mController.isAvailable()).isFalse();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void updateState_politeNotificationDisabled() {
+ final ListPreference preference = mock(ListPreference.class);
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF);
+ mController.updateState(preference);
+
+ verify(preference).setValue(Integer.toString(POLITE_NOTIFICATIONS_DISABLED));
+ assertThat(mController.getSummary().toString()).isEqualTo(
+ mContext.getString(R.string.notification_polite_disabled_summary));
+ }
+
+ @Test
+ public void updateState_politeNotificationEnabled_applyAllApps() {
+ final ListPreference preference = mock(ListPreference.class);
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON);
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ALL, ON);
+ mController.updateState(preference);
+
+ verify(preference).setValue(Integer.toString(POLITE_NOTIFICATIONS_ALL));
+ assertThat(mController.getSummary().toString()).isEqualTo(
+ mContext.getString(R.string.notification_polite_all_apps_summary));
+ }
+
+ @Test
+ public void updateState_politeNotificationEnabled_applyOnlyConversations() {
+ final ListPreference preference = mock(ListPreference.class);
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, ON);
+ Settings.System.putInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ALL, OFF);
+ mController.updateState(preference);
+
+ verify(preference).setValue(Integer.toString(POLITE_NOTIFICATIONS_CONVERSATIONS));
+ assertThat(mController.getSummary().toString()).isEqualTo(
+ mContext.getString(R.string.notification_polite_conversations_summary));
+ }
+
+ @Test
+ public void onPreferenceChanged_firstItemSelected_shouldEnableForAll() {
+ mController.displayPreference(mScreen);
+ mController.onPreferenceChange(mPreference, "0");
+
+ assertThat(Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF)).isEqualTo(ON);
+ assertThat(Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ALL, OFF)).isEqualTo(ON);
+ }
+
+ @Test
+ public void onPreferenceChanged_secondItemSelected_shouldEnableForConversationsOnly() {
+ mController.displayPreference(mScreen);
+ mController.onPreferenceChange(mPreference, "1");
+
+ assertThat(Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF)).isEqualTo(ON);
+ assertThat(Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ALL, OFF)).isEqualTo(OFF);
+ }
+
+ @Test
+ public void onPreferenceChanged_thirdItemSelected_shouldDisable() {
+ mController.displayPreference(mScreen);
+ mController.onPreferenceChange(mPreference, "2");
+
+ assertThat(Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.NOTIFICATION_COOLDOWN_ENABLED, OFF)).isEqualTo(OFF);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/notification/PoliteNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PoliteNotificationsPreferenceControllerTest.java
new file mode 100644
index 0000000..f6c5e16
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/PoliteNotificationsPreferenceControllerTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2023 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.notification;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import com.android.server.notification.Flags;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class PoliteNotificationsPreferenceControllerTest {
+
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+ private static final String PREFERENCE_KEY = "preference_key";
+
+ private PoliteNotificationsPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mController = new PoliteNotificationsPreferenceController(RuntimeEnvironment.application,
+ PREFERENCE_KEY);
+ }
+
+ @Test
+ public void isAvailable_flagEnabled_shouldReturnTrue() {
+ // TODO: b/291907312 - remove feature flags
+ mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
+ assertThat(mController.isAvailable()).isTrue();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void isAvailable_flagDisabled_shouldReturnFalse() {
+ // TODO: b/291907312 - remove feature flags
+ mSetFlagsRule.disableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);
+ assertThat(mController.isAvailable()).isFalse();
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java
index 9973a2d..dd09b3c 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java
@@ -13,7 +13,6 @@
public static boolean IS_MOBILE_DATA_SUPPORTED = true;
public static boolean IS_WIFI_SUPPORTED = true;
- public static boolean HAS_SIM = true;
public static int DEFAULT_SUBSCRIPTION_ID = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@Implementation
@@ -32,10 +31,5 @@
}
@Implementation
- protected static boolean hasSim(Context context) {
- return HAS_SIM;
- }
-
- @Implementation
protected static boolean hasEthernet(Context context) { return false; }
}
diff --git a/tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceFragmentTest.java
index 00b8e86..1cb188c 100644
--- a/tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/tts/TtsEnginePreferenceFragmentTest.java
@@ -24,6 +24,7 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
import android.content.Context;
import android.content.Intent;
@@ -31,6 +32,7 @@
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.os.Bundle;
+import android.os.Looper;
import android.speech.tts.TextToSpeech;
import android.speech.tts.TtsEngines;
@@ -43,6 +45,7 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implements;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.shadows.androidx.fragment.FragmentController;
@@ -50,12 +53,15 @@
@RunWith(RobolectricTestRunner.class)
public class TtsEnginePreferenceFragmentTest {
+ @Implements(TextToSpeech.class)
+ public static class NoOpShadowTextToSpeech {}
+
private Context mContext;
private TtsEnginePreferenceFragment mTtsEnginePreferenceFragment;
@Before
public void setUp() {
- mContext = RuntimeEnvironment.application;
+ mContext = RuntimeEnvironment.systemContext;
final ResolveInfo info = new ResolveInfo();
final ServiceInfo serviceInfo = spy(new ServiceInfo());
@@ -76,17 +82,19 @@
}
@Test
+ @Config(shadows = {NoOpShadowTextToSpeech.class})
public void getCandidates_AddEngines_returnCorrectEngines() {
mTtsEnginePreferenceFragment = FragmentController.of(new TtsEnginePreferenceFragment(),
new Bundle())
.create()
.get();
+ shadowOf(Looper.getMainLooper()).idle();
assertThat(mTtsEnginePreferenceFragment.getCandidates().size()).isEqualTo(1);
}
@Test
- @Config(shadows = {ShadowTtsEngines.class})
+ @Config(shadows = {ShadowTtsEngines.class, NoOpShadowTextToSpeech.class})
public void getDefaultKey_validKey_returnCorrectKey() {
final String TEST_ENGINE = "test_engine";
final TtsEngines engine = mock(TtsEngines.class);
@@ -95,13 +103,14 @@
new Bundle())
.create()
.get();
+ shadowOf(Looper.getMainLooper()).idle();
when(engine.getDefaultEngine()).thenReturn(TEST_ENGINE);
assertThat(mTtsEnginePreferenceFragment.getDefaultKey()).isEqualTo(TEST_ENGINE);
}
@Test
- @Config(shadows = {ShadowTtsEngines.class})
+ @Config(shadows = {ShadowTtsEngines.class, NoOpShadowTextToSpeech.class})
public void setDefaultKey_validKey_callingTtsEngineFunction() {
final TtsEngines engine = mock(TtsEngines.class);
ShadowTtsEngines.setInstance(engine);
@@ -109,6 +118,7 @@
new Bundle())
.create()
.get();
+ shadowOf(Looper.getMainLooper()).idle();
mTtsEnginePreferenceFragment.setDefaultKey(mContext.getPackageName());
@@ -116,14 +126,17 @@
}
@Test
+ @Config(shadows = {NoOpShadowTextToSpeech.class})
public void setDefaultKey_validKey_updateCheckedState() {
- mTtsEnginePreferenceFragment = spy(FragmentController.of(new TtsEnginePreferenceFragment(),
+ mTtsEnginePreferenceFragment = FragmentController.of(new TtsEnginePreferenceFragment(),
new Bundle())
.create()
- .get());
+ .get();
+ shadowOf(Looper.getMainLooper()).idle();
+ TtsEnginePreferenceFragment fragmentSpy = spy(mTtsEnginePreferenceFragment);
- mTtsEnginePreferenceFragment.setDefaultKey(mContext.getPackageName());
+ fragmentSpy.setDefaultKey(mContext.getPackageName());
- verify(mTtsEnginePreferenceFragment).updateCheckedState(mContext.getPackageName());
+ verify(fragmentSpy).updateCheckedState(mContext.getPackageName());
}
}
diff --git a/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowUserManager.java b/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowUserManager.java
index c8d2866..ce6dc6a 100644
--- a/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowUserManager.java
+++ b/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowUserManager.java
@@ -17,6 +17,7 @@
package com.android.settings.testutils.shadow;
import static android.os.Build.VERSION_CODES.LOLLIPOP;
+import static android.os.UserManager.USER_TYPE_PROFILE_PRIVATE;
import android.annotation.UserIdInt;
import android.content.pm.UserInfo;
@@ -223,6 +224,10 @@
mManagedProfiles.addAll(profileIds);
}
+ public void setPrivateProfile(int id, String name, int flags) {
+ mUserProfileInfos.add(new UserInfo(id, name, null, flags, USER_TYPE_PROFILE_PRIVATE));
+ }
+
public void setUserSwitcherEnabled(boolean userSwitchEnabled) {
mUserSwitchEnabled = userSwitchEnabled;
}
diff --git a/tests/spa_unit/src/com/android/settings/datausage/AppDataUsageAppSettingsControllerTest.kt b/tests/spa_unit/src/com/android/settings/datausage/AppDataUsageAppSettingsControllerTest.kt
new file mode 100644
index 0000000..220c970
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/datausage/AppDataUsageAppSettingsControllerTest.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2023 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.datausage
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ResolveInfo
+import androidx.lifecycle.testing.TestLifecycleOwner
+import androidx.preference.PreferenceCategory
+import androidx.preference.PreferenceManager
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.argThat
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+
+@RunWith(AndroidJUnit4::class)
+class AppDataUsageAppSettingsControllerTest {
+ private val packageManager = mock<PackageManager>()
+
+ private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
+ on { packageManager } doReturn packageManager
+ }
+
+ private val controller = AppDataUsageAppSettingsController(context, KEY)
+
+ private val preference = PreferenceCategory(context).apply { key = KEY }
+
+ private val preferenceScreen = PreferenceManager(context).createPreferenceScreen(context)
+
+ @Before
+ fun setUp() {
+ preferenceScreen.addPreference(preference)
+ }
+
+ @Test
+ fun onViewCreated_noSettingsActivity_hidePreference(): Unit = runBlocking {
+ controller.init(listOf(PACKAGE_NAME), USER_ID)
+ controller.displayPreference(preferenceScreen)
+
+ controller.onViewCreated(TestLifecycleOwner())
+ delay(100)
+
+ assertThat(preference.isVisible).isFalse()
+ }
+
+ @Test
+ fun onViewCreated_hasSettingsActivity_showPreference(): Unit = runBlocking {
+ packageManager.stub {
+ on {
+ resolveActivityAsUser(
+ argThat {
+ action == Intent.ACTION_MANAGE_NETWORK_USAGE && getPackage() == PACKAGE_NAME
+ },
+ eq(0),
+ eq(USER_ID),
+ )
+ } doReturn ResolveInfo()
+ }
+ controller.init(listOf(PACKAGE_NAME), USER_ID)
+ controller.displayPreference(preferenceScreen)
+
+ controller.onViewCreated(TestLifecycleOwner())
+ delay(100)
+
+ assertThat(preference.isVisible).isTrue()
+ }
+
+ private companion object {
+ const val KEY = "test_key"
+ const val PACKAGE_NAME = "package.name"
+ const val USER_ID = 0
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/datausage/AppDataUsageCycleControllerTest.kt b/tests/spa_unit/src/com/android/settings/datausage/AppDataUsageCycleControllerTest.kt
new file mode 100644
index 0000000..ea51f01
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/datausage/AppDataUsageCycleControllerTest.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2023 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.datausage
+
+import android.content.Context
+import android.util.Range
+import androidx.lifecycle.testing.TestLifecycleOwner
+import androidx.preference.PreferenceManager
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.datausage.lib.AppDataUsageDetailsRepository
+import com.android.settings.datausage.lib.IAppDataUsageDetailsRepository
+import com.android.settings.datausage.lib.NetworkUsageDetailsData
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+import org.mockito.kotlin.verify
+
+@RunWith(AndroidJUnit4::class)
+class AppDataUsageCycleControllerTest {
+ private val context: Context = ApplicationProvider.getApplicationContext()
+
+ private val controller = AppDataUsageCycleController(context, KEY)
+
+ private val preference = spy(SpinnerPreference(context, null).apply { key = KEY })
+
+ private val preferenceScreen = PreferenceManager(context).createPreferenceScreen(context)
+
+ private val onUsageDataUpdated: (NetworkUsageDetailsData) -> Unit = {}
+
+ @Before
+ fun setUp() {
+ preferenceScreen.addPreference(preference)
+ }
+
+ @Test
+ fun onViewCreated_noUsage_hidePreference(): Unit = runBlocking {
+ val repository = object : IAppDataUsageDetailsRepository {
+ override suspend fun queryDetailsForCycles() = emptyList<NetworkUsageDetailsData>()
+ }
+ controller.init(repository, onUsageDataUpdated)
+ controller.displayPreference(preferenceScreen)
+
+ controller.onViewCreated(TestLifecycleOwner())
+ delay(100)
+
+ assertThat(preference.isVisible).isFalse()
+ }
+
+ @Test
+ fun onViewCreated_hasUsage_showPreference(): Unit = runBlocking {
+ val detailsData = NetworkUsageDetailsData(
+ range = Range(1, 2),
+ totalUsage = 11,
+ foregroundUsage = 1,
+ backgroundUsage = 10,
+ )
+ val repository = object : IAppDataUsageDetailsRepository {
+ override suspend fun queryDetailsForCycles() = listOf(detailsData)
+ }
+ controller.init(repository, onUsageDataUpdated)
+ controller.displayPreference(preferenceScreen)
+
+ controller.onViewCreated(TestLifecycleOwner())
+ delay(100)
+
+ assertThat(preference.isVisible).isTrue()
+ }
+
+ @Test
+ fun setInitialCycles() {
+ val repository = object : IAppDataUsageDetailsRepository {
+ override suspend fun queryDetailsForCycles() = emptyList<NetworkUsageDetailsData>()
+ }
+ controller.init(repository, onUsageDataUpdated)
+ controller.setInitialCycles(
+ initialCycles = listOf(CYCLE2_END_TIME, CYCLE1_END_TIME, CYCLE1_START_TIME),
+ initialSelectedEndTime = CYCLE1_END_TIME,
+ )
+
+ controller.displayPreference(preferenceScreen)
+
+ verify(preference).setSelection(1)
+ }
+
+ private companion object {
+ const val KEY = "test_key"
+ const val CYCLE1_START_TIME = 1694444444000L
+ const val CYCLE1_END_TIME = 1695555555000L
+ const val CYCLE2_END_TIME = 1695566666000L
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/datausage/AppDataUsageListControllerTest.kt b/tests/spa_unit/src/com/android/settings/datausage/AppDataUsageListControllerTest.kt
new file mode 100644
index 0000000..4575a8d
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/datausage/AppDataUsageListControllerTest.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2023 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.datausage
+
+import android.content.Context
+import androidx.lifecycle.testing.TestLifecycleOwner
+import androidx.preference.Preference
+import androidx.preference.PreferenceCategory
+import androidx.preference.PreferenceManager
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.datausage.lib.AppPreferenceRepository
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.mock
+
+@RunWith(AndroidJUnit4::class)
+class AppDataUsageListControllerTest {
+ private val context: Context = ApplicationProvider.getApplicationContext()
+
+ private val repository = mock<AppPreferenceRepository> {
+ on { loadAppPreferences(any()) } doAnswer {
+ val uids = it.arguments[0] as List<*>
+ uids.map { Preference(context) }
+ }
+ }
+
+ private val controller = AppDataUsageListController(
+ context = context,
+ preferenceKey = KEY,
+ repository = repository,
+ )
+
+ private val preference = PreferenceCategory(context).apply { key = KEY }
+
+ private val preferenceScreen = PreferenceManager(context).createPreferenceScreen(context)
+
+ @Before
+ fun setUp() {
+ preferenceScreen.addPreference(preference)
+ }
+
+ @Test
+ fun onViewCreated_singleUid_hidePreference(): Unit = runBlocking {
+ controller.init(listOf(UID_0))
+ controller.displayPreference(preferenceScreen)
+
+ controller.onViewCreated(TestLifecycleOwner())
+ delay(100)
+
+ assertThat(preference.isVisible).isFalse()
+ }
+
+ @Test
+ fun onViewCreated_twoUid_showPreference(): Unit = runBlocking {
+ controller.init(listOf(UID_0, UID_1))
+ controller.displayPreference(preferenceScreen)
+
+ controller.onViewCreated(TestLifecycleOwner())
+ delay(100)
+
+ assertThat(preference.isVisible).isTrue()
+ assertThat(preference.preferenceCount).isEqualTo(2)
+ }
+
+ private companion object {
+ const val KEY = "test_key"
+ const val UID_0 = 10000
+ const val UID_1 = 10001
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/datausage/ChartDataUsagePreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/datausage/ChartDataUsagePreferenceControllerTest.kt
index 1748f07..ae09ef9 100644
--- a/tests/spa_unit/src/com/android/settings/datausage/ChartDataUsagePreferenceControllerTest.kt
+++ b/tests/spa_unit/src/com/android/settings/datausage/ChartDataUsagePreferenceControllerTest.kt
@@ -17,6 +17,7 @@
package com.android.settings.datausage
import android.content.Context
+import android.util.Range
import androidx.lifecycle.testing.TestLifecycleOwner
import androidx.preference.PreferenceScreen
import androidx.test.core.app.ApplicationProvider
@@ -39,10 +40,10 @@
private val repository = object : INetworkCycleDataRepository {
override suspend fun loadCycles() = emptyList<NetworkUsageData>()
-
+ override fun getCycles() = emptyList<Range<Long>>()
override fun getPolicy() = null
- override suspend fun querySummary(startTime: Long, endTime: Long) = when {
+ override suspend fun queryChartData(startTime: Long, endTime: Long) = when {
startTime == START_TIME && endTime == END_TIME -> CycleChartDate
else -> null
}
diff --git a/tests/spa_unit/src/com/android/settings/datausage/DataUsageListHeaderControllerTest.kt b/tests/spa_unit/src/com/android/settings/datausage/DataUsageListHeaderControllerTest.kt
index 35b70d6..3580e68 100644
--- a/tests/spa_unit/src/com/android/settings/datausage/DataUsageListHeaderControllerTest.kt
+++ b/tests/spa_unit/src/com/android/settings/datausage/DataUsageListHeaderControllerTest.kt
@@ -18,6 +18,7 @@
import android.content.Context
import android.net.NetworkTemplate
+import android.util.Range
import android.view.LayoutInflater
import android.view.View
import android.widget.Spinner
@@ -48,10 +49,9 @@
private val repository = object : INetworkCycleDataRepository {
override suspend fun loadCycles() = emptyList<NetworkUsageData>()
-
+ override fun getCycles() = emptyList<Range<Long>>()
override fun getPolicy() = null
-
- override suspend fun querySummary(startTime: Long, endTime: Long) = null
+ override suspend fun queryChartData(startTime: Long, endTime: Long) = null
}
private val header =
diff --git a/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageDetailsRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageDetailsRepositoryTest.kt
new file mode 100644
index 0000000..7072b46
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageDetailsRepositoryTest.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2023 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.datausage.lib
+
+import android.app.usage.NetworkStats.Bucket
+import android.content.Context
+import android.net.NetworkTemplate
+import android.util.Range
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.whenever
+
+@RunWith(AndroidJUnit4::class)
+class AppDataUsageDetailsRepositoryTest {
+ private val context: Context = ApplicationProvider.getApplicationContext()
+
+ private val template = mock<NetworkTemplate>()
+
+ private val networkCycleDataRepository = mock<INetworkCycleDataRepository> {
+ on { getCycles() } doReturn listOf(Range(CYCLE1_END_TIME, CYCLE2_END_TIME))
+ }
+
+ @Test
+ fun queryDetailsForCycles_hasCycles(): Unit = runBlocking {
+ val range = Range(CYCLE1_START_TIME, CYCLE1_END_TIME)
+ val repository = spy(
+ AppDataUsageDetailsRepository(
+ context = context,
+ cycles = listOf(CYCLE1_END_TIME, CYCLE1_START_TIME),
+ template = template,
+ uids = listOf(UID),
+ networkCycleDataRepository = networkCycleDataRepository,
+ )
+ ) {
+ doReturn(ALL_USAGE).whenever(mock).getUsage(range, UID, Bucket.STATE_ALL)
+ doReturn(FOREGROUND_USAGE).whenever(mock).getUsage(range, UID, Bucket.STATE_FOREGROUND)
+ }
+
+ val detailsForCycles = repository.queryDetailsForCycles()
+
+ assertThat(detailsForCycles).containsExactly(
+ NetworkUsageDetailsData(
+ range = range,
+ totalUsage = ALL_USAGE,
+ foregroundUsage = FOREGROUND_USAGE,
+ backgroundUsage = ALL_USAGE - FOREGROUND_USAGE,
+ )
+ )
+ }
+
+ @Test
+ fun queryDetailsForCycles_defaultCycles(): Unit = runBlocking {
+ val range = Range(CYCLE1_END_TIME, CYCLE2_END_TIME)
+ val repository = spy(
+ AppDataUsageDetailsRepository(
+ context = context,
+ cycles = null,
+ template = template,
+ uids = listOf(UID),
+ networkCycleDataRepository = networkCycleDataRepository,
+ )
+ ) {
+ doReturn(ALL_USAGE).whenever(mock).getUsage(range, UID, Bucket.STATE_ALL)
+ doReturn(FOREGROUND_USAGE).whenever(mock).getUsage(range, UID, Bucket.STATE_FOREGROUND)
+ }
+
+ val detailsForCycles = repository.queryDetailsForCycles()
+
+ assertThat(detailsForCycles).containsExactly(
+ NetworkUsageDetailsData(
+ range = range,
+ totalUsage = ALL_USAGE,
+ foregroundUsage = FOREGROUND_USAGE,
+ backgroundUsage = ALL_USAGE - FOREGROUND_USAGE,
+ )
+ )
+ }
+
+ private companion object {
+ const val CYCLE1_START_TIME = 1694444444000L
+ const val CYCLE1_END_TIME = 1695555555000L
+ const val CYCLE2_END_TIME = 1695566666000L
+ const val UID = 10000
+
+ const val ALL_USAGE = 10L
+ const val FOREGROUND_USAGE = 2L
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageRepositoryTest.kt
index 531e6e7..f2bf524 100644
--- a/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageRepositoryTest.kt
+++ b/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageRepositoryTest.kt
@@ -26,7 +26,7 @@
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.R
-import com.android.settings.datausage.lib.AppDataUsageRepository.Companion.Bucket
+import com.android.settings.datausage.lib.NetworkStatsRepository.Companion.Bucket
import com.android.settingslib.AppItem
import com.android.settingslib.spaprivileged.framework.common.userManager
import com.google.common.truth.Truth.assertThat
diff --git a/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageSummaryRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageSummaryRepositoryTest.kt
new file mode 100644
index 0000000..0557d7f
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/datausage/lib/AppDataUsageSummaryRepositoryTest.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2023 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.datausage.lib
+
+import android.content.Context
+import android.net.NetworkTemplate
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+
+@RunWith(AndroidJUnit4::class)
+class AppDataUsageSummaryRepositoryTest {
+
+ private val context: Context = ApplicationProvider.getApplicationContext()
+
+ private val template = mock<NetworkTemplate>()
+
+ private val networkStatsRepository = mock<NetworkStatsRepository> {
+ on {
+ queryAggregateForUid(range = NetworkStatsRepository.AllTimeRange, uid = APP_UID)
+ } doReturn NetworkUsageData(APP_START_TIME, APP_END_TIME, APP_USAGE)
+
+ on {
+ queryAggregateForUid(range = NetworkStatsRepository.AllTimeRange, uid = SDK_SANDBOX_UID)
+ } doReturn NetworkUsageData(SDK_SANDBOX_START_TIME, SDK_SANDBOX_END_TIME, SDK_SANDBOX_USAGE)
+ }
+
+ private val repository =
+ AppDataUsageSummaryRepository(context, template, networkStatsRepository)
+
+ @Test
+ fun querySummary(): Unit = runBlocking {
+ val networkUsageData = repository.querySummary(APP_UID)
+
+ assertThat(networkUsageData).isEqualTo(
+ NetworkUsageData(
+ startTime = APP_START_TIME,
+ endTime = SDK_SANDBOX_END_TIME,
+ usage = APP_USAGE + SDK_SANDBOX_USAGE,
+ )
+ )
+ }
+
+ private companion object {
+ const val APP_UID = 10000
+ const val APP_START_TIME = 10L
+ const val APP_END_TIME = 30L
+ const val APP_USAGE = 3L
+
+ const val SDK_SANDBOX_UID = 20000
+ const val SDK_SANDBOX_START_TIME = 20L
+ const val SDK_SANDBOX_END_TIME = 40L
+ const val SDK_SANDBOX_USAGE = 5L
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/datausage/lib/AppPreferenceRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/datausage/lib/AppPreferenceRepositoryTest.kt
new file mode 100644
index 0000000..c7371ee
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/datausage/lib/AppPreferenceRepositoryTest.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2023 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.datausage.lib
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageManager
+import android.graphics.drawable.Drawable
+import android.os.UserHandle
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.doThrow
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+
+@RunWith(AndroidJUnit4::class)
+class AppPreferenceRepositoryTest {
+ private val packageManager = mock<PackageManager> {
+ on { getPackagesForUid(UID) } doReturn arrayOf(PACKAGE_NAME)
+ }
+
+ private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
+ on { packageManager } doReturn packageManager
+ }
+
+ private val repository = AppPreferenceRepository(context)
+
+ @Test
+ fun loadAppPreferences_packageNotFound_returnEmpty() {
+ packageManager.stub {
+ on {
+ getApplicationInfoAsUser(PACKAGE_NAME, 0, UserHandle.getUserId(UID))
+ } doThrow PackageManager.NameNotFoundException()
+ }
+
+ val preferences = repository.loadAppPreferences(listOf(UID))
+
+ assertThat(preferences).isEmpty()
+ }
+
+ @Test
+ fun loadAppPreferences_packageFound_returnPreference() {
+ val app = mock<ApplicationInfo> {
+ on { loadUnbadgedIcon(any()) } doReturn UNBADGED_ICON
+ on { loadLabel(any()) } doReturn LABEL
+ }
+ packageManager.stub {
+ on {
+ getApplicationInfoAsUser(PACKAGE_NAME, 0, UserHandle.getUserId(UID))
+ } doReturn app
+ }
+
+ val preferences = repository.loadAppPreferences(listOf(UID))
+
+ assertThat(preferences).hasSize(1)
+ preferences[0].apply {
+ assertThat(title).isEqualTo(LABEL)
+ assertThat(icon).isNotNull()
+ assertThat(isSelectable).isFalse()
+ }
+ }
+
+ private companion object {
+ const val UID = 10000
+ const val PACKAGE_NAME = "package.name"
+ const val LABEL = "Label"
+ val UNBADGED_ICON = mock<Drawable>()
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/datausage/lib/NetworkCycleDataRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/datausage/lib/NetworkCycleDataRepositoryTest.kt
index fb5e820..5678503 100644
--- a/tests/spa_unit/src/com/android/settings/datausage/lib/NetworkCycleDataRepositoryTest.kt
+++ b/tests/spa_unit/src/com/android/settings/datausage/lib/NetworkCycleDataRepositoryTest.kt
@@ -16,8 +16,6 @@
package com.android.settings.datausage.lib
-import android.app.usage.NetworkStats.Bucket
-import android.app.usage.NetworkStatsManager
import android.content.Context
import android.net.NetworkPolicy
import android.net.NetworkTemplate
@@ -32,44 +30,37 @@
import kotlinx.coroutines.test.runTest
import org.junit.Test
import org.junit.runner.RunWith
-import org.mockito.kotlin.any
import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.eq
import org.mockito.kotlin.mock
import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
import org.mockito.kotlin.whenever
@RunWith(AndroidJUnit4::class)
class NetworkCycleDataRepositoryTest {
- private val mockNetworkStatsManager = mock<NetworkStatsManager> {
- on { querySummaryForDevice(any(), eq(CYCLE1_START_TIME), eq(CYCLE1_END_TIME)) } doReturn
- CYCLE1_BUCKET
+ private val mockNetworkStatsRepository = mock<NetworkStatsRepository> {
+ on { querySummaryForDevice(CYCLE1_START_TIME, CYCLE1_END_TIME) } doReturn CYCLE1_BYTES
on {
querySummaryForDevice(
- any(),
- eq(CYCLE2_END_TIME - DateUtils.WEEK_IN_MILLIS * 4),
- eq(CYCLE2_END_TIME),
+ startTime = CYCLE2_END_TIME - DateUtils.WEEK_IN_MILLIS * 4,
+ endTime = CYCLE2_END_TIME,
)
- } doReturn CYCLE2_BUCKET
+ } doReturn CYCLE2_BYTES
- on { querySummaryForDevice(any(), eq(CYCLE3_START_TIME), eq(CYCLE4_END_TIME)) } doReturn
- CYCLE3_AND_4_BUCKET
+ on { querySummaryForDevice(CYCLE3_START_TIME, CYCLE4_END_TIME) } doReturn
+ CYCLE3_BYTES + CYCLE4_BYTES
- on { querySummaryForDevice(any(), eq(CYCLE3_START_TIME), eq(CYCLE3_END_TIME)) } doReturn
- CYCLE3_BUCKET
-
- on { querySummaryForDevice(any(), eq(CYCLE4_START_TIME), eq(CYCLE4_END_TIME)) } doReturn
- CYCLE4_BUCKET
+ on { querySummaryForDevice(CYCLE3_START_TIME, CYCLE3_END_TIME) } doReturn CYCLE3_BYTES
+ on { querySummaryForDevice(CYCLE4_START_TIME, CYCLE4_END_TIME) } doReturn CYCLE4_BYTES
}
- private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
- on { getSystemService(NetworkStatsManager::class.java) } doReturn mockNetworkStatsManager
- }
+ private val context: Context = ApplicationProvider.getApplicationContext()
private val template = mock<NetworkTemplate>()
- private val repository = spy(NetworkCycleDataRepository(context, template))
+ private val repository =
+ spy(NetworkCycleDataRepository(context, template, mockNetworkStatsRepository))
@Test
fun loadCycles_byPolicy() = runTest {
@@ -82,13 +73,17 @@
val cycles = repository.loadCycles()
- assertThat(cycles).containsExactly(NetworkUsageData(startTime = 1, endTime = 2, usage = 11))
+ assertThat(cycles).containsExactly(
+ NetworkUsageData(startTime = 1, endTime = 2, usage = CYCLE1_BYTES),
+ )
}
@Test
fun loadCycles_asFourWeeks() = runTest {
doReturn(null).whenever(repository).getPolicy()
- doReturn(Range(CYCLE2_START_TIME, CYCLE2_END_TIME)).whenever(repository).getTimeRange()
+ mockNetworkStatsRepository.stub {
+ on { getTimeRange() } doReturn Range(CYCLE2_START_TIME, CYCLE2_END_TIME)
+ }
val cycles = repository.loadCycles()
@@ -96,32 +91,32 @@
NetworkUsageData(
startTime = CYCLE2_END_TIME - DateUtils.WEEK_IN_MILLIS * 4,
endTime = CYCLE2_END_TIME,
- usage = 22,
+ usage = CYCLE2_BYTES,
),
)
}
@Test
fun querySummary() = runTest {
- val summary = repository.querySummary(CYCLE3_START_TIME, CYCLE4_END_TIME)
+ val summary = repository.queryChartData(CYCLE3_START_TIME, CYCLE4_END_TIME)
assertThat(summary).isEqualTo(
NetworkCycleChartData(
total = NetworkUsageData(
startTime = CYCLE3_START_TIME,
endTime = CYCLE4_END_TIME,
- usage = 77,
+ usage = CYCLE3_BYTES + CYCLE4_BYTES,
),
dailyUsage = listOf(
NetworkUsageData(
startTime = CYCLE3_START_TIME,
endTime = CYCLE3_END_TIME,
- usage = 33,
+ usage = CYCLE3_BYTES,
),
NetworkUsageData(
startTime = CYCLE4_START_TIME,
endTime = CYCLE4_END_TIME,
- usage = 44,
+ usage = CYCLE4_BYTES,
),
),
)
@@ -134,35 +129,18 @@
private companion object {
const val CYCLE1_START_TIME = 1L
const val CYCLE1_END_TIME = 2L
- val CYCLE1_BUCKET = mock<Bucket> {
- on { rxBytes } doReturn 1
- on { txBytes } doReturn 10
- }
+ const val CYCLE1_BYTES = 11L
const val CYCLE2_START_TIME = 1695555555000L
const val CYCLE2_END_TIME = 1695566666000L
- val CYCLE2_BUCKET = mock<Bucket> {
- on { rxBytes } doReturn 2
- on { txBytes } doReturn 20
- }
+ const val CYCLE2_BYTES = 22L
const val CYCLE3_START_TIME = 1695555555000L
const val CYCLE3_END_TIME = CYCLE3_START_TIME + DateUtils.DAY_IN_MILLIS
- val CYCLE3_BUCKET = mock<Bucket> {
- on { rxBytes } doReturn 3
- on { txBytes } doReturn 30
- }
+ const val CYCLE3_BYTES = 33L
const val CYCLE4_START_TIME = CYCLE3_END_TIME
const val CYCLE4_END_TIME = CYCLE4_START_TIME + DateUtils.DAY_IN_MILLIS
- val CYCLE4_BUCKET = mock<Bucket> {
- on { rxBytes } doReturn 4
- on { txBytes } doReturn 40
- }
-
- val CYCLE3_AND_4_BUCKET = mock<Bucket> {
- on { rxBytes } doReturn 7
- on { txBytes } doReturn 70
- }
+ const val CYCLE4_BYTES = 44L
}
}
diff --git a/tests/spa_unit/src/com/android/settings/datausage/lib/NetworkStatsRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/datausage/lib/NetworkStatsRepositoryTest.kt
new file mode 100644
index 0000000..aa4c5ca
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/datausage/lib/NetworkStatsRepositoryTest.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2023 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.datausage.lib
+
+import android.app.usage.NetworkStats
+import android.app.usage.NetworkStatsManager
+import android.content.Context
+import android.net.NetworkTemplate
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+
+@RunWith(AndroidJUnit4::class)
+class NetworkStatsRepositoryTest {
+ private val template = mock<NetworkTemplate>()
+
+ private val mockNetworkStatsManager = mock<NetworkStatsManager> {
+ on { querySummaryForDevice(template, START_TIME, END_TIME) } doReturn BUCKET
+ }
+
+ private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
+ on { getSystemService(NetworkStatsManager::class.java) } doReturn mockNetworkStatsManager
+ }
+
+ private val repository = NetworkStatsRepository(context, template)
+
+ @Test
+ fun querySummaryForDevice() {
+ val bytes = repository.querySummaryForDevice(START_TIME, END_TIME)
+
+ assertThat(bytes).isEqualTo(11)
+ }
+
+ private companion object {
+ const val START_TIME = 1L
+ const val END_TIME = 2L
+
+ val BUCKET = mock<NetworkStats.Bucket> {
+ on { rxBytes } doReturn 1
+ on { txBytes } doReturn 10
+ }
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/network/apn/ApnEditPageProviderTest.kt b/tests/spa_unit/src/com/android/settings/network/apn/ApnEditPageProviderTest.kt
index d744181..20d67fc 100644
--- a/tests/spa_unit/src/com/android/settings/network/apn/ApnEditPageProviderTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/apn/ApnEditPageProviderTest.kt
@@ -17,7 +17,7 @@
package com.android.settings.network.apn
import android.content.Context
-import androidx.compose.runtime.MutableState
+import android.net.Uri
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.test.assertIsDisplayed
@@ -41,6 +41,7 @@
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
@RunWith(AndroidJUnit4::class)
class ApnEditPageProviderTest {
@@ -51,38 +52,35 @@
private val apnName = "apn_name"
private val mmsc = "mmsc"
private val mmsProxy = "mms_proxy"
- private val mnc = "mnc"
private val apnType = "apn_type"
private val apnRoaming = "IPv4"
private val apnEnable = context.resources.getString(R.string.carrier_enabled)
private val apnProtocolOptions =
context.resources.getStringArray(R.array.apn_protocol_entries).toList()
- private val bearer = context.resources.getString(R.string.bearer)
- private val bearerOptions = context.resources.getStringArray(R.array.bearer_entries).toList()
+ private val networkType = context.resources.getString(R.string.network_type)
private val passwordTitle = context.resources.getString(R.string.apn_password)
- private val apnData = mutableStateOf(
- ApnData(
- name = apnName,
- mmsc = mmsc,
- mmsProxy = mmsProxy,
- mnc = mnc,
- apnType = apnType,
- apnRoaming = apnProtocolOptions.indexOf(apnRoaming),
- apnEnable = true
- )
+ private val apnInit = ApnData(
+ name = apnName,
+ mmsc = mmsc,
+ mmsProxy = mmsProxy,
+ apnType = apnType,
+ apnRoaming = apnProtocolOptions.indexOf(apnRoaming),
+ apnEnable = true
)
+ private val apnData = mutableStateOf(
+ apnInit
+ )
+ private val uri = mock<Uri> {}
@Test
fun apnEditPageProvider_name() {
- Truth.assertThat(ApnEditPageProvider.name).isEqualTo("Apn")
+ Truth.assertThat(ApnEditPageProvider.name).isEqualTo("ApnEdit")
}
@Test
fun title_displayed() {
composeTestRule.setContent {
- ApnPage(remember {
- apnData
- })
+ ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onNodeWithText(context.getString(R.string.apn_edit)).assertIsDisplayed()
}
@@ -90,9 +88,7 @@
@Test
fun name_displayed() {
composeTestRule.setContent {
- ApnPage(remember {
- apnData
- })
+ ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onNodeWithText(apnName, true).assertIsDisplayed()
}
@@ -100,9 +96,7 @@
@Test
fun mmsc_displayed() {
composeTestRule.setContent {
- ApnPage(remember {
- apnData
- })
+ ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onRoot().onChild().onChildAt(0)
.performScrollToNode(hasText(mmsc, true))
@@ -112,9 +106,7 @@
@Test
fun mms_proxy_displayed() {
composeTestRule.setContent {
- ApnPage(remember {
- apnData
- })
+ ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onRoot().onChild().onChildAt(0)
.performScrollToNode(hasText(mmsProxy, true))
@@ -122,23 +114,9 @@
}
@Test
- fun mnc_displayed() {
- composeTestRule.setContent {
- ApnPage(remember {
- apnData
- })
- }
- composeTestRule.onRoot().onChild().onChildAt(0)
- .performScrollToNode(hasText(mnc, true))
- composeTestRule.onNodeWithText(mnc, true).assertIsDisplayed()
- }
-
- @Test
fun apn_type_displayed() {
composeTestRule.setContent {
- ApnPage(remember {
- apnData
- })
+ ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onRoot().onChild().onChildAt(0)
.performScrollToNode(hasText(apnType, true))
@@ -148,9 +126,7 @@
@Test
fun apn_roaming_displayed() {
composeTestRule.setContent {
- ApnPage(remember {
- apnData
- })
+ ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onRoot().onChild().onChildAt(0)
.performScrollToNode(hasText(apnRoaming, true))
@@ -160,9 +136,7 @@
@Test
fun carrier_enabled_displayed() {
composeTestRule.setContent {
- ApnPage(remember {
- apnData
- })
+ ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onRoot().onChild().onChildAt(0)
.performScrollToNode(hasText(apnEnable, true))
@@ -172,9 +146,7 @@
@Test
fun carrier_enabled_isChecked() {
composeTestRule.setContent {
- ApnPage(remember {
- apnData
- })
+ ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onRoot().onChild().onChildAt(0)
.performScrollToNode(hasText(apnEnable, true))
@@ -184,9 +156,7 @@
@Test
fun carrier_enabled_checkChanged() {
composeTestRule.setContent {
- ApnPage(remember {
- apnData
- })
+ ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onRoot().onChild().onChildAt(0)
.performScrollToNode(hasText(apnEnable, true))
@@ -195,63 +165,59 @@
}
@Test
- fun bearer_displayed() {
+ fun network_type_displayed() {
composeTestRule.setContent {
- ApnPage(remember {
- apnData
- })
+ ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onRoot().onChild().onChildAt(0)
- .performScrollToNode(hasText(bearer, true))
- composeTestRule.onNodeWithText(bearer, true).assertIsDisplayed()
+ .performScrollToNode(hasText(networkType, true))
+ composeTestRule.onNodeWithText(networkType, true).assertIsDisplayed()
}
@Test
- fun bearer_changed() {
- var apnDataa: MutableState<ApnData> = apnData
+ fun network_type_changed() {
composeTestRule.setContent {
- apnDataa = remember {
- apnData
- }
- ApnPage(apnDataa)
+ ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onRoot().onChild().onChildAt(0)
- .performScrollToNode(hasText(bearer, true))
- composeTestRule.onNodeWithText(bearer, true).performClick()
- composeTestRule.onNodeWithText(bearerOptions[1], true).performClick()
- composeTestRule.onNode(hasText(bearerOptions[0]) and isFocused(), true).assertDoesNotExist()
- composeTestRule.onNode(hasText(bearerOptions[1]) and isFocused(), true).assertIsDisplayed()
+ .performScrollToNode(hasText(networkType, true))
+ composeTestRule.onNodeWithText(networkType, true).performClick()
+ composeTestRule.onNodeWithText(NETWORK_TYPE_LTE, true).performClick()
+ composeTestRule.onNode(hasText(NETWORK_TYPE_UNSPECIFIED) and isFocused(), true)
+ .assertDoesNotExist()
+ composeTestRule.onNode(hasText(NETWORK_TYPE_LTE) and isFocused(), true).assertIsDisplayed()
}
@Test
- fun bearer_changed_back2Default() {
- var apnDataa: MutableState<ApnData> = apnData
+ fun network_type_changed_back2Default() {
composeTestRule.setContent {
- apnDataa = remember {
- apnData
- }
- ApnPage(apnDataa)
+ ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onRoot().onChild().onChildAt(0)
- .performScrollToNode(hasText(bearer, true))
- composeTestRule.onNodeWithText(bearer, true).performClick()
- composeTestRule.onNodeWithText(bearerOptions[1], true).performClick()
- composeTestRule.onNode(hasText(bearerOptions[0]) and isFocused(), true).assertDoesNotExist()
- composeTestRule.onNode(hasText(bearerOptions[1]) and isFocused(), true).assertIsDisplayed()
- composeTestRule.onAllNodesWithText(bearerOptions[1], true).onLast().performClick()
- composeTestRule.onNode(hasText(bearerOptions[0]) and isFocused(), true).assertIsDisplayed()
- composeTestRule.onNode(hasText(bearerOptions[1]) and isFocused(), true).assertDoesNotExist()
+ .performScrollToNode(hasText(networkType, true))
+ composeTestRule.onNodeWithText(networkType, true).performClick()
+ composeTestRule.onNodeWithText(NETWORK_TYPE_LTE, true).performClick()
+ composeTestRule.onNode(hasText(NETWORK_TYPE_UNSPECIFIED) and isFocused(), true)
+ .assertDoesNotExist()
+ composeTestRule.onNode(hasText(NETWORK_TYPE_LTE) and isFocused(), true).assertIsDisplayed()
+ composeTestRule.onAllNodesWithText(NETWORK_TYPE_LTE, true).onLast().performClick()
+ composeTestRule.onNode(hasText(NETWORK_TYPE_UNSPECIFIED) and isFocused(), true)
+ .assertIsDisplayed()
+ composeTestRule.onNode(hasText(NETWORK_TYPE_LTE) and isFocused(), true).assertDoesNotExist()
}
@Test
fun password_displayed() {
composeTestRule.setContent {
- ApnPage(remember {
- apnData
- })
+ ApnPage(apnInit, remember { apnData }, uri)
}
composeTestRule.onRoot().onChild().onChildAt(0)
.performScrollToNode(hasText(passwordTitle, true))
composeTestRule.onNodeWithText(passwordTitle, true).assertIsDisplayed()
}
+
+ private companion object {
+ const val NETWORK_TYPE_UNSPECIFIED = "Unspecified"
+ const val NETWORK_TYPE_LTE = "LTE"
+ }
}
\ No newline at end of file
diff --git a/tests/spa_unit/src/com/android/settings/network/apn/ApnRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/network/apn/ApnRepositoryTest.kt
new file mode 100644
index 0000000..44ec926
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/network/apn/ApnRepositoryTest.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2023 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.network.apn
+
+import android.content.ContentResolver
+import android.content.Context
+import android.database.MatrixCursor
+import android.net.Uri
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+
+@RunWith(AndroidJUnit4::class)
+class ApnRepositoryTest {
+
+ private val context: Context = ApplicationProvider.getApplicationContext()
+ private val mContentResolver = mock<ContentResolver> {}
+ private val uri = mock<Uri> {}
+
+ @Test
+ fun getApnDataFromUri() {
+ // mock out resources and the feature provider
+ val cursor = MatrixCursor(sProjection)
+ cursor.addRow(
+ arrayOf<Any?>(
+ 0,
+ "name",
+ "apn",
+ "proxy",
+ "port",
+ "userName",
+ "server",
+ "passWord",
+ "mmsc",
+ "mmsProxy",
+ "mmsPort",
+ 0,
+ "apnType",
+ "apnProtocol",
+ 0,
+ 0,
+ "apnRoaming",
+ 0,
+ 1,
+ 0
+ )
+ )
+ val context = Mockito.spy(context)
+ whenever(context.contentResolver).thenReturn(mContentResolver)
+ whenever(mContentResolver.query(uri, sProjection, null, null, null)).thenReturn(cursor)
+ assert(getApnDataFromUri(uri, context).name == "name")
+ }
+}
\ No newline at end of file
diff --git a/tests/spa_unit/src/com/android/settings/network/apn/ApnStatusTest.kt b/tests/spa_unit/src/com/android/settings/network/apn/ApnStatusTest.kt
new file mode 100644
index 0000000..539783c
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/network/apn/ApnStatusTest.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2023 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.network.apn
+
+import android.os.PersistableBundle
+import android.telephony.CarrierConfigManager
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+
+@RunWith(AndroidJUnit4::class)
+class ApnStatusTest {
+ private val apnData = mock<ApnData> {
+ on {
+ it.subId
+ } doReturn 1
+ }
+ private val configManager = mock<CarrierConfigManager> {
+ val p = PersistableBundle()
+ p.putBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL, true)
+ on {
+ getConfigForSubId(
+ apnData.subId,
+ CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY,
+ CarrierConfigManager.KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY,
+ CarrierConfigManager.KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY,
+ CarrierConfigManager.Apn.KEY_SETTINGS_DEFAULT_PROTOCOL_STRING,
+ CarrierConfigManager.Apn.KEY_SETTINGS_DEFAULT_ROAMING_PROTOCOL_STRING,
+ CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL
+ )
+ } doReturn p
+ }
+
+ @Test
+ fun getCarrierCustomizedConfig_test() {
+ assert(getCarrierCustomizedConfig(apnData, configManager).isAddApnAllowed)
+ }
+}
\ No newline at end of file
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt
index a6d1531..069145d 100644
--- a/tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.kt
@@ -25,7 +25,7 @@
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.testing.TestLifecycleOwner
import androidx.preference.Preference
-import androidx.preference.PreferenceScreen
+import androidx.preference.PreferenceManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.dx.mockito.inline.extended.ExtendedMockito
@@ -33,45 +33,46 @@
import com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE
import com.android.settings.datausage.DataUsageUtils
import com.android.settings.datausage.lib.DataUsageLib
-import com.android.settingslib.net.DataUsageController
-import com.android.settingslib.net.DataUsageController.DataUsageInfo
+import com.android.settings.datausage.lib.NetworkCycleDataRepository
+import com.android.settings.datausage.lib.NetworkUsageData
import com.android.settingslib.spa.testutils.waitUntil
import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.runBlocking
import org.junit.After
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
-import org.mockito.ArgumentCaptor
-import org.mockito.Mock
-import org.mockito.Mockito.any
-import org.mockito.Mockito.doNothing
-import org.mockito.Mockito.verify
import org.mockito.MockitoSession
-import org.mockito.Spy
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.mockito.kotlin.doNothing
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
import org.mockito.quality.Strictness
-import org.mockito.Mockito.`when` as whenever
@RunWith(AndroidJUnit4::class)
class DataUsagePreferenceControllerTest {
private lateinit var mockSession: MockitoSession
- @Spy
- private val context: Context = ApplicationProvider.getApplicationContext()
+ private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
+ doNothing().whenever(mock).startActivity(any())
+ }
- private lateinit var controller: DataUsagePreferenceController
+ private val preference = Preference(context).apply { key = TEST_KEY }
+ private val preferenceScreen = PreferenceManager(context).createPreferenceScreen(context)
+ private val networkTemplate = mock<NetworkTemplate>()
+ private val repository = mock<NetworkCycleDataRepository> {
+ on { queryUsage(any()) } doReturn NetworkUsageData(START_TIME, END_TIME, 0L)
+ }
- private val preference = Preference(context)
-
- @Mock
- private lateinit var networkTemplate: NetworkTemplate
-
- @Mock
- private lateinit var dataUsageController: DataUsageController
-
- @Mock
- private lateinit var preferenceScreen: PreferenceScreen
+ private val controller = spy(DataUsagePreferenceController(context, TEST_KEY)) {
+ doReturn(repository).whenever(mock).createNetworkCycleDataRepository()
+ }
@Before
fun setUp() {
@@ -85,17 +86,15 @@
whenever(SubscriptionManager.isValidSubscriptionId(SUB_ID)).thenReturn(true)
ExtendedMockito.doReturn(true).`when` { DataUsageUtils.hasMobileData(context) }
- ExtendedMockito.doReturn(networkTemplate)
- .`when` { DataUsageLib.getMobileTemplate(context, SUB_ID) }
- preference.key = TEST_KEY
- whenever(preferenceScreen.findPreference<Preference>(TEST_KEY)).thenReturn(preference)
+ ExtendedMockito.doReturn(networkTemplate).`when` {
+ DataUsageLib.getMobileTemplate(context, SUB_ID)
+ }
- controller =
- DataUsagePreferenceController(context, TEST_KEY).apply {
- init(SUB_ID)
- displayPreference(preferenceScreen)
- dataUsageControllerFactory = { dataUsageController }
- }
+ preferenceScreen.addPreference(preference)
+ controller.apply {
+ init(SUB_ID)
+ displayPreference(preferenceScreen)
+ }
}
@After
@@ -116,26 +115,25 @@
}
@Test
- fun handlePreferenceTreeClick_startActivity() = runTest {
- val usageInfo = DataUsageInfo().apply {
- usageLevel = DataUnit.MEBIBYTES.toBytes(1)
+ fun handlePreferenceTreeClick_startActivity() = runBlocking {
+ val usageData = NetworkUsageData(START_TIME, END_TIME, 1L)
+ repository.stub {
+ on { loadFirstCycle() } doReturn usageData
}
- whenever(dataUsageController.getDataUsageInfo(networkTemplate)).thenReturn(usageInfo)
- doNothing().`when`(context).startActivity(any())
controller.onViewCreated(TestLifecycleOwner(initialState = Lifecycle.State.STARTED))
waitUntil { preference.summary != null }
controller.handlePreferenceTreeClick(preference)
- val captor = ArgumentCaptor.forClass(Intent::class.java)
- verify(context).startActivity(captor.capture())
- val intent = captor.value
+ val intent = argumentCaptor<Intent> {
+ verify(context).startActivity(capture())
+ }.firstValue
assertThat(intent.action).isEqualTo(Settings.ACTION_MOBILE_DATA_USAGE)
assertThat(intent.getIntExtra(Settings.EXTRA_SUB_ID, 0)).isEqualTo(SUB_ID)
}
@Test
- fun updateState_invalidSubId_disabled() = runTest {
+ fun updateState_invalidSubId_disabled() = runBlocking {
controller.init(SubscriptionManager.INVALID_SUBSCRIPTION_ID)
controller.onViewCreated(TestLifecycleOwner(initialState = Lifecycle.State.STARTED))
@@ -144,9 +142,11 @@
}
@Test
- fun updateState_noUsageData_shouldDisablePreference() = runTest {
- val usageInfo = DataUsageInfo()
- whenever(dataUsageController.getDataUsageInfo(networkTemplate)).thenReturn(usageInfo)
+ fun updateState_noUsageData_shouldDisablePreference() = runBlocking {
+ val usageData = NetworkUsageData(START_TIME, END_TIME, 0L)
+ repository.stub {
+ on { loadFirstCycle() } doReturn usageData
+ }
controller.onViewCreated(TestLifecycleOwner(initialState = Lifecycle.State.STARTED))
@@ -154,11 +154,11 @@
}
@Test
- fun updateState_shouldUseIecUnit() = runTest {
- val usageInfo = DataUsageInfo().apply {
- usageLevel = DataUnit.MEBIBYTES.toBytes(1)
+ fun updateState_shouldUseIecUnit() = runBlocking {
+ val usageData = NetworkUsageData(START_TIME, END_TIME, DataUnit.MEBIBYTES.toBytes(1))
+ repository.stub {
+ on { loadFirstCycle() } doReturn usageData
}
- whenever(dataUsageController.getDataUsageInfo(networkTemplate)).thenReturn(usageInfo)
controller.onViewCreated(TestLifecycleOwner(initialState = Lifecycle.State.STARTED))
@@ -168,5 +168,7 @@
private companion object {
const val TEST_KEY = "test_key"
const val SUB_ID = 2
+ const val START_TIME = 10L
+ const val END_TIME = 30L
}
}
diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppDataUsagePreferenceTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppDataUsagePreferenceTest.kt
index 019c143..f70f5d5 100644
--- a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppDataUsagePreferenceTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppDataUsagePreferenceTest.kt
@@ -38,8 +38,9 @@
import com.android.settings.Utils
import com.android.settings.applications.appinfo.AppInfoDashboardFragment
import com.android.settings.datausage.AppDataUsage
-import com.android.settingslib.net.NetworkCycleDataForUid
-import com.android.settingslib.net.NetworkCycleDataForUidLoader
+import com.android.settings.datausage.lib.IAppDataUsageSummaryRepository
+import com.android.settings.datausage.lib.INetworkTemplates
+import com.android.settings.datausage.lib.NetworkUsageData
import com.android.settingslib.spa.testutils.delay
import com.android.settingslib.spa.testutils.waitUntilExists
import org.junit.After
@@ -47,11 +48,7 @@
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
-import org.mockito.Mock
-import org.mockito.Mockito.mock
-import org.mockito.Mockito.verify
import org.mockito.MockitoSession
-import org.mockito.Spy
import org.mockito.quality.Strictness
import org.mockito.Mockito.`when` as whenever
@@ -62,28 +59,26 @@
private lateinit var mockSession: MockitoSession
- @Spy
private val context: Context = ApplicationProvider.getApplicationContext()
- @Mock
- private lateinit var builder: NetworkCycleDataForUidLoader.Builder<NetworkCycleDataForUidLoader>
+ private var networkUsageData: NetworkUsageData? = null
- @Mock
- private lateinit var loader: NetworkCycleDataForUidLoader
+ private inner class TestRepository : IAppDataUsageSummaryRepository {
+ override suspend fun querySummary(uid: Int): NetworkUsageData? = when (uid) {
+ UID -> networkUsageData
+ else -> null
+ }
+ }
@Before
fun setUp() {
mockSession = mockitoSession()
.initMocks(this)
.mockStatic(Utils::class.java)
- .mockStatic(NetworkCycleDataForUidLoader::class.java)
- .mockStatic(NetworkTemplate::class.java)
.mockStatic(AppInfoDashboardFragment::class.java)
.strictness(Strictness.LENIENT)
.startMocking()
whenever(Utils.isBandwidthControlEnabled()).thenReturn(true)
- whenever(NetworkCycleDataForUidLoader.builder(context)).thenReturn(builder)
- whenever(builder.build()).thenReturn(loader)
}
@After
@@ -106,7 +101,7 @@
setContent(notInstalledApp)
- composeTestRule.onNodeWithText(context.getString(R.string.data_usage_app_summary_title))
+ composeTestRule.onNodeWithText(context.getString(R.string.cellular_data_usage))
.assertIsDisplayed()
.assertIsNotEnabled()
}
@@ -115,22 +110,14 @@
fun whenAppInstalled_enabled() {
setContent(APP)
- composeTestRule.onNodeWithText(context.getString(R.string.data_usage_app_summary_title))
+ composeTestRule.onNodeWithText(context.getString(R.string.cellular_data_usage))
.assertIsDisplayed()
.assertIsEnabled()
}
@Test
- fun setCorrectValuesForBuilder() {
- setContent()
-
- verify(builder).setRetrieveDetail(false)
- verify(builder).addUid(UID)
- }
-
- @Test
fun whenNoDataUsage() {
- whenever(loader.loadInBackground()).thenReturn(emptyList())
+ networkUsageData = null
setContent()
@@ -139,10 +126,11 @@
@Test
fun whenHasDataUsage() {
- val cycleData = mock(NetworkCycleDataForUid::class.java)
- whenever(cycleData.totalUsage).thenReturn(123)
- whenever(cycleData.startTime).thenReturn(1666666666666)
- whenever(loader.loadInBackground()).thenReturn(listOf(cycleData))
+ networkUsageData = NetworkUsageData(
+ startTime = 1666666666666L,
+ endTime = 1666666666666L,
+ usage = 123L,
+ )
setContent()
@@ -151,8 +139,6 @@
@Test
fun whenClick_startActivity() {
- whenever(loader.loadInBackground()).thenReturn(emptyList())
-
setContent()
composeTestRule.onRoot().performClick()
@@ -169,14 +155,21 @@
private fun setContent(app: ApplicationInfo = APP) {
composeTestRule.setContent {
CompositionLocalProvider(LocalContext provides context) {
- AppDataUsagePreference(app)
+ AppDataUsagePreference(app, TestNetworkTemplates) { _, _ ->
+ TestRepository()
+ }
}
}
composeTestRule.delay()
}
+ private object TestNetworkTemplates : INetworkTemplates {
+ override fun getDefaultTemplate(context: Context): NetworkTemplate =
+ NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE).build()
+ }
+
private companion object {
- const val PACKAGE_NAME = "packageName"
+ const val PACKAGE_NAME = "package.name"
const val UID = 123
val APP = ApplicationInfo().apply {
packageName = PACKAGE_NAME
diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp
index 407b5ec..f149519 100644
--- a/tests/uitests/Android.bp
+++ b/tests/uitests/Android.bp
@@ -47,7 +47,7 @@
"settings-helper",
"sysui-helper",
"timeresult-helper-lib",
- "truth-prebuilt",
+ "truth",
],
//sdk_version: "current",
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 1b14a73..0f045a8 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -27,7 +27,7 @@
"mockito-target-minus-junit4",
"platform-test-annotations",
"platform-test-rules",
- "truth-prebuilt",
+ "truth",
"kotlinx_coroutines_test",
"flag-junit",
"Settings-testutils2",
@@ -36,7 +36,7 @@
],
errorprone: {
- javacflags: ["-Xep:CheckReturnValue:WARN"]
+ javacflags: ["-Xep:CheckReturnValue:WARN"],
},
// Include all test java/kotlin files.
srcs: [
diff --git a/tests/unit/src/com/android/settings/applications/appcompat/UserAspectRatioManagerTest.java b/tests/unit/src/com/android/settings/applications/appcompat/UserAspectRatioManagerTest.java
index 61c4507..cf2a1f0 100644
--- a/tests/unit/src/com/android/settings/applications/appcompat/UserAspectRatioManagerTest.java
+++ b/tests/unit/src/com/android/settings/applications/appcompat/UserAspectRatioManagerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.applications.appcompat;
import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_16_9;
-import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_4_3;
import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_FULLSCREEN;
import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_SPLIT_SCREEN;
import static android.content.pm.PackageManager.USER_MIN_ASPECT_RATIO_UNSET;
@@ -243,9 +242,6 @@
assertThat(mUtils.getUserMinAspectRatioEntry(USER_MIN_ASPECT_RATIO_SPLIT_SCREEN,
mPackageName)).isEqualTo(ResourcesUtils.getResourcesString(mContext,
"user_aspect_ratio_half_screen"));
- // R,string.user_aspect_ratio_4_3
- assertThat(mUtils.getUserMinAspectRatioEntry(USER_MIN_ASPECT_RATIO_4_3, mPackageName))
- .isEqualTo(ResourcesUtils.getResourcesString(mContext, "user_aspect_ratio_4_3"));
assertThat(mUtils.getUserMinAspectRatioEntry(USER_MIN_ASPECT_RATIO_FULLSCREEN,
mPackageName)).isEqualTo(ResourcesUtils.getResourcesString(mContext,
"user_aspect_ratio_fullscreen"));
diff --git a/tests/unit/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/unit/src/com/android/settings/datausage/AppPrefLoaderTest.java
deleted file mode 100644
index 902906c..0000000
--- a/tests/unit/src/com/android/settings/datausage/AppPrefLoaderTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2020 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.datausage;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.graphics.drawable.Drawable;
-import android.util.ArraySet;
-
-import androidx.preference.Preference;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-@RunWith(AndroidJUnit4.class)
-public class AppPrefLoaderTest {
-
- @Mock
- private PackageManager mPackageManager;
-
- private AppPrefLoader mLoader;
-
- @Before
- public void setUp() throws Exception {
- MockitoAnnotations.initMocks(this);
- final ArraySet<String> pkgs = new ArraySet<>(2);
- pkgs.add("pkg0");
- pkgs.add("pkg1");
- mLoader = new AppPrefLoader(
- ApplicationProvider.getApplicationContext(), pkgs, mPackageManager);
- }
-
- @Test
- public void loadInBackground_packageNotFound_shouldReturnEmptySet()
- throws NameNotFoundException {
- when(mPackageManager.getApplicationInfo(anyString(), anyInt()))
- .thenThrow(new NameNotFoundException());
-
- assertThat(mLoader.loadInBackground()).isEmpty();
- }
-
- @Test
- public void loadInBackground_shouldReturnPreference() throws NameNotFoundException {
- ApplicationInfo info = mock(ApplicationInfo.class);
- when(mPackageManager.getApplicationInfo(anyString(), anyInt())).thenReturn(info);
- final Drawable drawable = mock(Drawable.class);
- final String label = "Label1";
- when(info.loadIcon(mPackageManager)).thenReturn(drawable);
- when(info.loadLabel(mPackageManager)).thenReturn(label);
-
- Preference preference = mLoader.loadInBackground().valueAt(0);
- assertThat(preference.getTitle()).isEqualTo(label);
- assertThat(preference.getIcon()).isEqualTo(drawable);
- assertThat(preference.isSelectable()).isFalse();
- }
-}
diff --git a/tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java b/tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java
index 4aa38ae..a402d91 100644
--- a/tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java
+++ b/tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java
@@ -24,6 +24,8 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.eq;
@@ -472,4 +474,27 @@
SystemProperties.removeChangeCallback(propertyChangeSignal1.getCountDownJob());
SystemProperties.removeChangeCallback(propertyChangeSignal2.getCountDownJob());
}
+
+ @Test
+ public void updateState_DeveloperOptionPropertyIsFalse() {
+ // Test that when debug.graphics.angle.developeroption.enable is false:
+ when(mSystemPropertiesMock.getBoolean(eq(PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION),
+ anyBoolean())).thenReturn(false);
+ when(mSystemPropertiesMock.get(eq(PROPERTY_RO_GFX_ANGLE_SUPPORTED), any()))
+ .thenReturn("true");
+
+ // 1. "Enable ANGLE" switch is on, the switch should be enabled.
+ when(mSystemPropertiesMock.get(eq(PROPERTY_PERSISTENT_GRAPHICS_EGL), any()))
+ .thenReturn(ANGLE_DRIVER_SUFFIX);
+ mController.updateState(mPreference);
+ assertTrue(mPreference.isChecked());
+ assertTrue(mPreference.isEnabled());
+
+ // 2. "Enable ANGLE" switch is off, the switch should be disabled.
+ when(mSystemPropertiesMock.get(eq(PROPERTY_PERSISTENT_GRAPHICS_EGL), any()))
+ .thenReturn("");
+ mController.updateState(mPreference);
+ assertFalse(mPreference.isChecked());
+ assertFalse(mPreference.isEnabled());
+ }
}