Merge "Renaming gesture"
diff --git a/res/drawable-hdpi/ic_grayedout_printer.png b/res/drawable-hdpi/ic_grayedout_printer.png
deleted file mode 100644
index 5e54970..0000000
--- a/res/drawable-hdpi/ic_grayedout_printer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_grayedout_printer.png b/res/drawable-mdpi/ic_grayedout_printer.png
deleted file mode 100644
index 5e54970..0000000
--- a/res/drawable-mdpi/ic_grayedout_printer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_grayedout_printer.png b/res/drawable-xhdpi/ic_grayedout_printer.png
deleted file mode 100644
index 5e54970..0000000
--- a/res/drawable-xhdpi/ic_grayedout_printer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/drag_handle.xml b/res/drawable/drag_handle.xml
index 835ac5b..1e3efeb 100644
--- a/res/drawable/drag_handle.xml
+++ b/res/drawable/drag_handle.xml
@@ -15,13 +15,13 @@
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
android:width="24dp"
- android:viewportHeight="48"
- android:viewportWidth="48"
- android:tint="@color/material_grey_600">
-
- <path android:fillColor="@android:color/white"
- android:pathData="M6,30h36v-4L6,26v4zM6,38h36v-4L6,34v4zM6,22h36L42,18L6,18v4zM6,10v4h36L42,10L6,10z" />
-
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z"/>
</vector>
+
diff --git a/res/drawable/ic_add.xml b/res/drawable/ic_add.xml
deleted file mode 100644
index e4ced7d..0000000
--- a/res/drawable/ic_add.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- Copyright (C) 2015 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:viewportWidth="48.0"
- android:viewportHeight="48.0">
- <path
- android:fillColor="?android:attr/colorControlNormal"
- android:pathData="M38.0,26.0L26.0,26.0l0.0,12.0l-4.0,0.0L22.0,26.0L10.0,26.0l0.0,-4.0l12.0,0.0L22.0,10.0l4.0,0.0l0.0,12.0l12.0,0.0l0.0,4.0z"/>
-</vector>
diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml
index f87a882..7196981 100644
--- a/res/drawable/ic_add_24dp.xml
+++ b/res/drawable/ic_add_24dp.xml
@@ -21,5 +21,6 @@
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+ android:pathData="M20,13h-7v7h-2v-7H4v-2h7V4h2v7h7V13z"/>
</vector>
+
diff --git a/res/drawable/ic_airplane.xml b/res/drawable/ic_airplane.xml
deleted file mode 100644
index b3e0ba0..0000000
--- a/res/drawable/ic_airplane.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2015 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:name="root"
- android:alpha="1.0"
- android:height="48dp"
- android:width="48dp"
- android:viewportHeight="48"
- android:viewportWidth="48" >
- <group
- android:name="ic_signal_airplane"
- android:translateX="21.9995"
- android:translateY="25.73401" >
- <group
- android:name="ic_signal_airplane_pivot"
- android:translateX="-23.21545"
- android:translateY="-18.86649" >
- <clip-path
- android:name="mask"
- android:pathData="M 37.8337860107,-40.4599914551 c 0.0,0.0 -35.8077850342,31.5523681641 -35.8077850342,31.5523681641 c 0.0,0.0 9.55097961426,9.55285644531 9.55097961426,9.55285644531 c 0.0,0.0 -2.61698913574,2.09387207031 -2.61698913574,2.09387207031 c 0.0,0.0 -9.75096130371,-9.56428527832 -9.75096130371,-9.56428527832 c 0.0,0.0 -34.6200408936,25.4699249268 -34.6200408936,25.4699249268 c 0.0,0.0 55.9664764404,69.742401123 55.9664764404,69.742401123 c 0.0,0.0 73.2448120117,-59.1047973633 73.2448120117,-59.1047973633 c 0.0,0.0 -55.9664916992,-69.7423400879 -55.9664916992,-69.7423400879 Z" />
- <group
- android:name="cross" >
- <path
- android:name="cross_1"
- android:pathData="M 7.54049682617,3.9430847168 c 0.0,0.0 0.324981689453,0.399978637695 0.324981689453,0.399978637695 "
- android:strokeColor="#FFFFFFFF"
- android:strokeAlpha="0"
- android:strokeWidth="3.5"
- android:fillColor="#00000000" />
- </group>
- <group
- android:name="plane"
- android:translateX="23.481"
- android:translateY="18.71151" >
- <path
- android:name="plane_1"
- android:pathData="M 18.9439849854,7.98849487305 c 0.0,0.0 0.0,-4.0 0.0,-4.0 c 0.0,0.0 -16.0,-10.0 -16.0,-10.0 c 0.0,0.0 0.0,-11.0 0.0,-11.0 c 0.0,-1.70001220703 -1.30000305176,-3.0 -3.0,-3.0 c -1.69999694824,0.0 -3.0,1.29998779297 -3.0,3.0 c 0.0,0.0 0.0,11.0 0.0,11.0 c 0.0,0.0 -16.0,10.0 -16.0,10.0 c 0.0,0.0 0.0,4.0 0.0,4.0 c 0.0,0.0 16.0,-5.0 16.0,-5.0 c 0.0,0.0 0.0,11.0 0.0,11.0 c 0.0,0.0 -4.0,3.0 -4.0,3.0 c 0.0,0.0 0.0,3.0 0.0,3.0 c 0.0,0.0 7.0,-2.0 7.0,-2.0 c 0.0,0.0 7.0,2.0 7.0,2.0 c 0.0,0.0 0.0,-3.0 0.0,-3.0 c 0.0,0.0 -4.0,-3.0 -4.0,-3.0 c 0.0,0.0 0.0,-11.0 0.0,-11.0 c 0.0,0.0 16.0,5.0 16.0,5.0 Z"
- android:fillColor="#FFFFFFFF"
- android:fillAlpha="1" />
- </group>
- </group>
- </group>
-</vector>
diff --git a/res/drawable/ic_arrow_down_24dp.xml b/res/drawable/ic_arrow_down_24dp.xml
deleted file mode 100644
index f334902..0000000
--- a/res/drawable/ic_arrow_down_24dp.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
- android:tint="?android:attr/colorAccent">
- <path
- android:fillColor="#FF000000"
- android:pathData="M8.12 9.29L12 13.17l3.88-3.88a.996 .996 0 1 1 1.41 1.41l-4.59 4.59a.996 .996 0 0
-1-1.41 0L6.7 10.7a.996 .996 0 0 1 0-1.41c.39-.38 1.03-.39 1.42 0z"/>
-</vector>
diff --git a/res/drawable/ic_cellular_off.xml b/res/drawable/ic_cellular_off.xml
index 4f767cf..76dbed5 100644
--- a/res/drawable/ic_cellular_off.xml
+++ b/res/drawable/ic_cellular_off.xml
@@ -14,15 +14,19 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
android:autoMirrored="true"
- android:width="17dp"
- android:height="17dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ android:tint="?android:attr/colorAccent">
<path
android:fillColor="#FF000000"
- android:pathData="M22.32,16.05l-1.45,1.45l1.45,1.45c0.38,0.38 0.38,0.99 0,1.37c-0.38,0.38 -0.99,0.38 -1.37,0l-1.44,-1.44l-1.45,1.45c-0.38,0.38 -0.99,0.38 -1.37,0l-0.01,-0.01c-0.38,-0.38 -0.38,-0.99 0,-1.37c0,0 0,0 0,0l1.45,-1.45l-1.45,-1.45c-0.38,-0.38 -0.38,-0.99 0,-1.37c0,0 0,0 0,0l0.01,-0.01c0.38,-0.38 0.99,-0.38 1.37,0l1.45,1.45l1.44,-1.44c0.38,-0.38 0.99,-0.38 1.37,0C22.7,15.06 22.7,15.67 22.32,16.05z"/>
+ android:pathData="M21.19,21.19l-2.69,-2.69l-1.41,-1.41l-1.09,-1.09l-2,-2l-4,-4l-2,-2l-5.19,-5.19l-1.42,1.41l6.61,6.61l0,2.17l2.17,0l3.83,3.83l0,1.34l-2.59,-2.58l-1.41,1.41l5,5l2.09,-2.09l2.69,2.7z"/>
<path
android:fillColor="#FF000000"
- android:pathData="M22,12V3.8c0,-0.71 -0.87,-1.08 -1.38,-0.57L3.24,20.62C2.73,21.13 3.09,22 3.8,22H14V12H22z"/>
+ android:pathData="M14,11.17l2,2l0,-2.17l-2,0z"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M10,5.83l2.59,2.58l1.41,-1.41l-5,-5l-2.09,2.09l3.09,3.08z"/>
</vector>
diff --git a/res/drawable/ic_data_saver.xml b/res/drawable/ic_data_saver.xml
index d2d55a9..aefcd84 100644
--- a/res/drawable/ic_data_saver.xml
+++ b/res/drawable/ic_data_saver.xml
@@ -14,12 +14,20 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
+ android:width="24dp"
+ android:height="24dp"
+ android:autoMirrored="true"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M18.32,16.75l1.32,0.76c0.26,0.15 0.34,0.51 0.15,0.74 -2.09,2.6 -5.44,4.14 -9.14,3.65 -4.4,-0.58 -7.96,-4.12 -8.56,-8.52C1.34,7.8 5.21,2.95 10.43,2.12c0.3,-0.05 0.57,0.2 0.57,0.5v1.53c0,0.24 -0.18,0.44 -0.41,0.49 -3.6,0.69 -6.29,3.95 -6.07,7.79 0.21,3.82 3.43,6.95 7.25,7.07 2.37,0.08 4.51,-0.96 5.93,-2.63a0.48,0.48 0,0 1,0.62 -0.12zM19.5,12c0,0.83 -0.14,1.63 -0.39,2.38 -0.08,0.23 0.01,0.47 0.21,0.59l1.33,0.77c0.26,0.15 0.61,0.04 0.72,-0.24 0.4,-1.09 0.63,-2.27 0.63,-3.5 0,-4.99 -3.65,-9.12 -8.43,-9.88 -0.3,-0.04 -0.57,0.2 -0.57,0.5v1.53c0,0.24 0.18,0.44 0.41,0.48 3.46,0.68 6.09,3.72 6.09,7.37z" />
+ android:pathData="M11,8l0,3l-3,0l0,2l3,0l0,3l2,0l0,-3l3,0l0,-2l-3,0l0,-3z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M13,2.05v3.03c3.39,0.49 6,3.39 6,6.92c0,0.9 -0.18,1.75 -0.48,2.54l2.6,1.53C21.68,14.83 22,13.45 22,12C22,6.82 18.05,2.55 13,2.05z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M12,19c-3.87,0 -7,-3.13 -7,-7c0,-3.53 2.61,-6.43 6,-6.92V2.05C5.94,2.55 2,6.81 2,12c0,5.52 4.47,10 9.99,10c3.31,0 6.24,-1.61 8.06,-4.09l-2.6,-1.53C16.17,17.98 14.21,19 12,19z"/>
</vector>
+
diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml
index b40aceb..c7b6cf2 100644
--- a/res/drawable/ic_devices_other.xml
+++ b/res/drawable/ic_devices_other.xml
@@ -16,16 +16,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
+ android:autoMirrored="true"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
<path
- android:fillColor="#FFFFFFFF"
- android:pathData="M3,6h17c0.55,0,1-0.45,1-1v0c0-0.55-0.45-1-1-1H3C1.9,4,1,4.9,1,6v12c0,1.1,0.9,2,2,2h3c0.55,0,1-0.45,1-1v0
- c0-0.55-0.45-1-1-1H3V6z
- M13,12H9v1.78C8.39,14.33,8,15.11,8,16c0,0.89,0.39,1.67,1,2.22V20h4v-1.78c0.61-0.55,1-1.34,1-2.22
- s-0.39-1.67-1-2.22V12z
- M11,17.5c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5S11.83,17.5,11,17.5z
- M22,8h-6
- c-0.5,0-1,0.5-1,1v10c0,0.5,0.5,1,1,1h6c0.5,0,1-0.5,1-1V9C23,8.5,22.5,8,22,8z
- M21,18h-4v-8h4V18z" />
+ android:fillColor="@android:color/white"
+ android:pathData="M3,6h18V4H3C1.9,4 1,4.9 1,6v12c0,1.1 0.9,2 2,2h4v-2H3V6zM13,12H9v1.78C8.39,14.33 8,15.11 8,16c0,0.89 0.39,1.67 1,2.22V20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22V12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5S11.83,17.5 11,17.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1V9C23,8.5 22.5,8 22,8zM21,18h-4v-8h4V18z"/>
</vector>
+
diff --git a/res/drawable/ic_devices_other_black.xml b/res/drawable/ic_devices_other_black.xml
index babcc63..926f02c 100644
--- a/res/drawable/ic_devices_other_black.xml
+++ b/res/drawable/ic_devices_other_black.xml
@@ -19,12 +19,7 @@
android:width="24dp"
android:height="24dp"
android:tint="?android:attr/colorControlNormal">
- <path android:fillColor="#FF000000"
- android:pathData="M3 6h18V4H3C1.9 4 1 4.9 1 6v12c0 1.10.9 2 2 2h4v-2H3V6z M13 12H9
- v1.78C8.39 14.33 8 15.11 8 16c0 0.89 0.39 1.67 1 2.22 V20h4v-1.78c0.61-0.55 1-1.34
- 1-2.22s-0.39-1.67-1-2.22V12z M11 17.5c-0.83 0-1.5-0.67-1.5-1.5s0.67-1.5 1.5-1.5s1.5
- 0.67 1.5 1.5 S11.83 17.5 11 17.5z M22 8h-6c-0.5 0-1 0.5-1 1v10c0 0.5 0.5 1 1
- 1h6c0.5 0 1-0.5 1-1V9C23 8.5 22.5 8 22 8z M21 18h-4v-8h4V18z" />
- <path android:fillColor="#00000000"
- android:pathData="M0 0h24v24H0V0z"/>
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M3,6h18V4H3C1.9,4 1,4.9 1,6v12c0,1.1 0.9,2 2,2h4v-2H3V6zM13,12H9v1.78C8.39,14.33 8,15.11 8,16c0,0.89 0.39,1.67 1,2.22V20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22V12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5S11.83,17.5 11,17.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1V9C23,8.5 22.5,8 22,8zM21,18h-4v-8h4V18z"/>
</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_info_outline_24dp.xml b/res/drawable/ic_info_outline_24dp.xml
index 3d8b89f..634d797 100644
--- a/res/drawable/ic_info_outline_24dp.xml
+++ b/res/drawable/ic_info_outline_24dp.xml
@@ -17,8 +17,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:tint="?android:attr/textColorSecondary">
<path
android:fillColor="#FF000000"
diff --git a/res/drawable/ic_local_phone_24_lib.xml b/res/drawable/ic_local_phone_24_lib.xml
index 4574802..094e0bd 100644
--- a/res/drawable/ic_local_phone_24_lib.xml
+++ b/res/drawable/ic_local_phone_24_lib.xml
@@ -16,13 +16,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
- android:viewportWidth="24"
+ android:tint="?android:attr/colorControlNormal"
android:viewportHeight="24"
- android:tint="?android:attr/colorControlNormal">
+ android:viewportWidth="24">
<path
android:fillColor="#000000"
- android:pathData="M16.01,14.48l-2.62,2.62c-2.75-1.49-5.01-3.75-6.5-6.5l2.62-2.62c0.24-0.24,0.34-0.58,0.27-0.9L9.13,3.82 c-0.09-0.47-0.5-0.8-0.98-0.8L4,3.01c-0.56,0-1.03,0.47-1,1.03c0.17,2.91,1.04,5.63,2.43,8.01c1.57,2.69,3.81,4.93,6.5,6.5 c2.38,1.39,5.1,2.26,8.01,2.43c0.56,0.03,1.03-0.44,1.03-1l0-4.15c0-0.48-0.34-0.89-0.8-0.98l-3.26-0.65 C16.58,14.14,16.24,14.24,16.01,14.48z" />
- <path
- android:pathData="M0,0h24v24H0V0z" />
+ android:pathData="M16.01,14.46l-2.62,2.62c-2.75,-1.49 -5.01,-3.75 -6.5,-6.5l2.62,-2.62c0.24,-0.24 0.34,-0.58 0.27,-0.9L9.13,3.8C9.04,3.34 8.63,3 8.15,3L4,3C3.44,3 2.97,3.47 3,4.03c0.17,2.91 1.04,5.63 2.43,8.01c1.57,2.69 3.81,4.93 6.5,6.5c2.38,1.39 5.1,2.26 8.01,2.43c0.56,0.03 1.03,-0.44 1.03,-1l0,-4.15c0,-0.48 -0.34,-0.89 -0.8,-0.98l-3.26,-0.65C16.58,14.12 16.24,14.23 16.01,14.46z"/>
</vector>
diff --git a/res/drawable/ic_search_24dp.xml b/res/drawable/ic_search_24dp.xml
index 8f14e88..d63711a 100644
--- a/res/drawable/ic_search_24dp.xml
+++ b/res/drawable/ic_search_24dp.xml
@@ -16,15 +16,12 @@
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24"
- android:tint="?android:attr/colorControlNormal">
-
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?android:attr/colorControlNormal">
<path
- android:fillColor="#000000"
- android:pathData="M15.5,14h-0.79l-0.28-0.27c1.2-1.4,1.82-3.31,1.48-5.34c-0.47-2.78-2.79-5-5.59-5.34c-4.23-0.52-7.79,3.04-7.27,7.27
-c0.34,2.8,2.56,5.12,5.34,5.59c2.03,0.34,3.94-0.28,5.34-1.48L14,14.71v0.79l5.2,5.19c0.41,0.41,1.07,0.41,1.48,0l0.01-0.01
-c0.41-0.41,0.41-1.07,0-1.48L15.5,14z M9.5,14C7.01,14,5,11.99,5,9.5S7.01,5,9.5,5S14,7.01,14,9.5S11.99,14,9.5,14z" />
-</vector>
\ No newline at end of file
+ android:fillColor="#FF000000"
+ android:pathData="M20.49,19l-5.73,-5.73C15.53,12.2 16,10.91 16,9.5C16,5.91 13.09,3 9.5,3S3,5.91 3,9.5C3,13.09 5.91,16 9.5,16c1.41,0 2.7,-0.47 3.77,-1.24L19,20.49L20.49,19zM5,9.5C5,7.01 7.01,5 9.5,5S14,7.01 14,9.5S11.99,14 9.5,14S5,11.99 5,9.5z"/>
+</vector>
diff --git a/res/drawable/ic_settings_night_display.xml b/res/drawable/ic_settings_night_display.xml
index 178b131..3292ed4 100644
--- a/res/drawable/ic_settings_night_display.xml
+++ b/res/drawable/ic_settings_night_display.xml
@@ -14,12 +14,12 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
- android:tint="?android:attr/colorControlNormal">
+ android:width="24dp"
+ android:height="24dp"
+ android:tint="?android:attr/colorControlNormal"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
<path
- android:fillColor="#FFF"
- android:pathData="M13,12c0,-3.57 2.2,-6.62 5.31,-7.87 0.89,-0.36 0.75,-1.69 -0.19,-1.9 -1.1,-0.24 -2.27,-0.3 -3.48,-0.14 -4.51,0.6 -8.12,4.31 -8.59,8.83C5.43,16.93 10.12,22 16,22c0.73,0 1.43,-0.08 2.12,-0.23 0.95,-0.21 1.1,-1.53 0.2,-1.9A8.471,8.471 0,0 1,13 12z" />
-</vector>
\ No newline at end of file
+ android:fillColor="#FF000000"
+ android:pathData="M15.5,22c1.05,0 2.05,-0.16 3,-0.46c-4.06,-1.27 -7,-5.06 -7,-9.54s2.94,-8.27 7,-9.54C17.55,2.16 16.55,2 15.5,2c-5.52,0 -10,4.48 -10,10S9.98,22 15.5,22L15.5,22z"/>
+</vector>
diff --git a/res/drawable/ic_settings_security.xml b/res/drawable/ic_settings_security.xml
index 055babc..6065dd9 100644
--- a/res/drawable/ic_settings_security.xml
+++ b/res/drawable/ic_settings_security.xml
@@ -14,12 +14,15 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H9V6zM18,20H6V10h12V20zM12,17c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2C10,16.1 10.9,17 12,17z"/>
-</vector>
+ android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v0h2v0c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM18,20H6V10h12V20z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_security_white.xml b/res/drawable/ic_settings_security_white.xml
index 544ebef..1779402 100644
--- a/res/drawable/ic_settings_security_white.xml
+++ b/res/drawable/ic_settings_security_white.xml
@@ -14,11 +14,15 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H9V6zM18,20H6V10h12V20zM12,17c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2C10,16.1 10.9,17 12,17z"/>
+ android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v0h2v0c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM18,20H6V10h12V20z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
</vector>
+
diff --git a/res/drawable/ic_settings_wireless.xml b/res/drawable/ic_settings_wireless.xml
index 0c894eb..f9b4bbc 100644
--- a/res/drawable/ic_settings_wireless.xml
+++ b/res/drawable/ic_settings_wireless.xml
@@ -21,5 +21,5 @@
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M23.66,8.11c0.39,-0.48 0.29,-1.19 -0.22,-1.54C21.67,5.36 17.55,3 12,3 6.44,3 2.33,5.36 0.56,6.57c-0.51,0.35 -0.61,1.06 -0.23,1.54L11.16,21.6c0.42,0.53 1.23,0.53 1.66,0L23.66,8.11z"/>
+ android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3l3,-3C13.35,15.34 10.66,15.34 9,17zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
</vector>
diff --git a/res/drawable/ic_settings_wireless_white.xml b/res/drawable/ic_settings_wireless_white.xml
index 8dedb0d..3271b8b 100644
--- a/res/drawable/ic_settings_wireless_white.xml
+++ b/res/drawable/ic_settings_wireless_white.xml
@@ -20,5 +20,5 @@
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M23.66,8.11c0.39,-0.48 0.29,-1.19 -0.22,-1.54C21.67,5.36 17.55,3 12,3 6.44,3 2.33,5.36 0.56,6.57c-0.51,0.35 -0.61,1.06 -0.23,1.54L11.16,21.6c0.42,0.53 1.23,0.53 1.66,0L23.66,8.11z"/>
+ android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3l3,-3C13.35,15.34 10.66,15.34 9,17zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
</vector>
diff --git a/res/drawable/ic_sync.xml b/res/drawable/ic_sync.xml
index 45a2dbd..ed16b03 100644
--- a/res/drawable/ic_sync.xml
+++ b/res/drawable/ic_sync.xml
@@ -16,10 +16,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
android:tint="?android:attr/colorControlNormal">
<path
- android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"
- android:fillColor="#FFFFFFFF"/>
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M17.26,6H19V4h-6v0.07V10h2V6.81c1.79,1.04 3,2.97 3,5.19c0,2.97 -2.17,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93C20,9.6 18.93,7.46 17.26,6z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M4,12c0,2.4 1.07,4.54 2.74,6H5v2h6v-0.07V14H9v3.19C7.21,16.15 6,14.22 6,12c0,-2.97 2.17,-5.43 5,-5.91V4.07C7.05,4.56 4,7.92 4,12z"/>
</vector>
diff --git a/res/drawable/ic_wallpaper.xml b/res/drawable/ic_wallpaper.xml
index 20da9c3..d0fc6be 100644
--- a/res/drawable/ic_wallpaper.xml
+++ b/res/drawable/ic_wallpaper.xml
@@ -14,12 +14,12 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#FF000000"
- android:pathData="M4.0,4.0l7.0,0.0L11.0,2.0L4.0,2.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,7.0l2.0,0.0L4.0,4.0zm6.0,9.0l-4.0,5.0l12.0,0.0l-3.0,-4.0 -2.03,2.71L10.0,13.0zm7.0,-4.5c0.0,-0.83 -0.67,-1.5 -1.5,-1.5S14.0,7.67 14.0,8.5s0.67,1.5 1.5,1.5S17.0,9.33 17.0,8.5zM20.0,2.0l-7.0,0.0l0.0,2.0l7.0,0.0l0.0,7.0l2.0,0.0L22.0,4.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm0.0,18.0l-7.0,0.0l0.0,2.0l7.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0l0.0,-7.0l-2.0,0.0l0.0,7.0zM4.0,13.0L2.0,13.0l0.0,7.0c0.0,1.0 0.9,2.0 2.0,2.0l7.0,0.0l0.0,-2.0L4.0,20.0l0.0,-7.0z"/>
+ android:pathData="M9,12.71l2.14,2.58l3,-3.87L18,16.57H6L9,12.71zM5,5h6V3H5C3.9,3 3,3.9 3,5v6h2V5zM19,19h-6v2h6c1.1,0 2,-0.9 2,-2v-6h-2V19zM5,19v-6H3v6c0,1.1 0.9,2 2,2h6v-2H5zM19,5v6h2V5c0,-1.1 -0.9,-2 -2,-2h-6v2H19zM16,9c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1c-0.55,0 -1,0.45 -1,1S15.45,9 16,9z"/>
</vector>
diff --git a/res/layout/empty_print_state.xml b/res/layout/empty_print_state.xml
index 361bf3c..43312c8 100644
--- a/res/layout/empty_print_state.xml
+++ b/res/layout/empty_print_state.xml
@@ -14,48 +14,40 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/empty_print_state"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:visibility="gone">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
+ android:gravity="center"
+ android:orientation="vertical">
- <LinearLayout
+ <ImageView
+ android:layout_width="120dp"
+ android:layout_height="110dp"
+ android:layout_marginBottom="12dp"
+ android:src="@*android:drawable/ic_print"
+ android:scaleType="fitEnd"
+ android:alpha="0.1"
+ android:tint="?android:colorForeground"
+ android:importantForAccessibility="no" />
+
+ <TextView
+ android:id="@+id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
+ android:layout_marginBottom="16dp"
android:gravity="center"
- android:orientation="vertical">
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textColor="?android:attr/textColorSecondary" />
- <ImageView
- android:id="@+id/icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="12dip"
- android:src="@drawable/ic_grayedout_printer"
- android:contentDescription="@null">
- </ImageView>
+ <Button
+ android:id="@+id/add_new_service"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="?android:attr/borderlessButtonStyle"
+ android:textColor="?android:attr/textColorSecondary"
+ android:text="@string/print_menu_item_add_service"
+ android:visibility="gone" />
- <TextView
- android:id="@+id/message"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textColor="?android:attr/textColorSecondary">
- </TextView>
-
- <Button android:id="@+id/add_new_service"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:gravity="center"
- android:visibility="gone"
- style="?android:attr/buttonBarButtonStyle"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:text="@string/print_menu_item_add_service"
- android:textAllCaps="true"
- />
-
- </LinearLayout>
-
-</FrameLayout>
+</LinearLayout>
diff --git a/res/layout/empty_printers_list_service_enabled.xml b/res/layout/empty_printers_list_service_enabled.xml
index 8cc8db4..481f9c0 100644
--- a/res/layout/empty_printers_list_service_enabled.xml
+++ b/res/layout/empty_printers_list_service_enabled.xml
@@ -14,45 +14,38 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/empty_printers_list_service_enabled"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:visibility="gone">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
+ android:gravity="center"
+ android:orientation="vertical">
- <LinearLayout
+ <ImageView
+ android:layout_width="120dp"
+ android:layout_height="110dp"
+ android:layout_marginBottom="12dp"
+ android:src="@*android:drawable/ic_print"
+ android:scaleType="fitEnd"
+ android:alpha="0.1"
+ android:tint="?android:colorForeground"
+ android:importantForAccessibility="no"/>
+
+ <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
+ android:layout_marginBottom="16dp"
android:gravity="center"
- android:orientation="vertical">
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textColor="?android:attr/textColorSecondary"
+ android:text="@string/print_searching_for_printers"/>
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="12dip"
- android:src="@drawable/ic_grayedout_printer"
- android:importantForAccessibility="no">
- </ImageView>
+ <ProgressBar
+ android:layout_width="300dp"
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ android:importantForAccessibility="no"
+ style="?android:attr/progressBarStyleHorizontal"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="32dip"
- android:layout_marginRight="32dip"
- android:gravity="center"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textColor="?android:attr/textColorSecondary"
- android:text="@string/print_searching_for_printers">
- </TextView>
-
- <ProgressBar
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:indeterminate="true"
- style="?android:attr/progressBarStyleHorizontal">
- </ProgressBar>
-
- </LinearLayout>
-
-</FrameLayout>
+</LinearLayout>
diff --git a/res/layout/preference_app.xml b/res/layout/preference_app.xml
deleted file mode 100644
index f0adebf..0000000
--- a/res/layout/preference_app.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?android:attr/selectableItemBackground"
- android:gravity="center_vertical"
- android:minHeight="?android:attr/listPreferredItemHeightSmall"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
- <LinearLayout
- android:id="@+id/icon_frame"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="start|center_vertical"
- android:minWidth="56dp"
- android:orientation="horizontal"
- android:paddingEnd="8dp"
- android:paddingTop="4dp"
- android:paddingBottom="4dp">
- <ImageView
- android:id="@android:id/icon"
- android:layout_width="@dimen/secondary_app_icon_size"
- android:layout_height="@dimen/secondary_app_icon_size"/>
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="vertical"
- 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="@style/TextAppearance.TileTitle"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal" />
-
- <LinearLayout
- android:id="@+id/summary_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:visibility="gone">
- <TextView android:id="@android:id/summary"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textAppearance="@style/TextAppearance.Small"
- android:textAlignment="viewStart"
- android:textColor="?android:attr/textColorSecondary" />
-
- <TextView android:id="@+id/appendix"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textAppearance="@style/TextAppearance.Small"
- android:textAlignment="viewEnd"
- android:textColor="?android:attr/textColorSecondary"
- android:maxLines="1"
- android:ellipsize="end" />
- </LinearLayout>
- <ProgressBar
- android:id="@android:id/progress"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="4dp"
- android:max="100"
- android:visibility="gone" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@android:id/widget_frame"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="center"
- android:minWidth="64dp"
- android:orientation="vertical" />
-
-</LinearLayout>
diff --git a/res/menu/time_zone_base_search_menu.xml b/res/menu/time_zone_base_search_menu.xml
index 92241af..6df42c4 100644
--- a/res/menu/time_zone_base_search_menu.xml
+++ b/res/menu/time_zone_base_search_menu.xml
@@ -19,7 +19,7 @@
<item
android:id="@+id/time_zone_search_menu"
android:title="@string/search_settings"
- android:icon="@*android:drawable/ic_search_api_material"
+ android:icon="@drawable/ic_search_24dp"
android:showAsAction="always|collapseActionView"
android:actionViewClass="android.widget.SearchView" />
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 4f475d4..d5e9422 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Persoonlik"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Werk"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Programme: Alle"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Programme: Afgeskakel"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorieë: Dringend"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorieë: Onbelangrik"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorieë: Afgeskakel"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Aktiveer virtuele hoëfrekwensie-paneel"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Alle instellings"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Jou instellings"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Kies netwerk"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Ontkoppel"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Gekoppel"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Koppel tans …"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Kon nie koppel nie"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Geen netwerke gekry nie."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Kon nie netwerke kry nie. Probeer weer."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(verbode)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 6f11ca6..65f5dc0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"የግል"</string>
<string name="filter_work_apps" msgid="24519936790795574">"ስራ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"መተግበሪያዎች፦ ሁሉም"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"መተግበሪያዎች፦ ጠፍተዋል"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ምድቦች፦ በጣም አስቸኳይ አስፈላጊነት"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ምድቦች፦ ዝቅተኛ ቅድሚያ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ምድቦች፦ ጠፍተዋል"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"ምናባዊ የፈጣን ድግግሞሽ ፓነልን አንቃ"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"ሁሉም ቅንብሮች"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"የእርስዎ ቅንብሮች"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ውሂብ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ውሂብ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"አውታረ መረብ ይምረጡ"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ግንኙነት ተቋርጧል"</string>
+ <string name="network_connected" msgid="4943925032253989621">"ተገናኝቷል"</string>
+ <string name="network_connecting" msgid="76404590784733557">"በመገናኘት ላይ…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"መገናኘት አልተቻለም"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ምንም አውታረመረብ አልተገኘም።"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"አውታረ መረቦችን ማግኘት አልተቻለም። እንደገና ይሞክሩ።"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(የተከለከለ)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b73ddeb..74b5d4c 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1168,7 +1168,7 @@
<string name="brightness" msgid="8480105032417444275">"مستوى السطوع"</string>
<string name="brightness_title" msgid="5746272622112982836">"السطوع"</string>
<string name="brightness_summary" msgid="838917350127550703">"ضبط سطوع الشاشة"</string>
- <string name="auto_brightness_title" msgid="6341042882350279391">"السطوع التلقائي"</string>
+ <string name="auto_brightness_title" msgid="6341042882350279391">"السطوع التكيُّفي"</string>
<string name="auto_brightness_summary_on" msgid="3519854265558828744">"مفعّل"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"تم الإيقاف"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"السطوع المفضل منخفض جدًا"</string>
@@ -2021,9 +2021,9 @@
<string name="select_to_speak_summary" msgid="4282846695497544515">"يمكنك النقر على بيانات على شاشتك لتتم قراءتها بصوت عالٍ"</string>
<string name="accessibility_captioning_title" msgid="7589266662024836291">"الترجمة"</string>
<string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"التكبير"</string>
- <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"تكبير باستخدام النقر الثلاثي"</string>
+ <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"التكبير بالنقر ثلاث مرّات"</string>
<string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"التكبير باستخدام الزر"</string>
- <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"التكبير باستخدام الزر والنقر الثلاثي"</string>
+ <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"التكبير باستخدام الزر والنقر ثلاث مرّات"</string>
<string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"التكبير على الشاشة"</string>
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"انقر ٣ مرات للتكبير."</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"انقر على أحد الأزرار للتكبير"</string>
@@ -3691,7 +3691,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"شخصي"</string>
<string name="filter_work_apps" msgid="24519936790795574">"العمل"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"التطبيقات: الكل"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"التطبيقات: متوقفة"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"الفئات: أهمية ملحّة"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"الفئات: منخفضة الأهمية"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"الفئات: متوفقة"</string>
@@ -4442,24 +4443,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"تفعيل لوحة التكرار العالي الافتراضية"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"جميع الإعدادات"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"إعداداتك"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"بيانات CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"بيانات CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"اختيار شبكة"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"غير متصلة"</string>
+ <string name="network_connected" msgid="4943925032253989621">"متصلة"</string>
+ <string name="network_connecting" msgid="76404590784733557">"جارٍ الاتصال…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"تعذّر الاتصال"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"لم يتم العثور على شبكات."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"تعذّر العثور على شبكات. حاوِل مرة أخرى."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(محظورة)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 1372f37..4527695 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ব্যক্তিগত"</string>
<string name="filter_work_apps" msgid="24519936790795574">"কৰ্মস্থান"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"এপ্: সকলো"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"এপ্: অফ"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"শ্ৰেণী: অতি গুৰুত্বপূৰ্ণ"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"শ্ৰেণীবোৰ: কম গুৰুত্বপূৰ্ণ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"শ্ৰেণীসমূহ: বন্ধ কৰা আছে"</string>
@@ -4152,24 +4153,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"ভাৰ্শ্বুৱল উচ্চ ফ্ৰিকুএন্সী পেনেল সক্ষম কৰক"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"সকলো ছেটিং"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"আপোনাৰ ছেটিংসমূহ"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ডেটা"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ডেটা"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"নেটৱৰ্ক বাছনি কৰক"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"সংযোগ বিচ্ছিন্ন কৰা হ\'ল"</string>
+ <string name="network_connected" msgid="4943925032253989621">"সংযোগ কৰা হ’ল"</string>
+ <string name="network_connecting" msgid="76404590784733557">"সংযোগ কৰি থকা হৈছে…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"সংযোগ কৰিব পৰা নগ\'ল"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"কোনো নেটৱৰ্ক নাই।"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"নেটৱৰ্ক বিচাৰি পোৱা নগ\'ল। আকৌ চেষ্টা কৰক।"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(নিষিদ্ধ)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 3550e3d..a4d618b 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Şəxsi"</string>
<string name="filter_work_apps" msgid="24519936790795574">"İş"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Tətbiqlər: Hamısı"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Tətbiqlər: Deaktiv"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kateqoriyalar: Çox əhəmiyyətli"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kateqoriyalar: Az əhəmiyyətli"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kateqoriyalar: Deaktiv"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Virtual Yüksək Tezlikli Paneli Aktiv Edin"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Bütün Ayarlar"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Ayarlarınız"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Datası"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Datası"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Şəbəkəni seçin"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Bağlantı kəsildi"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Qoşuldu"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Qoşulur…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Qoşulmaq mümkün olmadı"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Şəbəkə tapılmadı."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Şəbəkə tapılmadı. Yenidən cəhd edin."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(qadağandır)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 9b96c23..253d3a8 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -3535,7 +3535,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Lične"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Posao"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacije: sve"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacije: isključeno"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorije: visok prioritet"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorije: nizak prioritet"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorije: isključeno"</string>
@@ -4223,24 +4224,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Omogućite virtuelnu ploču visoke frekvencije"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Sva podešavanja"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Podešavanja"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS podaci"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS podaci"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Odaberite mrežu"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Veza je prekinuta"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Povezano"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Povezuje se…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Povezivanje nije uspelo"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nije pronađena nijedna mreža."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nismo uspeli da pronađemo mreže. Probajte ponovo."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(zabranjeno)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index b6ce5eb..36ca98f 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -3589,7 +3589,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Персанальныя"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Працоўныя"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Праграмы: усе"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Праграмы: выключаныя"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Катэгорыі: тэрміновыя"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Катэгорыі: не вельмі важныя"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Катэгорыі: выключаныя"</string>
@@ -4298,24 +4299,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Уключыць віртуальную высокачастотную панэль"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Усе налады"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Вашы налады"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Даныя CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Даныя CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Выбраць сетку"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Адключана"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Падключана"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Ідзе падключэнне…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Не ўдалося падключыцца"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Сеткі не знойдзены."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Не ўдалося знайсці сеткі. Паўтарыце спробу."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(забаронена)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 4274967..5cc9f153 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Лични"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Служебни"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Приложения: Всички"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Приложения: Изключени"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категории: Неотложна важност"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категории: Малка важност"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категории: Изключени"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Активиране на виртуалния панел за висока честота"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Всички настройки"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Вашите настройки"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Данни чрез CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Данни чрез CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Избиране на мрежа"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Връзката е прекратена"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Установена е връзка"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Установява се връзка…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Не можа да се установи връзка"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Няма намерени мрежи."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Не можаха да бъдат намерени мрежи. Опитайте отново."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(забранено)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 239e32a..50df5d9 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1060,7 +1060,7 @@
<string name="audio_record_proc_title" msgid="4271091199976457534">"অপ্রয়োজনীয় আওয়াজ বাতিলকরণ"</string>
<string name="volume_media_description" msgid="7949355934788807863">"সঙ্গীত, ভিডিও, গেম্স, ও অন্যান্য মিডিয়া"</string>
<string name="volume_ring_description" msgid="5936851631698298989">"রিংটোন ও বিজ্ঞপ্তি"</string>
- <string name="volume_notification_description" msgid="5810902320215328321">"বিজ্ঞপ্তিগুলি"</string>
+ <string name="volume_notification_description" msgid="5810902320215328321">"বিজ্ঞপ্তি"</string>
<string name="volume_alarm_description" msgid="8322615148532654841">"অ্যালার্মগুলি"</string>
<string name="volume_ring_mute" msgid="3018992671608737202">"রিংটোন ও বিজ্ঞপ্তি মিউট করুন"</string>
<string name="volume_media_mute" msgid="3399059928695998166">"সঙ্গীত ও অন্যান্য মিডিয়া মিউট করুন"</string>
@@ -3187,7 +3187,7 @@
<string name="lock_screen_notifications_summary_hide" msgid="8301305044690264958">"সংবেদনশীল কন্টেন্ট লুকান"</string>
<string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"কোনও বিজ্ঞপ্তি দেখাবেন না"</string>
<string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"আপনার ডিভাইস লক করা অবস্থায় আপনি কিভাবে বিজ্ঞপ্তি প্রদর্শন করতে চান?"</string>
- <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"বিজ্ঞপ্তিগুলি"</string>
+ <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"বিজ্ঞপ্তি"</string>
<string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"সমস্ত কর্মস্থলের বিজ্ঞপ্তির কন্টেন্ট দেখুন"</string>
<string name="lock_screen_notifications_summary_hide_profile" msgid="2005907007779384635">"কাজের সংবেদনশীল কন্টেন্ট লুকান"</string>
<string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"আপনার ডিভাইস লক করা অবস্থায় আপনি কিভাবে প্রোফাইল বিজ্ঞপ্তিগুলি প্রদর্শন করতে চান?"</string>
@@ -3447,7 +3447,7 @@
<string name="storage_used" msgid="7128074132917008743">"ব্যবহৃত সঞ্চয়স্থানের পরিমান"</string>
<string name="change" msgid="6657848623929839991">"পরিবর্তন করুন"</string>
<string name="change_storage" msgid="600475265207060436">"স্টোরেজ পরিবর্তন করুন"</string>
- <string name="notifications_label" msgid="2872668710589600731">"বিজ্ঞপ্তিগুলি"</string>
+ <string name="notifications_label" msgid="2872668710589600731">"বিজ্ঞপ্তি"</string>
<string name="notifications_enabled" msgid="6983396130566021385">"চালু আছে"</string>
<string name="notifications_enabled_with_info" msgid="5669544704839269901">"<xliff:g id="NOTIFICATIONS_SENT">%1$s</xliff:g> / <xliff:g id="NOTIFICATIONS_CATEGORIES_OFF">%2$s</xliff:g>"</string>
<string name="notifications_disabled" msgid="1262114548434938079">"বন্ধ"</string>
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ব্যক্তিগত"</string>
<string name="filter_work_apps" msgid="24519936790795574">"কাজ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"অ্যাপ: সমস্ত"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"অ্যাপ: বন্ধ আছে"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"বিভাগগুলি: জরুরী গুরুত্বের"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"বিভাগগুলি: কম গুরুত্বের"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"বিভাগগুলি: বন্ধ আছে"</string>
@@ -3936,14 +3937,14 @@
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"অটোমেটিক"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"ম্যানুয়াল"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"এখনই জায়গা খালি করুন"</string>
- <string name="gesture_preference_title" msgid="5280023307132819052">"অঙ্গভঙ্গিগুলি"</string>
+ <string name="gesture_preference_title" msgid="5280023307132819052">"ইঙ্গিত"</string>
<string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"আপনার ফোন নিয়ন্ত্রণ করতে দ্রুত অঙ্গভঙ্গিগুলি"</string>
<string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"আপনার ট্যাবলেট নিয়ন্ত্রণ করার দ্রুত ইঙ্গিত"</string>
<string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"আপনার ডিভাইস নিয়ন্ত্রণ করার দ্রুত ইঙ্গিত"</string>
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ক্যামেরাতে সরাসরি যান"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ক্যামেরা দ্রুত খুলতে, পাওয়ার বোতাম দুবার প্রেস করুন৷ যেকোনও স্ক্রিনে কাজ করে৷"</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"ক্যামেরাটি তাড়াতাড়ি খুলুন"</string>
- <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ক্যামেরা ফ্লিপ করুন"</string>
+ <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ক্যামেরা ফ্লিপ করা"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"তাড়াতাড়ি সেলফি তুলুন"</string>
<string name="swipe_up_to_switch_apps_title" msgid="2513907834903543667">"হোম বোতামে উপরের দিকে সোয়াইপ করুন"</string>
@@ -3962,7 +3963,7 @@
<string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার ডিভাইসটি তুলে ধরুন।"</string>
<string name="ambient_display_reach_title" msgid="6519700935117799437">"সহজ অ্যাক্সেসের ইঙ্গিত"</string>
<string name="ambient_display_reach_summary" product="default" msgid="1220765153509895824"></string>
- <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"বিজ্ঞপ্তির জন্য আঙ্গুলের ছাপ সোয়াইপ করুন"</string>
+ <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"বিজ্ঞপ্তির জন্য আঙ্গুলের ছাপ সোয়াইপ করা"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"আঙ্গুলের ছাপ সোয়াইপ করুন"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ফোনের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ট্যাবলেটের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"ভার্চুয়াল উচ্চ ফ্রিকোয়েন্সি প্যানেল চালু করুন"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"সমস্ত সেটিংস"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"আপনার সেটিংস"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ডেটা"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ডেটা"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"নেটওয়ার্ক বেছে নিন"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ডিসকানেক্ট আছে"</string>
+ <string name="network_connected" msgid="4943925032253989621">"কানেক্ট আছে"</string>
+ <string name="network_connecting" msgid="76404590784733557">"কানেক্ট হচ্ছে…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"কানেক্ট করা যায়নি"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"কোনও নেটওয়ার্ক পাওয়া যায়নি৷"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"নেটওয়ার্ক পাওয়া যায়নি। আবার চেষ্টা করুন।"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(নিষিদ্ধ)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index b934e44..d064a4b 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -2252,7 +2252,7 @@
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Upotreba Upravitelja baterije"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Otkrij kada aplikacije troše bateriju"</string>
<string name="battery_manager_on" msgid="8643310865054362396">"Uključeno / Otkrivanje kada aplikacije troše bateriju"</string>
- <string name="battery_manager_off" msgid="5473135235710343576">"Isključi"</string>
+ <string name="battery_manager_off" msgid="5473135235710343576">"Isključeno"</string>
<plurals name="battery_manager_app_restricted" formatted="false" msgid="1026141135861471129">
<item quantity="one">Ograničena je %1$d aplikacija</item>
<item quantity="few">Ograničene su %1$d aplikacije</item>
@@ -3498,7 +3498,7 @@
<string name="notifications_label" msgid="2872668710589600731">"Obavještenja"</string>
<string name="notifications_enabled" msgid="6983396130566021385">"Uključeno"</string>
<string name="notifications_enabled_with_info" msgid="5669544704839269901">"<xliff:g id="NOTIFICATIONS_SENT">%1$s</xliff:g>/<xliff:g id="NOTIFICATIONS_CATEGORIES_OFF">%2$s</xliff:g>"</string>
- <string name="notifications_disabled" msgid="1262114548434938079">"Isključi"</string>
+ <string name="notifications_disabled" msgid="1262114548434938079">"Isključeno"</string>
<string name="notifications_partly_blocked" msgid="592071133950126656">"Isključene kategorije: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
<string name="notifications_silenced" msgid="4728603513072110381">"Bez zvuka"</string>
<string name="notifications_redacted" msgid="4493588975742803160">"Osjetljivi sadržaj nije na zaključanom ekranu."</string>
@@ -3535,7 +3535,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Lične"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacije: Sve"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacije: Isključene"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorije: hitno"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorije: niska važnost"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorije: Isključene"</string>
@@ -4009,7 +4010,7 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Prelazak na kameru"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Dodirnite dvaput dugme za uključivanje za brzo otvaranje kamere. Funkcionira na svakom ekranu."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Brzo otvorite kameru"</string>
- <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Okretanje kamere"</string>
+ <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Obrtanje kamere"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Snimajte selfije brže"</string>
<string name="swipe_up_to_switch_apps_title" msgid="2513907834903543667">"Prevucite prema gore na dugmetu za Početni ekran"</string>
@@ -4215,7 +4216,7 @@
<string name="prevent_ringing_option_none" msgid="4656046650769569175">"Ne čini ništa"</string>
<string name="prevent_ringing_option_vibrate_summary" msgid="1157524435626890116">"Uključeno (vibracija)"</string>
<string name="prevent_ringing_option_mute_summary" msgid="4472465110708640980">"Uključeno (isključen zvuk)"</string>
- <string name="prevent_ringing_option_none_summary" msgid="5013718946609276137">"Isključi"</string>
+ <string name="prevent_ringing_option_none_summary" msgid="5013718946609276137">"Isključeno"</string>
<string name="pref_title_network_details" msgid="7186418845727358964">"Detalji o mreži"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Naziv uređaja mogu vidjeti aplikacije na telefonu. Mogu ga vidjeti i druge osobe kada se povežete na Bluetooth uređaje ili postavite WiFi pristupnu tačku."</string>
<string name="devices_title" msgid="7701726109334110391">"Uređaji"</string>
@@ -4223,24 +4224,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Omogućite Virtuelnu ploču visoke frekventnosti"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Sve postavke"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Vaše postavke"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS podaci"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS podaci"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Odaberite mrežu"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Veza je prekinuta"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Povezano"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Povezivanje…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Povezivanje nije uspjelo"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nije pronađena nijedna mreža."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nisu pronađene mreže. Pokušajte ponovo."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(zabranjeno)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 33a2989..a501aa6 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -274,7 +274,7 @@
<string name="action_drag_label_move_up" msgid="9052210023727612540">"Mou amunt"</string>
<string name="action_drag_label_move_down" msgid="7448713844582912157">"Mou avall"</string>
<string name="action_drag_label_move_top" msgid="557081389352288310">"Mou a la part superior"</string>
- <string name="action_drag_label_move_bottom" msgid="2468642142414126482">"Mou al final"</string>
+ <string name="action_drag_label_move_bottom" msgid="2468642142414126482">"Mou a la part inferior"</string>
<string name="action_drag_label_remove" msgid="2861038147166966206">"Suprimeix l\'idioma"</string>
<string name="activity_picker_label" msgid="6295660302548177109">"Selecció de l\'activitat"</string>
<string name="device_info_label" msgid="6551553813651711205">"Informació del dispositiu"</string>
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personals"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Professionals"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplicacions: totes"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplicacions: desactivades"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categories: urgents"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: importància baixa"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: desactivades"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Activa el tauler virtual d\'alta freqüència"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Tota la configuració"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"La teva configuració"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dades CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dades CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Tria la xarxa"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Desconnectada"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connectada"</string>
+ <string name="network_connecting" msgid="76404590784733557">"S\'està connectant…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"No s\'ha pogut connectar"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No s\'ha trobat cap xarxa."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"No s\'ha pogut trobar cap xarxa. Torna-ho a provar."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(prohibida)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2d0eca7..3bcd128 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -3587,7 +3587,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Osobní"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Práce"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikace: Vše"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikace: vypnuto"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorie: Urgentní důležitost"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorie: Nízká důležitost"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorie: Vypnuto"</string>
@@ -4296,24 +4297,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Povolit virtuální panel vysoké frekvence"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Všechna nastavení"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Nastavení"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Data CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Data CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Vybrat síť"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Odpojeno"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Připojeno"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Připojování…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nelze se připojit"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Žádná síť nebyla nalezena."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nebyla nalezena žádná síť. Zkuste to znovu."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(zakázáno)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 37e3b6b..6aaba74 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personlig"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Arbejde"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: Alle"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Slået fra"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorier: Stor vigtighed"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorier: Lav vigtighed"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorier: Slået fra"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Aktivér det virtuelle panel for høj frekvens"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Alle indstillinger"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Dine indstillinger"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Vælg netværk"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Afbrudt"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Tilsluttet"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Opretter forbindelse…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Der kunne ikke oprettes forbindelse"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Der blev ikke fundet nogen netværk."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Der kunne ikke findes nogen netværk. Prøv igen."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(forbudt)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bb1a89e..b8d1a2c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1383,7 +1383,7 @@
<string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962"><b>"Das Verschieben dauert etwa <xliff:g id="TIME">^1</xliff:g>. Dabei werden <xliff:g id="SIZE">^2</xliff:g> auf <xliff:g id="NAME">^3</xliff:g> freigegeben."</b></string>
<string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Verschieben"</string>
<string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Daten werden verschoben…"</string>
- <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"Beachte beim Verschieben deiner Daten Folgendes: \n• Entferne nicht den Datenspeicher (<xliff:g id="NAME">^1</xliff:g>). \n• Einige Apps funktionieren möglicherweise nicht. \n• Achte darauf, dass das Gerät dabei stets geladen wird."</string>
+ <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"Beachte beim Verschieben deiner Daten Folgendes: \n• Entferne nicht den Datenspeicher (<xliff:g id="NAME">^1</xliff:g>). \n• Einige Apps funktionieren eventuell nicht. \n• Achte darauf, dass das Gerät dabei immer geladen wird."</string>
<string name="storage_wizard_ready_title" msgid="6553867088682695655">"<xliff:g id="NAME">^1</xliff:g> kann nun verwendet werden"</string>
<string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Du kannst deine <xliff:g id="NAME">^1</xliff:g> nun zum Speichern von Fotos und anderen Medien einsetzen."</string>
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Deine neue <xliff:g id="NAME">^1</xliff:g> steht nun für dich bereit. \n\nWenn du Fotos, Dateien und App-Daten auf dieses Gerät verschieben möchtest, gehe zu \"Einstellungen\" > \"Speicher\"."</string>
@@ -2692,7 +2692,7 @@
<string name="vpn_menu_delete" msgid="8098021690546891414">"Profil löschen"</string>
<string name="vpn_menu_lockdown" msgid="7863024538064268139">"Durchgehend aktives VPN"</string>
<string name="vpn_no_vpns_added" msgid="5002741367858707244">"Keine VPNs hinzugefügt"</string>
- <string name="vpn_always_on_summary" msgid="2821344524094363617">"Verbindung zu VPN stets beibehalten"</string>
+ <string name="vpn_always_on_summary" msgid="2821344524094363617">"Verbindung zu VPN immer beibehalten"</string>
<string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"Von dieser App nicht unterstützt"</string>
<string name="vpn_always_on_summary_active" msgid="8800736191241875669">"Always-On-Modus aktiviert"</string>
<string name="vpn_require_connection" msgid="8388183166574269666">"Verbindungen ohne VPN blockieren"</string>
@@ -3112,7 +3112,7 @@
<string name="zen_mode_block_effect_summary_sound" msgid="1065107568053759972">"Töne und Vibration"</string>
<string name="zen_mode_block_effect_summary_some" msgid="3635646031575107456">"Töne, Vibration und einige visuelle Elemente von Benachrichtigungen"</string>
<string name="zen_mode_block_effect_summary_all" msgid="1213328945418248026">"Töne, Vibration und visuelle Elemente von Benachrichtigungen"</string>
- <string name="zen_mode_blocked_effects_footer" msgid="5710896246703497760">"Benachrichtigungen für grundlegende Smartphone-Aktivitäten und den Smartphone-Status werden niemals ausgeblendet"</string>
+ <string name="zen_mode_blocked_effects_footer" msgid="5710896246703497760">"Benachrichtigungen für grundlegende Smartphone-Aktivitäten und den Smartphone-Status werden nie ausgeblendet"</string>
<string name="zen_mode_no_exceptions" msgid="7653433997399582247">"Keine"</string>
<string name="zen_mode_other_options" msgid="520015080445012355">"sonstige Optionen"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Hinzufügen"</string>
@@ -3198,7 +3198,7 @@
<string name="notification_group_title" msgid="7180506440133859601">"Kategoriegruppe für Benachrichtigungen"</string>
<string name="notification_importance_title" msgid="4368578960344731828">"Verhalten"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Akustisches Signal erlauben"</string>
- <string name="notification_importance_blocked" msgid="7938180808339386300">"Niemals Benachrichtigungen anzeigen"</string>
+ <string name="notification_importance_blocked" msgid="7938180808339386300">"Nie Benachrichtigungen anzeigen"</string>
<string name="notification_importance_min" msgid="9054819132085066824">"Lautlos anzeigen und minimieren"</string>
<string name="notification_importance_low" msgid="2445139943005315690">"Ohne Ton anzeigen"</string>
<string name="notification_importance_default" msgid="5958338024601957516">"Akustisches Signal"</string>
@@ -3271,9 +3271,9 @@
<string name="notification_toggle_on" msgid="650145396718191048">"Aktiviert"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Deaktiviert"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Alle blockieren"</string>
- <string name="app_notification_block_summary" msgid="4744020456943215352">"Diese Benachrichtigungen niemals anzeigen"</string>
+ <string name="app_notification_block_summary" msgid="4744020456943215352">"Diese Benachrichtigungen nie anzeigen"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Benachrichtigungen anzeigen"</string>
- <string name="notification_content_block_summary" msgid="7746185794438882389">"Benachrichtigungen niemals in der Leiste oder auf Peripheriegeräten anzeigen"</string>
+ <string name="notification_content_block_summary" msgid="7746185794438882389">"Benachrichtigungen nie in der Leiste oder auf Peripheriegeräten anzeigen"</string>
<string name="notification_badge_title" msgid="6370122441168519809">"App-Benachrichtigungspunkt erlauben"</string>
<string name="notification_channel_badge_title" msgid="2240827899882847087">"App-Benachrichtigungspunkt anzeigen"</string>
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Nicht stören\" deaktivieren"</string>
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Nutzer"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Geschäftlich"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: alle"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: deaktiviert"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorien: sehr hohe Wichtigkeit"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorien: geringe Wichtigkeit"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorien: deaktiviert"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Virtuelles High-Frequency-Steuerfeld aktivieren"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Alle Einstellungen"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Meine Einstellungen"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-Daten"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-Daten"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Netzwerk auswählen"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Nicht verbunden"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Verbunden"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Verbindung wird hergestellt…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Verbindung nicht möglich"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Keine Netzwerke gefunden."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Netzwerke nicht gefunden. Bitte versuch es noch einmal."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(nicht zulässig)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index d9ee09e..a7a5c3b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Προσωπικό"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Εργασία"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Εφαρμογές: Όλες"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Εφαρμογές: Απενεργοποιημένες"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Κατηγορίες: Επείγουσες"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Κατηγορίες: Μικρής βαρύτητας"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Κατηγορίες: Απενεργοποιημένες"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Ενεργοποίηση εικονικού πίνακα υψηλών συχνοτήτων"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Όλες οι ρυθμίσεις"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Οι ρυθμίσεις σας"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Δεδομένα CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Δεδομένα CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Επιλογή δικτύου"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Αποσυνδέθηκε"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Συνδέθηκε"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Σύνδεση…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Αδυναμία σύνδεσης"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Δεν βρέθηκαν δίκτυα."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Δεν ήταν δυνατή η εύρεση δικτύων. Δοκιμάστε ξανά."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(απαγορευμένο)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index e338450..074879b 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: All"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Turned off"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categories: Urgent importance"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: Low importance"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: Turned off"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Enable Virtual High Frequency Panel"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"All Settings"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Your Settings"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Choose network"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Disconnected"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connected"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connecting…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Couldn’t connect"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No networks found."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Couldn’t find networks. Try again."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(forbidden)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 662cdbd..488c463 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: All"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Turned off"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categories: Urgent importance"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: Low importance"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: Turned off"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Enable Virtual High Frequency Panel"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"All Settings"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Your Settings"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Choose network"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Disconnected"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connected"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connecting…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Couldn’t connect"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No networks found."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Couldn’t find networks. Try again."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(forbidden)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e338450..074879b 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: All"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Turned off"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categories: Urgent importance"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: Low importance"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: Turned off"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Enable Virtual High Frequency Panel"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"All Settings"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Your Settings"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Choose network"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Disconnected"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connected"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connecting…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Couldn’t connect"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No networks found."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Couldn’t find networks. Try again."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(forbidden)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index e338450..074879b 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: All"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Turned off"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categories: Urgent importance"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: Low importance"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: Turned off"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Enable Virtual High Frequency Panel"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"All Settings"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Your Settings"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Choose network"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Disconnected"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connected"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connecting…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Couldn’t connect"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No networks found."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Couldn’t find networks. Try again."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(forbidden)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index d89c39d..be4533f 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -3482,7 +3482,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: All"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Turned off"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categories: Urgent importance"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: Low importance"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: Turned off"</string>
@@ -4159,4 +4160,6 @@
<string name="empty_networks_list" msgid="2578752112731781190">"No networks found."</string>
<string name="network_query_error" msgid="7487714485362598410">"Couldn’t find networks. Try again."</string>
<string name="forbidden_network" msgid="4626592887509826545">"(forbidden)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
+ <skip />
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 96b5e4d..6aaf4c9 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -3481,7 +3481,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personales"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Trabajo"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: Todas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Desactivadas"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categoría: Urgente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categoría: Poca importancia"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categoría: Desactivadas"</string>
@@ -4148,24 +4149,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Habilitar panel virtual de alta frecuencia"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Toda la configuración"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Tu configuración"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Datos de CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Datos de CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Elegir una red"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Desconectado"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Conectado"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Conectando…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"No se pudo establecer conexión"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No se encontraron redes."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"No se encontraron redes. Vuelve a intentarlo."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(prohibida)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 767fbb3..15995f4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -191,7 +191,7 @@
<string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
<string name="proxy_clear_text" msgid="5555400754952012657">"Borrar"</string>
<string name="proxy_port_label" msgid="5655276502233453400">"Puerto del proxy"</string>
- <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Omitir proxy para"</string>
+ <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Saltarproxy para"</string>
<string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar valores predeterminados"</string>
<string name="proxy_action_text" msgid="2957063145357903951">"Ok"</string>
<string name="proxy_hostname_label" msgid="8490171412999373362">"Nombre de host del proxy"</string>
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personales"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Trabajo"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplicaciones: todas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplicaciones: desactivadas"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorías: urgente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorías: poca importancia"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorías: desactivadas"</string>
@@ -3908,7 +3909,7 @@
<string name="bluetooth_disabled" msgid="6244000672828617410">"Desactivado"</string>
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a varios dispositivos"</string>
- <string name="demo_mode" msgid="2798762752209330277">"Modo de demostración de IU del sistema"</string>
+ <string name="demo_mode" msgid="2798762752209330277">"Modo de demostración de UI del sistema"</string>
<string name="dark_ui_mode" msgid="4176511670311366886">"Modo oscuro"</string>
<string name="dark_ui_mode_title" msgid="3471395820322819817">"Establecer modo oscuro"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ajustes rápidos de mosaicos de desarrolladores"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Habilitar el panel virtual de alta frecuencia"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Todos los ajustes"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Tus ajustes"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Datos de CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Datos de CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Elegir red"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Desconectada"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Conectada"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Conectando…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"No se ha podido conectar"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No se ha encontrado ninguna red."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"No se ha encontrado ninguna red. Vuelve a intentarlo."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(prohibida)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 6e0d50f..4e9c41c 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Isiklik"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Töö"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Rakendused: kõik"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Rakendused: välja lülitatud"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategooriad: kiireloomuline"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategooriad: vähetähtis"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategooriad: välja lülitatud"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Luba virtuaalne kõrgsageduslik paneel"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Kõik seaded"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Teie seaded"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-i andmed"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-i andmed"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Vali võrk"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Ühendus on katkestatud"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Ühendatud"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Ühendamine …"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Ühendust ei saanud luua"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Võrke ei leitud."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Võrke ei õnnestunud leida. Proovige uuesti."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(keelatud)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index e86b44c..eff1ca0 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Pertsonalak"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Lanekoak"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikazioak: guztiak"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikazioak: desaktibatutakoak"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategoriak: premiazkoak"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategoriak: garrantzi txikikoak"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategoriak: desaktibatutakoak"</string>
@@ -3950,11 +3951,11 @@
<string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"Aplikazioz aldatzeko, pasatu hatza gora Hasiera botoian, eta pasa ezazu berriro aplikazio guztiak ikusteko. Edozein pantailatan funtzionatzen du. Jada ez dago ikuspegi orokorraren botoia pantailaren behealdean eskuinetara."</string>
<string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"Probatu Hasiera botoi berria"</string>
<string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"Aktibatu aplikazioz aldatzeko keinu berria"</string>
- <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Sakatu birritan telefonoa bertan dagoela ikusteko"</string>
+ <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Sakatu birritan telefonoa bertan dagoena ikusteko"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Sakatu birritan tableta bertan dagoela ikusteko"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Sakatu birritan gailua bertan dagoela ikusteko"</string>
<string name="ambient_display_summary" msgid="8534654210539169707">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, sakatu pantaila birritan."</string>
- <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Jaso telefonoa bertan dagoela ikusteko"</string>
+ <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Jaso telefonoa bertan dagoena ikusteko"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Jaso tableta bertan dagoela ikusteko"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Jaso gailua bertan dagoela ikusteko"</string>
<string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, hartu telefonoa."</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Gaitu zehaztasun handiko panel birtuala"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Ezarpen guztiak"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Ezarpenak"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS datuak"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS datuak"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Aukeratu sarea"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Deskonektatuta"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Konektatuta"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Konektatzen…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Ezin izan da konektatu"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Ez da aurkitu sarerik."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Ezin izan da aurkitu sarerik. Saiatu berriro."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(debekatuta)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4d89593..ef74bf3 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1956,7 +1956,7 @@
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"برای بزرگنمایی، ۳ بار ضربه بزنید"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"برای بزرگنمایی، روی دکمهای ضربه بزنید"</string>
<string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"برای بزرگ کردن"</b>"، ۳ ضربه سریع روی صفحه بزنید.\n"<ul><li>"برای پیمایش، دو یا چند انگشتتان را روی صفحه بکشید"</li>\n<li>"برای تنظیم بزرگنمایی، دو یا چند انگشتتان را نزدیک یا دور کنید"</li></ul>\n\n<b>"برای بزرگنمایی موقت"</b>"، ۳ ضربه سریع روی صفحه بزنید و ضربه سوم انگشتتان را نگهدارید.\n"<ul><li>"برای حرکت در صفحه، روی صفحه بکشید"</li>\n<li>"برای کوچک کردن صفحه، انگشتتان را بردارید"</li></ul>\n\n"برای بزرگ کردن صفحه، نمیتوانید از صفحهکلید و نواز پیمایش استفاده کنید."</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"زمانیکه درشتنمایی روشن است، برای درشتنمایی سریع از دکمه «دسترسپذیری» در پایین صفحه استفاده کنید.\n\n"<b>"برای بزرگنمایی"</b>"، روی دکمه «دسترسپذیری» ضربه بزنید، سپس روی جایی از صفحه ضربه بزنید.\n"<ul><li>"برای پیمایش، دو یا چند انگشتتان را روی صفحه بکشید"</li>\n<li>"برای تنظیم بزرگنمایی، دو یا چند انگشتتان را نزدیک یا دور کنید"</li></ul>\n\n<b>"برای بزرگنمایی موقت"</b>"، روی دکمه «دسترسپذیری» ضربه بزنید، سپس جایی از صفحه را لمس کنید و نگهدارید.\n"<ul><li>"برای حرکت در صفحه، روی آن بکشید"</li>\n<li>"برای کوچک کردن صفحه، انگشتتان را بلند کنید"</li></ul>\n\n"برای بزرگ کردن صفحه، نمیتوانید از صفحهکلید یا نوار پیمایش استفاده کنید."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"زمانیکه درشتنمایی روشن است، برای درشتنمایی سریع از دکمه «دسترسپذیری» در پایین صفحه استفاده کنید.\n\n"<b>"برای بزرگنمایی"</b>"، روی دکمه «دسترسپذیری» ضربه بزنید، سپس روی جایی از صفحه ضربه بزنید.\n"<ul><li>"برای پیمایش، دو یا چند انگشتتان را روی صفحه بکشید"</li>\n<li>"برای تنظیم بزرگنمایی، دو یا چند انگشتتان را نزدیک یا دور کنید"</li></ul>\n\n<b>"برای بزرگنمایی موقت"</b>"، روی دکمه «دسترسپذیری» ضربه بزنید، سپس جایی از صفحه را لمس کنید و نگهدارید.\n"<ul><li>"برای حرکت در صفحه، روی آن بکشید"</li>\n<li>"برای دورنمایی، انگشتتان را بلند کنید"</li></ul>\n\n"برای نزدیکنمایی، نمیتوانید از صفحهکلید یا نوار پیمایش استفاده کنید."</string>
<string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"دکمه دسترسپذیری روی <xliff:g id="SERVICE">%1$s</xliff:g> تنظیم شده است. برای استفاده از درشتنمایی، دکمه دسترسپذیری را لمس کنید و نگهدارید، سپس درشتنمایی را انتخاب کنید."</string>
<string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"میانبر کلید بلندی صدا"</string>
<string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"سرویس میانبر"</string>
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"شخصی"</string>
<string name="filter_work_apps" msgid="24519936790795574">"کاری"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"برنامهها: همه موارد"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"برنامهها: موارد خاموش"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"دستهها: موارد با اهمیت فوری"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"دستهها: موارد کماهمیت"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"دستهها: موارد خاموش"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"فعال کردن پانل مجازی بسامد بالا"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"همه تنظیمات"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"تنظیمات شما"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"دادههای CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"دادههای CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"انتخاب شبکه"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"اتصال قطع شد"</string>
+ <string name="network_connected" msgid="4943925032253989621">"متصل"</string>
+ <string name="network_connecting" msgid="76404590784733557">"درحال اتصال…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"متصل نشد"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"شبکهای پیدا نشد."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"شبکهها پیدا نشدند. دوباره امتحان کنید."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ممنوع است)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 901469d..1ee6246 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -993,7 +993,7 @@
<string name="wifi_tether_disabled_by_airplane" msgid="414480185654767932">"Ei käytettävissä, koska lentokonetila on päällä"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-puhelut"</string>
<string name="wifi_calling_suggestion_title" msgid="5702964371483390024">"Laajenna puhelumahdollisuuksia Wi‑Fillä"</string>
- <string name="wifi_calling_suggestion_summary" msgid="1331793267608673739">"Paranna kattavuutta ottamalla Wi-Fi-puhelut käyttöön"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="1331793267608673739">"Paranna tavoittavuutta ottamalla Wi-Fi-puhelut käyttöön"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Puheluasetus"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-puhelutila"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Roaming-asetus"</string>
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Henkilökohtaiset"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Työ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Sovellukset: kaikki"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Sovellukset: ei käytössä"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Luokat: kiireellinen"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Luokat: ei kovin tärkeä"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Luokat: ei käytössä"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Ota käyttöön virtuaalinen korkeataajuuspaneeli"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Kaikki asetukset"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Omat asetukset"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Valitse verkko"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Yhteys katkaistu"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Yhdistetty"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Yhdistetään…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Yhdistäminen epäonnistui"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Ei verkkoja"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Verkkoja ei löytynyt. Yritä uudelleen."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(kielletty)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 0483273..675c8ad 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personnel"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Travail"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Applications : toutes"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Applis : notifications bloquées"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Catégories : importance urgente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Catégories : importance faible"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Catégories : notif. bloquées"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Activer le panneau virtuel haute fréquence"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Tous les paramètres"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Vos paramètres"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Données CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Données CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Choisir un réseau"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Déconnecté"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connecté"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connexion en cours…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Impossible de se connecter"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Aucun réseau trouvé."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Impossible de trouver des réseaux. Réessayez."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(interdit)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e77767f..807df30 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personnelles"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Professionnelles"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Applications : toutes"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Applications désactivées"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Catégories : urgent"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Catégories : importance faible"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Catégories : désactivées"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Activer le panneau virtuel haute fréquence"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Tous les paramètres"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Vos paramètres"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Données CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Données CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Sélectionner un réseau"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Déconnecté"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connecté"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connexion…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Impossible de se connecter"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Aucun réseau trouvé."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Réseaux introuvables. Veuillez réessayer."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(interdit)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 100d315..f250708 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -3246,7 +3246,7 @@
<string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pantalla superposta"</string>
<string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir pantalla superposta"</string>
<string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Permite que esta aplicación cree unha ventá de pantalla superposta mentres estea aberta ou despois de saír dela (por exemplo, para continuar visualizando un vídeo). A ventá móstrase sobre as demais aplicacións que esteas utilizando."</string>
- <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso en modo Non molestar"</string>
+ <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso a Non molestar"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Ningunha aplicación instalada solicitou acceso en modo Non molestar"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicacións..."</string>
<string name="app_notifications_off_desc" msgid="8289223211387083447">"Segundo solicitaches, Android bloquea a visualización de notificacións desta aplicación neste dispositivo"</string>
@@ -3305,9 +3305,9 @@
<string name="zen_mode_unknown_app_set_behavior" msgid="2558968232814237874">"Agora non se poden cambiar estas opcións de configuración. Unha aplicación activou automaticamente o modo Non molestar co comportamento personalizado."</string>
<string name="zen_mode_qs_set_behavior" msgid="6200424436456086312">"Agora non se poden cambiar estas opcións de configuración. Activouse manualmente o modo Non molestar co comportamento personalizado."</string>
<string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"Hora"</string>
- <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Estableceuse a norma automática para activar Non molestar durante as horas especificadas"</string>
+ <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Estableceuse a norma automática para activar o modo Non molestar durante as horas especificadas"</string>
<string name="zen_event_rule_type_name" msgid="6503468472212606158">"Evento"</string>
- <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Norma automática establecida para activar Non molestar durante os eventos especificados"</string>
+ <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Norma automática establecida para activar o modo Non molestar durante os eventos especificados"</string>
<string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Durante os eventos de"</string>
<string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Durante os eventos de <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
<string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"calquera calendario"</string>
@@ -3484,7 +3484,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Persoais"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Do traballo"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplicacións: todas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplicacións: desactivadas"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorías: relevancia urxente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorías: relevancia baixa"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorías: desactivadas"</string>
@@ -3951,7 +3952,7 @@
<string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"Para cambiar de aplicacións, pasa o dedo cara arriba no botón de inicio. Pásao de novo para ver todas as aplicacións. Este xesto funciona en calquera pantalla, así que na parte inferior dereita, xa non terás o botón Visión xeral."</string>
<string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"Proba o novo botón de inicio"</string>
<string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"Activa o novo xesto para cambiar de aplicacións"</string>
- <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocar dúas veces para consultar o teléfono"</string>
+ <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dobre toque para consultar o teléfono"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar dúas veces para consultar a tableta"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar dúas veces para consultar o dispositivo"</string>
<string name="ambient_display_summary" msgid="8534654210539169707">"Para consultar a hora, as notificacións e outra información, toca a pantalla dúas veces."</string>
@@ -4135,9 +4136,9 @@
<string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"Mellora a vida útil da batería do dispositivo"</string>
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"Mellora a vida útil da batería do teléfono"</string>
<string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
- <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Silenciar o son"</string>
+ <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Evitar que soe"</string>
<string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Manter premidos os botóns de acendido e subir volume ao mesmo tempo"</string>
- <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Atallo para evitar facer soar o dispositivo"</string>
+ <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Atallo para evitar que soe o dispositivo"</string>
<string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Vibrar"</string>
<string name="prevent_ringing_option_mute" msgid="7551545579059879853">"Silenciar"</string>
<string name="prevent_ringing_option_none" msgid="4656046650769569175">"Non facer nada"</string>
@@ -4151,24 +4152,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Activa o panel virtual de alta frecuencia"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Toda a configuración"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"A túa configuración"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Datos de CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Datos de CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Escoller rede"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Rede desconectada"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Rede conectada"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Conectando…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Non se puido establecer conexión"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Non se atopou ningunha rede."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Non se puido encontrar ningunha rede. Téntao de novo."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(rede non-permitida)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 3aabd1a..9cf5d32 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"વ્યક્તિગત"</string>
<string name="filter_work_apps" msgid="24519936790795574">"કાર્યાલય"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ઍપ્લિકેશનો: તમામ"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ઍપ્લિકેશનો: બંધ કરી"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"કૅટેગરી: તાત્કાલિક મહત્વની"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"કૅટેગરી: ઓછી મહત્વની"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"કૅટેગરી: બંધ કરી"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"વર્ચ્યુઅલ ઉચ્ચ આવર્તન પૅનલ ચાલુ કરો"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"બધી સેટિંગ"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"તમારી સેટિંગ"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ડેટા"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ડેટા"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"નેટવર્ક પસંદ કરો"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ડિસ્કનેક્ટેડ"</string>
+ <string name="network_connected" msgid="4943925032253989621">"કનેક્ટ થયું"</string>
+ <string name="network_connecting" msgid="76404590784733557">"કનેક્ટ કરી રહ્યાં છીએ..."</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"કનેક્ટ કરી શકાયું નથી"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"કોઈ નેટવર્ક મળ્યું નથી."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"નેટવર્ક શોધી શક્યાં નથી. ફરી પ્રયાસ કરો."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(પ્રતિબંધિત)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d60043f..1928695 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -3484,7 +3484,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
<string name="filter_work_apps" msgid="24519936790795574">"कार्यस्थल"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ऐप्लिकेशन: सभी"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ऐप: बंद हैं"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"श्रेणियां: अत्यंत महत्वपूर्ण"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"श्रेणियां: कम महत्व के"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"श्रेणियां: बंद हैं"</string>
@@ -4156,24 +4157,16 @@
<skip />
<!-- no translation found for homepage_personal_settings (3998213046366125494) -->
<skip />
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS डेटा"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS डेटा"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"नेटवर्क चुनें"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"डिसकनेक्ट किया गया"</string>
+ <string name="network_connected" msgid="4943925032253989621">"कनेक्ट किया गया"</string>
+ <string name="network_connecting" msgid="76404590784733557">"कनेक्ट हो रहा है..."</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"कनेक्ट नहीं किया जा सका"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"कोई नेटवर्क नहीं मिला."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"कोई नेटवर्क नहीं मिला. फिर से कोशिश करें."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(मना है)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c655ce9..9ea94c6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -3535,7 +3535,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Osobno"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Posao"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacije: sve"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacije: isključene"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorije: hitno"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorije: mala važnost"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorije: isključene"</string>
@@ -4223,24 +4224,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Omogući virtualnu ploču visoke frekvencije"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Sve postavke"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Vaše postavke"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Podaci CBRS-a"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Podaci CBRS-a"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Odaberite mrežu"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Nije povezano"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Povezano"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Povezivanje…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Povezivanje nije uspjelo"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nije pronađena nijedna mreža."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nije pronađena nijedna mreža. Pokušajte ponovo."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(zabranjeno)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index d64b007..ac27ad7 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Személyes"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Munkahelyi"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Alkalmazások: Mind"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Alkalmazások: Kikapcsolva"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategóriák: Sürgős"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategóriák: Kevésbé fontos"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategóriák: Kikapcsolva"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Gyakori frissítésű virtuális panel engedélyezése"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Minden beállítás"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Saját beállítások"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-adatok"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-adatok"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Hálózat kiválasztása"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Leválasztva"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Csatlakozva"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Csatlakozás…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nem sikerült csatlakozni"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nem található hálózat."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nincs hálózat. Próbálja újra."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(tiltott)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index f4233cc..5fa59f4 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Անձնական"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Աշխատանքային"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Հավելվածներ՝ բոլորը"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Հավելվածներ՝ անջատած"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Կատեգորիաներ՝ հրատապ կարևորություն"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Կատեգորիաներ՝ ցածր կարևորություն"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Կատեգորիաներ՝ անջատված"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Միսցնել բարձր հաճախականության վիրտուալ վահանակը"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Բոլոր կարգավորումները"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Իմ կարգավորումները"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS տվյալներ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS տվյալներ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Ընտրել ցանց"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Անջատած է"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Միացած է"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Միացում…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Չհաջողվեց միանալ"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Ցանցեր չեն գտնվել:"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Չհաջողվեց ցանցեր գտնել: Նորից փորձեք:"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(արգելված)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d6f8d03..610f3ea 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Pribadi"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Kantor"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikasi: Semua"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikasi: Dinonaktifkan"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategori: Tingkat kepentingan darurat"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategori: Tingkat kepentingan rendah"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategori: Dinonaktifkan"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Aktifkan Panel Frekuensi Tinggi Virtual"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Semua Setelan"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Setelan Anda"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Data CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Data CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Pilih jaringan"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Terputus"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Terhubung"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Menghubungkan…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Tidak dapat terhubung"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Jaringan tidak ditemukan."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Tidak dapat menemukan jaringan. Coba lagi."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(terlarang)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 4316207..962f3f3 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Persónulegt"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Vinna"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Forrit: Öll"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Forrit: Slökkt"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Flokkar: Afar áríðandi"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Flokkar: Ekki svo mikilvægt"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Flokkar: Slökkt"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Kveikja á sýndarhátíðnisvæði"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Allar stillingar"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Stillingar þínar"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-gögn"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-gögn"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Velja símkerfi"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Aftengt"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Tengt"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Tengist…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Ekki tókst að tengjast"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Engin símkerfi fundust."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Ekkert símkerfi fannst. Reyndu aftur."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(bannað)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index db1df9f..af5a758 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personali"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Lavoro"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"App: Tutte"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"App: disattivate"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorie: Importanza urgente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorie: Importanza scarsa"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorie: Disattivate"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Attiva il riquadro virtuale Alta frequenza"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Tutte le impostazioni"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Le tue impostazioni"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dati CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dati CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Scegli rete"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Scollegato"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connessi"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connessione…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Impossibile collegarsi"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nessuna rete trovata."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Impossibile trovare reti. Riprova."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(vietato)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4dcc051..618e4a9 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -3589,7 +3589,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"אישיות"</string>
<string name="filter_work_apps" msgid="24519936790795574">"עבודה"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"אפליקציות: הכל"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"אפליקציות: כבויות"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"קטגוריות: חשיבות דחופה"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"קטגוריות: חשיבות נמוכה"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"קטגוריות: כבויות"</string>
@@ -4298,24 +4299,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"הפעלה של חלונית וירטואלית בתדר גבוה"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"כל ההגדרות"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"ההגדרות שלך"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"נתוני CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"נתוני CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"בחירת רשת"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"מנותק"</string>
+ <string name="network_connected" msgid="4943925032253989621">"מחובר"</string>
+ <string name="network_connecting" msgid="76404590784733557">"מתחבר…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"לא ניתן להתחבר"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"לא נמצאו רשתות."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"לא נמצאו רשתות. אפשר לנסות שוב."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(אסור)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 811ae38..2c96361 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"個人用"</string>
<string name="filter_work_apps" msgid="24519936790795574">"仕事用"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"アプリ: すべて"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"アプリ: OFF"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"カテゴリ: 重要度「緊急」"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"カテゴリ: 重要度「低」"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"カテゴリ: OFF"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"高頻度仮装パネルを有効にする"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"すべての設定"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"カスタマイズした設定"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS データ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS データ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ネットワークを選択"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"接続が解除されました"</string>
+ <string name="network_connected" msgid="4943925032253989621">"接続しました"</string>
+ <string name="network_connecting" msgid="76404590784733557">"接続しています…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"接続できませんでした"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ネットワークが見つかりません。"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ネットワークが見つかりませんでした。もう一度お試しください。"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"（禁止）"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 4b0192c..4336c01 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"პირადი"</string>
<string name="filter_work_apps" msgid="24519936790795574">"სამუშაო"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"აპები: ყველა"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"აპები: გამორთული"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"კატეგორიები: გადაუდებელი"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"კატეგორიები: დაბალი პრიორიტეტი"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"კატეგორიები: გამორთული"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"მაღალი სიხშირეების ვირტუალური პანელის ჩართვა"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"ყველა პარამეტრი"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"თქვენი პარამეტრები"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS მონაცემები"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS მონაცემები"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ქსელის არჩევა"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"კავშირი გაწყვეტილია"</string>
+ <string name="network_connected" msgid="4943925032253989621">"დაკავშირებულია"</string>
+ <string name="network_connecting" msgid="76404590784733557">"მიმდინარეობს დაკავშირება…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"დაკავშირება ვერ მოხერხდა"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ქსელები ვერ მოიძებნა."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ქსელები ვერ მოიძებნა. ცადეთ ხელახლა."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(აკრძალული)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 0269f64..b1314c6 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Жеке"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Жұмыс"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Қолданбалар: барлығы"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Қолданбалар: өшірілген"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Санаттар: аса маңызды"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Санаттар: маңыздылығы төмен"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Санаттар: өшірілген"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Виртуалды жоғары жиілік панелін қосу"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Барлық параметрлер"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Параметрлеріңіз"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS деректері"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS деректері"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Желі таңдау"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Ажыратылған"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Жалғанған"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Жалғануда…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Жалғанбады"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Ешқандай желілер табылмады."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Желілер табылмады. Қайталап көріңіз."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(тыйым салынған)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 3a42297..c2f3f80 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ផ្ទាល់ខ្លួន"</string>
<string name="filter_work_apps" msgid="24519936790795574">"កន្លែងធ្វើការ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"កម្មវិធី៖ ទាំងអស់"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"កម្មវិធី៖ បិទ"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ប្រភេទ៖ សំខាន់ជាបន្ទាន់"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ប្រភេទ៖ មិនសូវសំខាន់"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ប្រភេទ៖ បិទ"</string>
@@ -3940,7 +3941,7 @@
<string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងទូរស័ព្ទរបស់អ្នក"</string>
<string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងថេប្លេតរបស់អ្នក"</string>
<string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងឧបករណ៍របស់អ្នក"</string>
- <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"លោតទៅកាមេរ៉ា"</string>
+ <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ប្តូរទៅកាមេរ៉ា"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ដើម្បីបើកកាមេរ៉ាឲ្យបានរហ័ស សូមចុចប៊ូតុងថាមពលពីរដង។ ដំណើរការនៅលើអេក្រង់ណាមួយក៏បាន។"</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"បើកកាមេរ៉ាយ៉ាងរហ័ស"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ត្រឡប់កាមេរ៉ា"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"បើកផ្ទាំងប្រេកង់ខ្ពស់និម្មិត"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"ការកំណត់ទាំងអស់"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"ការកំណត់របស់អ្នក"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"ទិន្នន័យ CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"ទិន្នន័យ CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ជ្រើសរើសបណ្តាញ"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"បានផ្ដាច់"</string>
+ <string name="network_connected" msgid="4943925032253989621">"បានភ្ជាប់"</string>
+ <string name="network_connecting" msgid="76404590784733557">"កំពុងភ្ជាប់…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"មិនអាចភ្ជាប់បានទេ"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"រកបណ្ដាញមិនឃើញទេ។"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"រកបណ្ដាញមិនឃើញទេ។ សូមព្យាយាមម្ដងទៀត។"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ហាម)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 8d4fd8c..1822a60 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ವೈಯಕ್ತಿಕ"</string>
<string name="filter_work_apps" msgid="24519936790795574">"ಕೆಲಸ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ಅಪ್ಲಿಕೇಶನ್ಗಳು: ಎಲ್ಲ"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ಆಪ್ಗಳು: ಆಫ್ ಮಾಡಿರುವವು"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ವರ್ಗಗಳು: ತುರ್ತು ಪ್ರಾಮುಖ್ಯತೆ"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ವರ್ಗಗಳು: ಕಡಿಮೆ ಪ್ರಾಮುಖ್ಯತೆ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ವರ್ಗಗಳು: ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"ವರ್ಚುವಲ್ ಅಧಿಕ ಆವರ್ತನ ಫಲಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"ಎಲ್ಲಾ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"ನಿಮ್ಮ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ಡೇಟಾ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ಡೇಟಾ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ನೆಟ್ವರ್ಕ್ ಆಯ್ಕೆಮಾಡಿ"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
+ <string name="network_connected" msgid="4943925032253989621">"ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
+ <string name="network_connecting" msgid="76404590784733557">"ಸಂಪರ್ಕಿಸುತ್ತಿದೆ…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ಯಾವುದೇ ನೆಟ್ವರ್ಕ್ಗಳು ಕಂಡುಬಂದಿಲ್ಲ."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ನೆಟ್ವರ್ಕ್ಗಳನ್ನು ಹುಡುಕಲಾಗಲಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ನಿಷೇಧಿತ)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7e6756a..ca15d6b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"개인"</string>
<string name="filter_work_apps" msgid="24519936790795574">"직장"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"앱: 전체"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"앱: 사용 중지됨"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"카테고리: 중요도 긴급"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"카테고리: 중요도 낮음"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"카테고리: 사용 중지됨"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"고주사율 가상 패널을 사용 설정합니다."</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"모든 설정"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"내 설정"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS 데이터"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS 데이터"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"네트워크 선택"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"연결 끊김"</string>
+ <string name="network_connected" msgid="4943925032253989621">"연결됨"</string>
+ <string name="network_connecting" msgid="76404590784733557">"연결 중…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"연결할 수 없음"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"네트워크를 찾을 수 없습니다."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"네트워크를 찾지 못했습니다. 다시 시도해 주세요."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(금지됨)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 92b7e21..73bb800 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -3482,7 +3482,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Жеке"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Жумуш"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Колдонмолор: Баары"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Колдонмолор: Өчүрүлгөн"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категориялар: Өтө маанилүү"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категориялар: Маанилүүлү эмес"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категориялар: Өчүрүлгөн"</string>
@@ -4133,9 +4134,9 @@
<string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"Түзмөктүн батареясынын кубатынын мөөнөтүн көбөйтүү"</string>
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"Телефондун батареясынын кубатынын мөөнөтүн көбөйтүү"</string>
<string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
- <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Шыңгыратууну өчүрүү"</string>
+ <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Шыңгырдын үнүн өчүрүү"</string>
<string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Кубат менен үнүн чоңойтуу баскычтарын чогуу басуу"</string>
- <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Шыңгыратууну өчүрүү баскычы"</string>
+ <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Шыңгырдын үнүн ыкчам өчүрүү"</string>
<string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Дирилдөө"</string>
<string name="prevent_ringing_option_mute" msgid="7551545579059879853">"Үнсүз"</string>
<string name="prevent_ringing_option_none" msgid="4656046650769569175">"Эч нерсе кылынбасын"</string>
@@ -4149,24 +4150,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Виртуалдык жогорку жыштык панелин иштетүү"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Бардык жөндөөлөр"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Жөндөөлөр"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Жарандык радио кызматынын дайындары"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Жарандык радио кызматынын дайындары"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Тармакты тандоо"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Ажыратылды"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Туташты"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Туташууда…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Туташпай койду"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Эч тармак табылган жок."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Тармактар табылбай койду. Кайра аракет кылыңыз."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(тыюу салынган)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 79d3de3..7b86b41 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ສ່ວນໂຕ"</string>
<string name="filter_work_apps" msgid="24519936790795574">"ວຽກ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ແອັບ: ທັງໝົດ"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ແອັບ: ປິດໄວ້ແລ້ວ"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ໝວດໝູ່: ຄວາມສຳຄັນເລັ່ງດ່ວນ"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ໝວດໝູ່: ຄວາມສຳຄັນຕ່ຳ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ໝວດໝູ່: ປິດໄວ້ແລ້ວ"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"ເປີດໃຊ້ແຜງຄວາມຖີ່ສູງແບບສະເໝືອນ"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"ການຕັ້ງຄ່າທັງໝົດ"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"ການຕັ້ງຄ່າຂອງທ່ານ"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"ຂໍ້ມູນ CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"ຂໍ້ມູນ CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ເລືອກເຄືອຂ່າຍ"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
+ <string name="network_connected" msgid="4943925032253989621">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
+ <string name="network_connecting" msgid="76404590784733557">"ກຳລັງເຊື່ອມຕໍ່…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ບໍ່ພົບເຄືອຂ່າຍ."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ບໍ່ພົບເຄືອຂ່າຍ. ກະລຸນາລອງໃໝ່ອີກເທື່ອໜຶ່ງ."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ຕ້ອງຫ້າມ)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 39cd0da..fb634cc 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -3587,7 +3587,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Asmeninės"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Darbas"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Programos: visos"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Programos: išjungtos"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorijos: skubi svarba"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorijos: maža svarba"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorijos: išjungtos"</string>
@@ -4296,24 +4297,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Įgalinti virtualųjį didelio dažnio skydelį"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Visi nustatymai"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Jūsų nustatymai"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS duomenys"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS duomenys"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Pasirinkti tinklą"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Atsijungta"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Prisijungta"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Prisijungiama…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nepavyko prisijungti"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nerasta jokių tinklų."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nepavyko rasti tinklų. Bandykite dar kartą."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(uždrausta)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2f7b1e9..8595fd1 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -3535,7 +3535,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Privātās"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Darba"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Lietotnes: visas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Lietotnes: izslēgts"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorijas: steidzams"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorijas: nav svarīgs"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorijas: izslēgts"</string>
@@ -4223,24 +4224,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Iespējot virtuālo augstas frekvences paneli"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Visi iestatījumi"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Jūsu iestatījumi"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS dati"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS dati"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Izvēlēties tīklu"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Nav savienojuma"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Izveidots savienojums"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Notiek savienojuma izveide…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nevarēja izveidot savienojumu"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Netika atrasts neviens tīkls."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Neizdevās atrast tīklus. Mēģiniet vēlreiz."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(aizliegts)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 086a54af5..9d4f1d4 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Лични"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Службени"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Апликации: сите"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Апликации: исклучени"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категории: итна важност"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категории: мала важност"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категории: исклучени"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Овозможи виртуелна табла за висока фреквенција"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Сите поставки"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Вашите поставки"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-податоци"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-податоци"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Изберете мрежа"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Исклучена"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Поврзана"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Се поврзува…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Не може да се поврзе"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Не се најдени мрежи."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Не најдовме мрежи. Обидете се повторно."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(забранета)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 82b3d05..9e34899 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"വ്യക്തിഗതം"</string>
<string name="filter_work_apps" msgid="24519936790795574">"ഔദ്യോഗികം"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ആപ്പുകൾ: എല്ലാം"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ആപ്പുകൾ: ഓഫാക്കി"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"വിഭാഗങ്ങൾ: അടിയന്തര പ്രാധാന്യം"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"വിഭാഗങ്ങൾ: പ്രാധാന്യം കുറഞ്ഞത്"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"വിഭാഗങ്ങൾ: ഓഫാക്കി"</string>
@@ -3950,7 +3951,7 @@
<string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"ആപ്പുകൾ മാറാൻ, ഹോം ബട്ടണിൽ സ്വൈപ്പ് ചെയ്യുക. എല്ലാ ആപ്പുകളും കാണാൻ വീണ്ടും സ്വൈപ്പ് ചെയ്യുക. ഏത് സ്ക്രീനിൽ നിന്നും പ്രവർത്തിക്കുന്നു. നിങ്ങളുടെ സ്ക്രീനിന്റെ താഴെ വലത് ഭാഗത്ത് തുടർന്നങ്ങോട്ട് അവലോകന ബട്ടൺ ഉണ്ടാവുകയില്ല."</string>
<string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"പുതിയ ഹോം ബട്ടൺ പരീക്ഷിക്കുക"</string>
<string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"ആപ്പുകൾ മാറാൻ പുതിയ വിരൽചലനം ഓണാക്കുക"</string>
- <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ഫോൺ പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
+ <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ഫോൺ പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പ് ചെയ്യുക"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ടാബ്ലെറ്റ് പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"ഉപകരണം പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
<string name="ambient_display_summary" msgid="8534654210539169707">"സമയവും അറിയിപ്പുകളും മറ്റ് വിവരങ്ങളും പരിശോധിക്കുന്നതിന്, നിങ്ങളുടെ സ്ക്രീനിൽ രണ്ട് തവണ ടാപ്പ് ചെയ്യുക."</string>
@@ -3962,7 +3963,7 @@
<string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"സമയവും അറിയിപ്പുകളും മറ്റ് വിവരങ്ങളും പരിശോധിക്കുന്നതിന്, നിങ്ങളുടെ ഉപകരണം കയ്യിലെടുക്കുക."</string>
<string name="ambient_display_reach_title" msgid="6519700935117799437">"എത്തി എന്ന് കാണിക്കുന്ന വിരൽചലനം"</string>
<string name="ambient_display_reach_summary" product="default" msgid="1220765153509895824"></string>
- <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"അറിയിപ്പുകൾക്ക് വിരലടയാളം സ്വൈപ്പുചെയ്യുക"</string>
+ <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"അറിയിപ്പുകൾക്ക് വിരലടയാളം സ്വൈപ്പ് ചെയ്യുക"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"ഫിംഗർപ്രിന്റ് സ്വൈപ്പ്"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"നിങ്ങളുടെ അറിയിപ്പുകൾ പരിശോധിക്കാൻ ഫോണിന്റെ പിൻവശത്തുള്ള വിരലടയാള സെൻസറിൽ താഴേക്ക് സ്വൈപ്പുചെയ്യുക."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"നിങ്ങളുടെ അറിയിപ്പുകൾ പരിശോധിക്കാൻ, ടാബ്ലെറ്റിന്റെ പിൻവശത്തുള്ള വിരലടയാള സെൻസറിൽ താഴേക്ക് സ്വൈപ്പുചെയ്യുക."</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"വെർച്വലായ ഉയർന്ന ആവൃത്തി പാനൽ പ്രവർത്തനക്ഷമമാക്കൂ"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"എല്ലാ ക്രമീകരണവും"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"നിങ്ങളുടെ ക്രമീകരണം"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ഡാറ്റ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ഡാറ്റ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"നെറ്റ്വര്ക്ക് തിരഞ്ഞെടുക്കുക"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"വിച്ഛേദിച്ചു"</string>
+ <string name="network_connected" msgid="4943925032253989621">"കണക്റ്റ് ചെയ്തു"</string>
+ <string name="network_connecting" msgid="76404590784733557">"കണക്റ്റ് ചെയ്യുന്നു…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"കണക്റ്റ് ചെയ്യാനായില്ല"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"നെറ്റ്വർക്കുകളൊന്നും കണ്ടെത്തിയില്ല."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"നെറ്റ്വർക്കുകൾ കണ്ടെത്താനായില്ല. വീണ്ടും ശ്രമിക്കുക."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(നിരോധിക്കപ്പെട്ടത്)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 2f3964a..199663b 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -3481,7 +3481,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Хувийн"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Ажил"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Апп: Бүх"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Апп: Унтраасан"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категори: Яаралтай ач холбогдолтой"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категори: Бага ач холбогдолтой"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категори: Унтраасан"</string>
@@ -4148,24 +4149,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Виртуал өндөр давтамжтай самбарыг идэвхжүүлэх"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Бүх тохиргоо"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Таны тохиргоо"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Дата"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Дата"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Сүлжээ сонгох"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Салсан"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Холбогдсон"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Холбогдож байна…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Холбогдож чадсангүй"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Сүлжээ олдсонгүй."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Сүлжээ олдсонгүй. Дахин оролдоно уу."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(хориглосон)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 1e85f38..2f61ec4 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -3484,7 +3484,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"वैयक्तिक"</string>
<string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"अॅप्स: सर्व"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"अॅप्स: बंद केलेली"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"वर्गवाऱ्या: तातडीचे महत्त्व"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"वर्गवाऱ्या: कमी महत्त्व"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"वर्गवाऱ्या: बंद केलेल्या"</string>
@@ -4151,24 +4152,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"व्हर्च्युअल उच्च अचूकता पॅनल सुरू करा"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"सर्व सेटिंग्ज"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"तुमच्या सेटिंग्ज"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS डेटा"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS डेटा"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"नेटवर्क निवडा"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"डिस्कनेक्ट केलेले"</string>
+ <string name="network_connected" msgid="4943925032253989621">"कनेक्ट केलेले"</string>
+ <string name="network_connecting" msgid="76404590784733557">"कनेक्ट करत आहे…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"कनेक्ट करता आले नाही"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"कोणतीही नेटवर्क आढळली नाहीत."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"नेटवर्क मिळू शकले नाहीत. पुन्हा प्रयत्न करा."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(मनाई केलेले)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index d6f5438..37b3897 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Peribadi"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Kerja"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apl: Semua"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apl: Dimatikan"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategori: Kepentingan segera"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategori: Kepentingan rendah"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategori: Dimatikan"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Dayakan Panel Kekerapan Tinggi Maya"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Semua Tetapan"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Tetapan Anda"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Data CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Data CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Pilih rangkaian"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Diputuskan sambungan"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Disambungkan"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Menyambung…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Tidak dapat menyambung"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Tiada rangkaian ditemui."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Tidak menemui rangkaian. Cuba lagi."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(dilarang)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 9774987..3a7d699 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ကိုယ်ရေး"</string>
<string name="filter_work_apps" msgid="24519936790795574">"အလုပ်"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"အက်ပ်− အားလုံး"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"အက်ပ်များ− ပိတ်ထားသည်"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ကဏ္ဍများ - အလွန်အရေးကြီး"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ကဏ္ဍများ− အရေးမကြီး"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ကဏ္ဍများ− ပိတ်ထားသည်"</string>
@@ -4140,7 +4141,7 @@
<string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"တုန်ခါရန်"</string>
<string name="prevent_ringing_option_mute" msgid="7551545579059879853">"အသံတိတ်ရန်"</string>
<string name="prevent_ringing_option_none" msgid="4656046650769569175">"ပြောင်းလဲမှု မလုပ်ပါနှင့်"</string>
- <string name="prevent_ringing_option_vibrate_summary" msgid="1157524435626890116">"ဖွင့်ရန် (တုန်ခါမှု)"</string>
+ <string name="prevent_ringing_option_vibrate_summary" msgid="1157524435626890116">"ဖွင့်ထားသည် (တုန်ခါမှု)"</string>
<string name="prevent_ringing_option_mute_summary" msgid="4472465110708640980">"ဖွင့်ရန် (အသံတိတ်ရန်)"</string>
<string name="prevent_ringing_option_none_summary" msgid="5013718946609276137">"ပိတ်ရန်"</string>
<string name="pref_title_network_details" msgid="7186418845727358964">"ကွန်ရက် အသေးစိတ်များ"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"ပကတိအသွင် ကြိမ်နှုန်းမြင့် အကန့်ကို အသုံးပြုသည်"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"ဆက်တင်အားလုံး"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"သင့်ဆက်တင်များ"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ဒေတာ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ဒေတာ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ကွန်ရက် ရွေးရန်"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ချိတ်ဆက်မထားပါ"</string>
+ <string name="network_connected" msgid="4943925032253989621">"ချိတ်ဆက်ထားသည်"</string>
+ <string name="network_connecting" msgid="76404590784733557">"ချိတ်ဆက်နေသည်…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"ချိတ်ဆက်၍ မရပါ"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ကွန်ရက်များ မတွေ့ပါ။"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ကွန်ရက် ရှာမတွေ့ပါ။ ထပ်စမ်းကြည့်ပါ။"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(တားမြစ်ထားသည်)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1bef26c..336797f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personlig"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Jobb"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apper: alle"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apper: slått av"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorier: svært høy viktighet"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorier: lav viktighet"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorier: slått av"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Slå på virtuelt høyfrekvenspanel"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Alle innstillinger"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Innstillingene dine"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Velg nettverk"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Frakoblet"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Tilkoblet"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Kobler til …"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Kunne ikke koble til"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Fant ingen nettverk."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Fant ingen nettverk. Prøv på nytt."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(forbudt)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b016c23..2d3ca65 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
<string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"अनुप्रयोगहरू: सबै"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"अनुप्रयोगहरू: निष्क्रिय पारिएका"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"प्रकारहरू: अत्यन्तै महत्त्वका"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"प्रकारहरू: कम महत्त्वका"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"प्रकारहरू: निष्क्रिय पारिएका"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"भर्चुअल उच्च आवृत्ति प्यानल सक्षम पार्नुहोस्"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"सबै सेटिङहरू"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"तपाईंका सेटिङहरू"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS डेटा"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS डेटा"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"नेटवर्क छनौट गर्नुहोस्"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"विच्छेद गरियो"</string>
+ <string name="network_connected" msgid="4943925032253989621">"जडान गरियो"</string>
+ <string name="network_connecting" msgid="76404590784733557">"जडान गर्दै…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"जडान गर्न सकिएन"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"कुनै पनि नेटवर्क भेटिएन।"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"नेटवर्कहरू फेला पार्न सकिएन। फेरि प्रयास गर्नुहोस्।"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(निषेध गरिएको)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 34d2e90..975aafa 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Persoonlijk"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Werk"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: alle"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: uitgeschakeld"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorieën: urgent belang"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorieën: klein belang"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorieën: uitgeschakeld"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Virtueel venster voor hoge frequentie inschakelen"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Alle instellingen"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Je instellingen"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-gegevens"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-gegevens"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Netwerk kiezen"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Verbinding verbroken"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Verbonden"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Verbinding maken…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Kan geen verbinding maken"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Geen netwerken gevonden."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Kan geen netwerken vinden. Probeer het opnieuw."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(niet toegestaan)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 1770f2a..1abc597 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ବ୍ୟକ୍ତିଗତ"</string>
<string name="filter_work_apps" msgid="24519936790795574">"କାର୍ଯ୍ୟ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ଆପ୍: ସମସ୍ତ"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ଆପ୍: ବନ୍ଦ ଅଛି"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ବର୍ଗ: ଅତ୍ୟନ୍ତ ମହତ୍ତ୍ୱପୂର୍ଣ୍ଣ"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ବର୍ଗ: କମ୍ ଗୁରୁତ୍ୱପୂର୍ଣ୍ଣ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ବର୍ଗ: ଅଫ୍ ରହିଛି"</string>
@@ -4152,24 +4153,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"ଭର୍ଚୁଆଲ୍ ଉଚ୍ଚମାନର ଫ୍ରିକ୍ୟୁଏନ୍ସି ପ୍ୟାନେଲ୍ ସକ୍ଷମ କରନ୍ତୁ"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"ସମସ୍ତ ସେଟିଂସ୍"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"ଆପଣଙ୍କ ସେଟିଂସ୍"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ଡାଟା"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ଡାଟା"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ନେଟ୍ୱର୍କ ବାଛନ୍ତୁ"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ବିଛିନ୍ନ ହୋଇଗଲା"</string>
+ <string name="network_connected" msgid="4943925032253989621">"ସଂଯୋଗ ହୋଇଛି"</string>
+ <string name="network_connecting" msgid="76404590784733557">"ସଂଯୋଗ କରୁଛି…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"ସଂଯୋଗ କରିହେଲା ନାହିଁ"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"କୌଣସି ନେଟ୍ୱର୍କ ମିଳୁନାହିଁ"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ନେଟ୍ୱର୍କ ମିଳୁନାହିଁ। ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ଅନୁମତିପ୍ରାପ୍ତ ନୁହେଁ)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index c1343de..97fdc5e 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ਨਿੱਜੀ"</string>
<string name="filter_work_apps" msgid="24519936790795574">"ਦਫ਼ਤਰ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ਐਪਾਂ: ਸਾਰੀਆਂ"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ਐਪਾਂ: ਬੰਦ ਹਨ"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ਸ਼੍ਰੇਣੀਆਂ: ਜ਼ਰੂਰੀ ਮਹੱਤਵ"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ਸ਼੍ਰੇਣੀਆਂ: ਘੱਟ ਮਹੱਤਵ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ਸ਼੍ਰੇਣੀਆਂ: ਬੰਦ ਹਨ"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"ਆਭਾਸੀ ਉੱਚ ਬਾਰੰਬਾਰਤਾ ਪੈਨਲ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"ਸਾਰੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"ਤੁਹਾਡੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ਡਾਟਾ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ਡਾਟਾ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ਨੈੱਟਵਰਕ ਚੁਣੋ"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ਡਿਸਕਨੈਕਟ ਹੋਇਆ"</string>
+ <string name="network_connected" msgid="4943925032253989621">"ਕਨੈਕਟ ਹੈ"</string>
+ <string name="network_connecting" msgid="76404590784733557">"ਕਨੈਕਟ ਹੋ ਰਿਹਾ ਹੈ…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ਕੋਈ ਨੈੱਟਵਰਕ ਨਹੀਂ ਮਿਲੇ।"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ਨੈੱਟਵਰਕ ਨਹੀਂ ਮਿਲ ਸਕੇ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ਵਰਜਿਤ)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a2f0c89..8f3bcbc 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -3587,7 +3587,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Osobiste"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Do pracy"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacje: wszystkie"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacje: wyłączone"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorie: pilne"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorie: mało ważne"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorie: wyłączone"</string>
@@ -4296,24 +4297,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Włącz wirtualny panel wys. częstotliwości"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Wszystkie ustawienia"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Twoje ustawienia"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dane CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dane CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Wybierz sieć"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Odłączono"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Połączono"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Łączę…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nie udało się połączyć"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nie znaleziono sieci."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nie udało się znaleźć sieci. Spróbuj ponownie."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(dostęp zabroniony)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index cec8a45..6c4f954 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Trabalho"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: todas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: desativadas"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorias: importância urgente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorias: importância baixa"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorias: desativadas"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Ativar o Painel de alta frequência virtual"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Todas as configurações"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Suas configurações"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dados CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dados CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Escolher rede"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Desconectado"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Conectado"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Conectando…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Não foi possível conectar"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nenhuma rede encontrada."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Não foi possível encontrar redes. Tente novamente."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(proibida)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e2f62b8..0829687 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -727,7 +727,7 @@
<string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançadas"</string>
<string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Avançado"</string>
<string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode comunicar com dispositivos próximos."</string>
- <string name="bluetooth_scanning_on_info_message" msgid="824285504325592644">"Quando o Bluetooth está ativado, o dispositivo pode comunicar com outros dispositivos Bluetooth próximos.\n\nPara melhorar a experiência do dispositivo, as aplicações e os serviços podem continuar a procurar dispositivos próximos a qualquer momento, mesmo quando o Bluetooth está desativado. Pode utilizar esta opção, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização. Pode alterar esta opção nas "<annotation id="link">"definições de análise"</annotation>"."</string>
+ <string name="bluetooth_scanning_on_info_message" msgid="824285504325592644">"Quando o Bluetooth está ativado, o dispositivo pode comunicar com outros dispositivos Bluetooth próximos.\n\nPara melhorar a experiência do dispositivo, as aplicações e os serviços podem continuar a procurar dispositivos próximos em qualquer altura, mesmo quando o Bluetooth está desativado. Pode utilizar esta opção, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização. Pode alterar esta opção nas "<annotation id="link">"definições de análise"</annotation>"."</string>
<string name="ble_scan_notify_text" msgid="1295915006005700650">"Para melhorar a precisão da localização, os serviços e as aplicações do sistema podem continuar a detetar dispositivos Bluetooth. Pode alterar esta opção nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de procura<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="bluetooth_connect_failed" msgid="4500234659813241053">"Não foi possível ligar. Tente novamente."</string>
<string name="device_details_title" msgid="6576953269221085300">"Detalhes do disp."</string>
@@ -817,7 +817,7 @@
<string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Para utilizar, selecionar um fornecedor de classificação de rede"</string>
<string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Para utilizar, selecionar um fornecedor de classificação de rede compatível"</string>
<string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
- <string name="wifi_scan_notify_text" msgid="5544778734762998889">"Para melhorar a precisão da localização, as aplicações e os serviços podem continuar a procurar redes Wi-Fi a qualquer momento, mesmo quando o Wi-Fi está desativado. Pode utilizar esta opção, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização. Pode alterar esta opção nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de análise<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+ <string name="wifi_scan_notify_text" msgid="5544778734762998889">"Para melhorar a precisão da localização, as aplicações e os serviços podem continuar a procurar redes Wi-Fi em qualquer altura, mesmo quando o Wi-Fi está desativado. Pode utilizar esta opção, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização. Pode alterar esta opção nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de análise<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Para melhorar a precisão da localização, ative a procura de redes Wi-Fi nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de análise<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Não mostrar de novo"</string>
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi ligada durante suspensão"</string>
@@ -852,7 +852,7 @@
<string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automática (WPS)"</string>
<string name="wifi_settings_scanning_required_title" msgid="3815269816331500375">"Pretende ativar a procura de Wi‑Fi?"</string>
<string name="wifi_settings_scanning_required_summary" msgid="6352918945128328916">"Para ativar o Wi‑Fi automaticamente, primeiro tem de ativar a procura de Wi‑Fi."</string>
- <string name="wifi_settings_scanning_required_info" msgid="3155631874578023647">"A procura de Wi-Fi permite que as aplicações e os serviços procurem redes Wi‑Fi a qualquer momento, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
+ <string name="wifi_settings_scanning_required_info" msgid="3155631874578023647">"A procura de Wi-Fi permite que as aplicações e os serviços procurem redes Wi‑Fi em qualquer altura, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
<string name="wifi_settings_scanning_required_turn_on" msgid="1364287182804820646">"Ativar"</string>
<string name="wifi_settings_scanning_required_enabled" msgid="5527653791584018157">"Procura de Wi-Fi ativada"</string>
<string name="wifi_show_advanced" msgid="3409422789616520979">"Opções avançadas"</string>
@@ -1561,9 +1561,9 @@
<string name="location_low_battery_use" msgid="8602232529541903596">"Utilização de bateria baixa"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"A analisar"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Procurar por Wi‑Fi"</string>
- <string name="location_scanning_wifi_always_scanning_description" msgid="2691110218127379249">"Permita que as aplicações e os serviços procurem redes Wi‑Fi a qualquer momento, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
+ <string name="location_scanning_wifi_always_scanning_description" msgid="2691110218127379249">"Permita que as aplicações e os serviços procurem redes Wi‑Fi em qualquer altura, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
<string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Procurar por Bluetooth"</string>
- <string name="location_scanning_bluetooth_always_scanning_description" msgid="1285526059945206128">"Permita que as aplicações e os serviços procurem dispositivos próximos a qualquer momento, mesmo quando o Bluetooth estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
+ <string name="location_scanning_bluetooth_always_scanning_description" msgid="1285526059945206128">"Permita que as aplicações e os serviços procurem dispositivos próximos em qualquer altura, mesmo quando o Bluetooth estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
<string name="location_network_based" msgid="9134175479520582215">"Wi-Fi e localização de rede de telemóvel"</string>
<string name="location_neighborhood_level" msgid="5141318121229984788">"Permitir que aplic. usem o serv. localiz. Google p/ calcular mais rapida/ a sua localização. Dados localização recolhidos e enviados à Google."</string>
<string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localização determinada por Wi-Fi"</string>
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
<string name="filter_work_apps" msgid="24519936790795574">"De trabalho"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplicações: todas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplicações: desativadas"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorias: importância alta"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorias: importância baixa"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorias: desativadas"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Ativar painel virtual de alta frequência"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Todas as definições"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"As suas definições"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dados de CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dados de CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Escolher rede"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Desligada."</string>
+ <string name="network_connected" msgid="4943925032253989621">"Ligada."</string>
+ <string name="network_connecting" msgid="76404590784733557">"A ligar…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Não foi possível estabelecer ligação."</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nenhuma rede encontrada."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Não foi possível encontrar qualquer rede. Tente novamente."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(proibida)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index cec8a45..6c4f954 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Trabalho"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: todas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: desativadas"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorias: importância urgente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorias: importância baixa"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorias: desativadas"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Ativar o Painel de alta frequência virtual"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Todas as configurações"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Suas configurações"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dados CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dados CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Escolher rede"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Desconectado"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Conectado"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Conectando…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Não foi possível conectar"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nenhuma rede encontrada."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Não foi possível encontrar redes. Tente novamente."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(proibida)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 646cb67..88a4ad8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -3535,7 +3535,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personale"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Serviciu"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplicații: toate"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplicații: dezactivate"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorii: importanță urgentă"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorii: importanță scăzută"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorii: dezactivate"</string>
@@ -4223,24 +4224,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Activați panoul virtual de frecvență înaltă"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Toate setările"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Setări"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Date CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Date CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Alegeți o rețea"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Deconectată"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Conectată"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Se conectează…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nu s-a putut conecta"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nicio rețea găsită."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nu s-au găsit rețele. Încercați din nou."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(interzisă)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index fa17617..6e25efd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -3587,7 +3587,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Личные"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Рабочие"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Приложения: все"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Приложения: отключенные"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категории: крайняя важность"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категории: низкая важность"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категории: отключенные"</string>
@@ -4296,24 +4297,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Включить виртуальную High Frequency Panel"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Все настройки"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Ваши настройки"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Данные CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Данные CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Выбрать сеть"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Не подключено"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Подключено"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Подключение…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Не удалось подключиться к сети"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Сети не найдены."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Сети не найдены. Повторите попытку."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(доступ запрещен)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 669d725..4324c3e 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"පුද්ගලික"</string>
<string name="filter_work_apps" msgid="24519936790795574">"කාර්යාලය"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"යෙදුම්: සියල්ල"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"යෙදුම්: අක්රිය කර ඇත"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ප්රවර්ග: හදිසි වැදගත්කම"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ප්රවර්ග: අඩු වැදගත්කම"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ප්රවර්ග: අක්රිය කර ඇත"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"අතථ්ය අධිසංඛ්යාත පුවරුව සබල කරන්න"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"සියලු සැකසීම්"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"ඔබගේ සැකසීම්"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS දත්ත"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS දත්ත"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ජාලය තෝරන්න"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"විසන්ධි විය"</string>
+ <string name="network_connected" msgid="4943925032253989621">"සම්බන්ධයි"</string>
+ <string name="network_connecting" msgid="76404590784733557">"සබැඳෙමින්…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"සම්බන්ධ වීමට නොහැකි විය"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ජාලයක් හමු නොවීය."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ජාල සොයා ගත නොහැකි විය. නැවත උත්සාහ කරන්න."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(තහනම්)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 97d5717..5655d11 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -3587,7 +3587,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Osobné"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Pracovné"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikácie: Všetky"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikácie: Vypnuté"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategórie: Neodkladná dôležitosť"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategórie: Nízka dôležitosť"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategórie: Vypnuté"</string>
@@ -4296,24 +4297,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Povoliť virtuálny vysokofrekvenčný panel"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Všetky nastavenia"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Vaše nastavenia"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dáta CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dáta CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Vybrať sieť"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Odpojené"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Pripojené"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Pripája sa…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nepodarilo sa pripojiť"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nebola nájdená žiadna sieť."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nepodarilo sa nájsť siete. Skúste to znova."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(zakázané)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 0532447..ac41a29 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -3587,7 +3587,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Osebno"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Služba"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacije: vse"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacije: izklopljeno"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorije: nujna pomembnost"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorije: nizka pomembnost"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorije: izklopljeno"</string>
@@ -4296,24 +4297,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Omogoči navidezno ploščo za hitro osveževanje"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Vse nastavitve"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Vaše nastavitve"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Podatki CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Podatki CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Izbira omrežja"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Brez povezave"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Povezano"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Povezovanje …"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Povezave ni bilo mogoče vzpostaviti"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Najdeno ni bilo nobeno omrežje."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Omrežij ni bilo mogoče najti. Poskusite znova."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(prepovedano)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index d11c728..43b6eac 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personale"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Punë"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacionet: Të gjitha"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacionet: Të çaktivizuara"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategoritë: Rëndësia urgjente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategoritë: Përparësia e ulët"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategoritë: Të çaktivizuara"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Aktivizo panelin virtual me frekuencë të lartë"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Të gjitha cilësimet"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Cilësimet e tua"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Të dhënat e CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Të dhënat e CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Zgjidh rrjetin"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"I shkëputur"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Lidhur"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Po lidhet…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nuk mund të lidhej"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nuk u gjetën rrjete."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Rrjetet nuk mund të gjendeshin. Provo përsëri."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ndalohet)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 8b6f92e..25f64c8 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -3535,7 +3535,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Личне"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Посао"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Апликације: све"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Апликације: искључено"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категорије: висок приоритет"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категорије: низак приоритет"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категорије: искључено"</string>
@@ -4223,24 +4224,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Омогућите виртуелну плочу високе фреквенције"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Сва подешавања"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Подешавања"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS подаци"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS подаци"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Одаберите мрежу"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Веза је прекинута"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Повезано"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Повезује се…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Повезивање није успело"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Није пронађена ниједна мрежа."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Нисмо успели да пронађемо мреже. Пробајте поново."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(забрањено)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ba0e216..886ca5f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personligt"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Arbetet"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Appar: alla"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Appar: inaktiverade"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorier: brådskande avisering"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorier: oviktig avisering"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorier: inaktiverad"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Aktivera den virtuella panelen för hög frekvens"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Alla inställningar"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Dina inställningar"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Data via CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Data via CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Välj nätverk"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Frånkopplad"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Ansluten"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Ansluter …"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Det gick inte att ansluta"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Inga nätverk hittades."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Det gick inte att hitta nätverk. Försök igen."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(förbjudet)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 05a164d..2f3251e 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Binafsi"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Kazini"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Programu: Zote"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Programu zilizozimwa"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Aina: Umuhimu wa dharura"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Aina: Umuhimu wa chini"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Aina: Zimezimwa"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Washa Kidirisha cha Masafa Pepe ya Juu"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Mipangilio Yote"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Mipangilio Yako"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Data ya CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Data ya CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Chagua mtandao"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Haijaunganishwa"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Imeunganisha"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Inaunganisha…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Imeshindwa kuunganisha"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Hakuna mitandao iliyopatikana."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Imeshindwa kupata mitandao. Jaribu tena."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(hairuhusiwi)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index fcaca40..dbece60 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"தனிப்பட்டவை"</string>
<string name="filter_work_apps" msgid="24519936790795574">"பணியிடம்"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"பயன்பாடுகள்: எல்லாம்"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ஆப்ஸ்: ஆஃப் செய்தவை"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"வகைகள்: அதிக முக்கியத்துவம்"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"வகைகள்: குறைந்த முக்கியத்துவம்"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"வகைகள்: முடக்கப்பட்டன"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"விரிச்சுவல் உயர் அதிர்வெண் பேனலை இயக்கு"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"அனைத்து அமைப்புகளும்"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"உங்கள் அமைப்புகள்"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS டேட்டா"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS டேட்டா"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"நெட்வொர்க்கைத் தேர்வுசெய்"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"தொடர்பு துண்டிக்கப்பட்டது"</string>
+ <string name="network_connected" msgid="4943925032253989621">"இணைக்கப்பட்டது"</string>
+ <string name="network_connecting" msgid="76404590784733557">"இணைக்கிறது…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"இணைக்க முடியவில்லை"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"நெட்வொர்க்குகள் இல்லை."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"நெட்வொர்க்குகளைக் கண்டறிய முடியவில்லை. மீண்டும் முயலவும்."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(தடுக்கப்பட்டது)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index dfd0d47..6c8a5fc 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -3485,7 +3485,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"వ్యక్తిగతం"</string>
<string name="filter_work_apps" msgid="24519936790795574">"కార్యాలయం"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"అనువర్తనాలు: అన్నీ"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"యాప్లు: ఆఫ్ చేయబడినవి"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"వర్గాలు: అత్యవసర ప్రాధాన్యత"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"వర్గాలు: తక్కువ ప్రాధాన్యత"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"వర్గాలు: ఆఫ్ చేయబడినవి"</string>
@@ -4152,24 +4153,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"వర్చువల్ హై ఫ్రీక్వెన్సీ ప్యానెల్ను ప్రారంభించండి"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"అన్ని సెట్టింగ్లు"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"మీ సెట్టింగ్లు"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS డేటా"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS డేటా"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"నెట్వర్క్ను ఎంచుకోండి"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"డిస్కనెక్ట్ అయ్యింది"</string>
+ <string name="network_connected" msgid="4943925032253989621">"కనెక్ట్ అయింది"</string>
+ <string name="network_connecting" msgid="76404590784733557">"కనెక్ట్ అవుతోంది"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"కనెక్ట్ చేయడం సాధ్యపడలేదు"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"నెట్వర్క్లు కనుగొనబడలేదు."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"నెట్వర్క్లను కనుగొనడం సాధ్యపడలేదు. మళ్లీ ప్రయత్నించండి."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(నిషేధించబడింది)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ae7546c..0388a03 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ส่วนตัว"</string>
<string name="filter_work_apps" msgid="24519936790795574">"งาน"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"แอป: ทั้งหมด"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"แอป: ปิดแล้ว"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"หมวดหมู่: ความสำคัญเร่งด่วน"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"หมวดหมู่: ความสำคัญต่ำ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"หมวดหมู่: ปิดแล้ว"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"เปิดใช้แผงความถี่สูงเสมือน"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"การตั้งค่าทั้งหมด"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"การตั้งค่าของคุณ"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"ข้อมูล CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"ข้อมูล CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"เลือกเครือข่าย"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"เลิกเชื่อมต่อแล้ว"</string>
+ <string name="network_connected" msgid="4943925032253989621">"เชื่อมต่อแล้ว"</string>
+ <string name="network_connecting" msgid="76404590784733557">"เชื่อมต่อ…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"เชื่อมต่อไม่ได้"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ไม่พบเครือข่าย"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ไม่พบเครือข่าย โปรดลองอีกครั้ง"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ห้ามใช้)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 12b41d7..e1f9e8e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Trabaho"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Mga App: Lahat"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Mga App: Naka-off"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Mga Kategorya: Mahalagang-mahalaga"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Mga Kategorya: Hindi Mahalaga"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Mga Kategorya: Naka-off"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"I-enable ang High Frequency na Virtual Panel"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Lahat ng Setting"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Ang Iyong Mga Setting"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Data ng CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Data ng CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Pumili ng network"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Nadiskonekta"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Nakakonekta"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Kumokonekta…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Hindi makakonekta"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Walang nakitang network."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Hindi makahanap ng mga network. Subukang muli."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ipinagbabawal)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cb0143f..f7ea4a6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Kişisel uygulamalar"</string>
<string name="filter_work_apps" msgid="24519936790795574">"İş uygulamaları"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Uygulamalar: Tümü"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Uygulamalar: Kapalı"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategoriler: Önem düzeyi acil"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategoriler: Önem düzeyi düşük"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategoriler: Kapalı"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Sanal Yüksek Frekans Panelini Etkinleştir"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Tüm Ayarlar"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Ayarlarınız"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Verisi"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Verisi"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Ağ seç"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Bağlı değil"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Bağlı"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Bağlanıyor…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Bağlanılamadı"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Hiçbir ağ bulunamadı."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Ağlar bulunamadı. Tekrar deneyin."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(yasak)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1b034ad..dd3eff9 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -3587,7 +3587,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Особисті"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Робочі"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Додатки: усі"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Додатки: вимкнені"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категорії: терміново"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категорії: низький пріоритет"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категорії: вимкнені"</string>
@@ -4296,24 +4297,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Увімкнути віртуальну панель високих частот"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Усі налаштування"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Ваші налаштування"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Дані CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Дані CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Вибрати мережу"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Від’єднано"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Під’єднано"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Під’єднання…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Не вдалося під’єднати"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Мереж не знайдено"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Не вдалося знайти мережу. Повторіть спробу."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(заборонено)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index a01ba8a..17e3925 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -3481,7 +3481,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ذاتی"</string>
<string name="filter_work_apps" msgid="24519936790795574">"دفتری"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ایپس: سبھی"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ایپس: آف کردہ"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"زمرے: فوری اہمیت"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"زمرے: کم اہمیت"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"زمرے: آف کردہ"</string>
@@ -4148,24 +4149,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"ورچوئل اعلی فریکوئنسی پینل فعال کریں"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"تمام ترتیبات"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"آپ کی ترتیبات"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ڈیٹا"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ڈیٹا"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"نیٹ ورک کا انتخاب کریں"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"غیر منسلک"</string>
+ <string name="network_connected" msgid="4943925032253989621">"منسلک"</string>
+ <string name="network_connecting" msgid="76404590784733557">"منسلک ہو رہا ہے…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"منسلک نہیں کیا جا سکا"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"کوئی نیٹ ورک نہیں ملا۔"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"نیٹ ورکس نہیں مل سکے۔ دوبارہ کوشش کریں۔"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ممنوع)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 294d50a..7e0de02 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -3499,7 +3499,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Shaxsiy"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Ishga oid"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Ilovalar: hammasi"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Ilovalar: o‘chiq"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Turkumlar: favqulodda muhim"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Turkumlar: unchalik muhim emas"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Tukrumlar: o‘chiq"</string>
@@ -3956,7 +3957,7 @@
<string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Telefonni boshqarish uchun tezkor imo-ishoralar"</string>
<string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Planshetni boshqarish uchun tezkor imo-ishoralar"</string>
<string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Qurilmani boshqarish uchun tezkor imo-ishoralar"</string>
- <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kameraga o‘tish"</string>
+ <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kamerani tezkor ochish"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kamerani tezda ochish uchun quvvat tugmasini ikki marta bosing. Har qanday ekranda ishlaydi."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Kamerani tezkor ochish"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamerani almashtirish"</string>
@@ -3978,7 +3979,7 @@
<string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Vaqt, bildirishnoma va boshqa ma’lumotlarni tekshirish uchun qurilmani qo‘lingizga oling."</string>
<string name="ambient_display_reach_title" msgid="6519700935117799437">"Ruxsat olish uchun ishora"</string>
<string name="ambient_display_reach_summary" product="default" msgid="1220765153509895824"></string>
- <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Barmoq izi skaneridan foydalanish"</string>
+ <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Bildirishnomalarni ochish uchun barmoq izi skaneridan foydalanish"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Barmoq izi skaneri"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Bildirishnomalarni tekshirish uchun telefon orqasidagi barmoq izi skaneri ustida pastga suring"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Bildirishnomalarni tekshirish uchun planshet orqasidagi barmoq izi skaneri ustida pastga suring"</string>
@@ -4166,24 +4167,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Virtual yuqori chastota panelini yoqish"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Barcha sozlamalar"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Sozlamalaringiz"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS axboroti"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS axboroti"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Tarmoqni tanlash"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Ulanmagan"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Ulandi"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Ulanmoqda…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Ulanmadi"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Birorta ham tarmoq topilmadi."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Hech qanday tarmoq topilmadi. Qaytadan urining."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(taqiqlangan)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9b372e2..f3f73e9 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Cá nhân"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Cơ quan"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Ứng dụng: Tất cả"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Ứng dụng: Bị tắt"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Danh mục: Tầm q.trọng khẩn cấp"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Danh mục: Tầm quan trọng thấp"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Danh mục: Bị tắt"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Bật Bảng ảo tần suất làm mới cao"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Tất cả tùy chọn cài đặt"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Tùy chọn cài đặt của bạn"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dữ liệu CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dữ liệu CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Chọn mạng"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Đã ngắt kết nối"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Đã kết nối"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Đang kết nối…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Không thể kết nối"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Không tìm thấy mạng nào."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Không tìm thấy mạng. Hãy thử lại."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(cấm)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0a5d339..ba65cf0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"个人应用"</string>
<string name="filter_work_apps" msgid="24519936790795574">"工作应用"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"应用：全部"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"已屏蔽的应用"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"类别：重要性 - 紧急"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"类别：重要性 - 低"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"类别：已关闭"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"启用虚拟高频面板"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"所有设置"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"您的设置"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS 数据"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS 数据"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"选择网络"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"已断开连接"</string>
+ <string name="network_connected" msgid="4943925032253989621">"已连接"</string>
+ <string name="network_connecting" msgid="76404590784733557">"正在连接…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"无法连接"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"未找到网络。"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"找不到网络，请重试。"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"（禁止）"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 77756c1..84b471f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -3484,7 +3484,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
<string name="filter_work_apps" msgid="24519936790795574">"工作"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"應用程式：全部"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"應用程式：已關閉"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"類別：緊急重要性"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"類別：低重要性"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"類別：已關閉"</string>
@@ -4151,24 +4152,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"啟用虛擬高頻率面板"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"所有設定"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"您的設定"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS 數據"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS 數據"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"選擇網絡"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"連接已中斷"</string>
+ <string name="network_connected" msgid="4943925032253989621">"已連接"</string>
+ <string name="network_connecting" msgid="76404590784733557">"連接中…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"無法連接"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"找不到網絡。"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"找不到網絡，請再試一次。"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(禁止)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7e51076..be237d1 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -3483,7 +3483,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
<string name="filter_work_apps" msgid="24519936790795574">"工作"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"應用程式：全部"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"應用程式：已關閉"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"類別：緊急重要性"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"類別：低重要性"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"類別：已關閉"</string>
@@ -4150,24 +4151,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"啟用虛擬高頻率面板"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"所有設定"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"你的設定"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS 資料"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS 資料"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"選擇網路"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"連線中斷"</string>
+ <string name="network_connected" msgid="4943925032253989621">"已連線"</string>
+ <string name="network_connecting" msgid="76404590784733557">"連線中…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"無法連線"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"找不到網路。"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"找不到網路，請再試一次。"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(已禁止)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1431b95..4ff82ca 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -3484,7 +3484,8 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Okomuntu siqu"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Umsebenzi"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Izinhlelo zokusebenza: Konke"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Izinhlelo zokusebenza: Kuvaliwe"</string>
+ <!-- no translation found for filter_notif_blocked_apps (3383043508771300704) -->
+ <skip />
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Izigaba: Ukubaluleka okusheshayo"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Izigaba: Ukubaluleka okuphansi"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Izigaba: Kuvaliwe"</string>
@@ -4151,24 +4152,16 @@
<string name="high_frequency_display_device_summary" msgid="1476189143535389304">"Nika amandla iphaneli ebonakalayo yemvamisa ephezulu"</string>
<string name="homepage_all_settings" msgid="1245540304900512919">"Zonke izilungiselelo"</string>
<string name="homepage_personal_settings" msgid="3998213046366125494">"Izilungiselelo zakho"</string>
- <!-- no translation found for cbrs_data_switch (2438108549734702331) -->
- <skip />
- <!-- no translation found for cbrs_data_switch_summary (1359701543634843588) -->
- <skip />
- <!-- no translation found for choose_network_title (5702586742615861037) -->
- <skip />
- <!-- no translation found for network_disconnected (2933191767567503504) -->
- <skip />
- <!-- no translation found for network_connected (4943925032253989621) -->
- <skip />
- <!-- no translation found for network_connecting (76404590784733557) -->
- <skip />
- <!-- no translation found for network_could_not_connect (1113813392274155369) -->
- <skip />
- <!-- no translation found for empty_networks_list (2578752112731781190) -->
- <skip />
- <!-- no translation found for network_query_error (7487714485362598410) -->
- <skip />
- <!-- no translation found for forbidden_network (4626592887509826545) -->
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Idatha ye-CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Idatha ye-CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Khetha inethiwekhi"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Inqamukile"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Ixhunyiwe"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Iyaxhuma…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Ayikwazanga ukuxhumeka"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Awekho amanethiwekhi atholakele."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Ayikwazanga ukuthola amanethiwekhi. Zama futhi."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(kunqatshelwe)"</string>
+ <!-- no translation found for no_sim_card (1360669528113557381) -->
<skip />
</resources>
diff --git a/res/values/aliases.xml b/res/values/aliases.xml
index 1be4350..060ba1d 100644
--- a/res/values/aliases.xml
+++ b/res/values/aliases.xml
@@ -23,6 +23,5 @@
<item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
<item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
<item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>
- <item name="ic_search_floating_24dp" type="drawable">@drawable/ic_search_24dp</item>
</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index e729126..4247326 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -75,6 +75,8 @@
<attr name="controller" format="string" />
<!-- {@code true} when the controller declared represents a slice from {@link android.app.SettingsSliceContract} -->
<attr name="platform_slice" format="boolean" />
+ <!-- Whether or not dynamic summary text from PreferenceController is allowed when creating slice object, by default it's false. -->
+ <attr name="allowDynamicSummaryInSlice" format="boolean" />
</declare-styleable>
<!-- For DotsPageIndicator -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e28bc98..4d16851 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -22,7 +22,6 @@
<dimen name="action_bar_switch_padding">16dip</dimen>
<dimen name="app_icon_size">40dip</dimen>
- <dimen name="secondary_app_icon_size">32dp</dimen>
<dimen name="min_tap_target_size">48dp</dimen>
<dimen name="screen_margin_sides">64dip</dimen>
<dimen name="screen_margin_top">72dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 17fb33b..413dc00 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -893,6 +893,12 @@
<string name="security_settings_face_settings_use_face_category">Use your face to</string>
<!-- Text shown on a toggle which allows or disallows the device to use face for unlocking the device. [CHAR LIMIT=20] -->
<string name="security_settings_face_settings_use_face_unlock_phone">Unlock your device</string>
+ <!-- Text shown on a toggle which allows or disallows the device to use face authentication for apps. This will be presented to the user together with the context of security_settings_face_settings_use_face_category. [CHAR LIMIT=30] -->
+ <string name="security_settings_face_settings_use_face_for_apps">App sign-in \u0026 payments</string>
+ <!-- Text shown on a toggle which disables/enables face authentication, depending if the user's eyes are open. [CHAR LIMIT=30] -->
+ <string name="security_settings_face_settings_require_attention">Eyes open to unlock</string>
+ <!-- Text shown on the details of a toggle which disables/enables face authentication, depending if the user's eyes are open. [CHAR LIMIT=70] -->
+ <string name="security_settings_face_settings_require_attention_details">When using face authentication, your eyes must be open</string>
<!-- Button text in face settings which removes the user's faces from the device [CHAR LIMIT=20] -->
<string name="security_settings_face_settings_remove_face_data">Remove face data</string>
<!-- Text shown in face settings allowing the user to update/improve the enrolled face. This brings the user back to the enrollment flow. [CHAR LIMIT=30] -->
@@ -6949,7 +6955,7 @@
<string name="keywords_payment_settings">pay, tap, payments</string>
<string name="keywords_backup">backup, back up</string>
<string name="keywords_assist_gesture_launch">gesture</string>
- <string name="keywords_face_unlock">face, unlock</string>
+ <string name="keywords_face_unlock">face, unlock, auth, sign in</string>
<string name="keywords_imei_info">imei, meid, min, prl version, imei sv</string>
<string name="keywords_sim_status">network, mobile network state, service state, signal strength, mobile network type, roaming, iccid</string>
<string name="keywords_model_and_hardware">serial number, hardware version</string>
@@ -8301,7 +8307,7 @@
<!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
<string name="filter_notif_all_apps">Apps: All</string>
<!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
- <string name="filter_notif_blocked_apps">Apps: Turned off</string>
+ <string name="filter_notif_blocked_apps">Turned off</string>
<!-- Label for showing categories with urgent notifications in list [CHAR LIMIT=30] -->
<string name="filter_notif_urgent_channels">Categories: Urgent importance</string>
<!-- Label for showing categories with low importance notifications in list [CHAR LIMIT=30] -->
@@ -10090,4 +10096,7 @@
<string name="network_query_error">Couldn\u2019t find networks. Try again.</string>
<!-- Text to show this network is forbidden [CHAR LIMIT=NONE] -->
<string name="forbidden_network">(forbidden)</string>
+
+ <!-- Message informs the user that has no SIM card in personalized Settings [CHAR LIMIT=30] -->
+ <string name="no_sim_card">No SIM card</string>
</resources>
diff --git a/res/xml/app_default_settings.xml b/res/xml/app_default_settings.xml
index 5467667..a993aa1 100644
--- a/res/xml/app_default_settings.xml
+++ b/res/xml/app_default_settings.xml
@@ -21,59 +21,59 @@
android:key="app_default_settings_screen"
android:title="@string/app_default_dashboard_title">
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="assist_and_voice_input"
android:title="@string/assist_and_voice_input_title"
android:fragment="com.android.settings.applications.assist.ManageAssist"
settings:searchable="false"/>
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_browser"
android:title="@string/default_browser_title"
android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker"
settings:keywords="@string/keywords_default_browser">
<extra android:name="for_work" android:value="false" />
- </com.android.settings.widget.AppPreference>
+ </com.android.settingslib.widget.apppreference.AppPreference>
- <com.android.settings.widget.GearPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_home"
android:title="@string/home_app"
android:fragment="com.android.settings.applications.defaultapps.DefaultHomePicker"
settings:keywords="@string/keywords_home" />
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_phone_app"
android:title="@string/default_phone_title"
android:fragment="com.android.settings.applications.defaultapps.DefaultPhonePicker"
settings:keywords="@string/keywords_default_phone_app" />
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_sms_app"
android:title="@string/sms_application_title"
android:fragment="com.android.settings.applications.defaultapps.DefaultSmsPicker"
settings:keywords="@string/keywords_more_default_sms_app" />
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_payment_app"
android:title="@string/nfc_payment_settings_title"
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.nfc.PaymentSettings"
settings:keywords="@string/keywords_default_payment_app"/>
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_emergency_app"
android:title="@string/default_emergency_app"
settings:keywords="@string/keywords_emergency_app" />
<!--
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_notification_asst_app"
android:title="@string/default_notification_assistant"
android:fragment="com.android.settings.applications.defaultapps.DefaultNotificationAssistantPicker"
/>
-->
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="domain_urls"
android:title="@string/domain_urls_title"
android:fragment="com.android.settings.applications.managedomainurls.ManageDomainUrls"
@@ -83,21 +83,21 @@
android:key="work_app_defaults"
android:title="@string/default_for_work">
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="work_default_browser"
android:title="@string/default_browser_title"
android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker"
settings:searchable="false">
<extra android:name="for_work" android:value="true" />
- </com.android.settings.widget.AppPreference>
+ </com.android.settingslib.widget.apppreference.AppPreference>
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="work_default_phone_app"
android:title="@string/default_phone_title"
android:fragment="com.android.settings.applications.defaultapps.DefaultPhonePicker"
settings:searchable="false">
<extra android:name="for_work" android:value="true" />
- </com.android.settings.widget.AppPreference>
+ </com.android.settingslib.widget.apppreference.AppPreference>
</com.android.settings.widget.WorkOnlyCategory>
diff --git a/res/xml/security_settings_face.xml b/res/xml/security_settings_face.xml
index 3dfcfd7..2bdfdc8 100644
--- a/res/xml/security_settings_face.xml
+++ b/res/xml/security_settings_face.xml
@@ -22,21 +22,34 @@
<com.android.settings.widget.VideoPreference
android:key="security_settings_face_video"
+ android:title="@string/summary_placeholder"
app:animation="@raw/gesture_fingerprint_swipe"
- app:preview="@drawable/face_enroll_introduction" />
+ app:preview="@drawable/face_enroll_introduction"
+ app:controller="com.android.settings.widget.VideoPreferenceController"/>
<PreferenceCategory
android:key="security_settings_face_unlock_category"
android:title="@string/security_settings_face_settings_use_face_category">
<SwitchPreference
- android:key="security_settings_face_unlock"
+ android:key="security_settings_face_keyguard"
android:title="@string/security_settings_face_settings_use_face_unlock_phone"
app:keywords="@string/keywords_face_unlock"
- app:controller="com.android.settings.biometrics.face.FaceSettingsUnlockPreferenceController"/>
+ app:controller="com.android.settings.biometrics.face.FaceSettingsKeyguardPreferenceController"/>
+ <SwitchPreference
+ android:key="security_settings_face_app"
+ android:title="@string/security_settings_face_settings_use_face_for_apps"
+ app:keywords="@string/keywords_face_unlock"
+ app:controller="com.android.settings.biometrics.face.FaceSettingsAppPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory
android:key="security_settings_face_manage_category">
+ <SwitchPreference
+ android:key="security_settings_face_require_attention"
+ android:title="@string/security_settings_face_settings_require_attention"
+ app:keywords="@string/keywords_face_unlock"
+ app:controller="com.android.settings.biometrics.face.FaceSettingsAttentionPreferenceController"/>
+
<Preference
android:key="security_settings_face_improve"
android:title="@string/security_settings_face_settings_improve_face">
diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
index f98aee1..18e9906 100644
--- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
@@ -16,6 +16,7 @@
package com.android.settings.accounts;
import android.accounts.Account;
+import android.accounts.AccountManager;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
@@ -89,6 +90,28 @@
updateUi();
}
+ @VisibleForTesting
+ void finishIfAccountMissing() {
+ AccountManager accountManager = (AccountManager) getContext().getSystemService(
+ Context.ACCOUNT_SERVICE);
+ boolean accountExists = false;
+ for (Account account : accountManager.getAccountsByType(mAccount.type)) {
+ if (account.equals(mAccount)) {
+ accountExists = true;
+ break;
+ }
+ }
+ if (!accountExists) {
+ finish();
+ }
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ finishIfAccountMissing();
+ }
+
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCOUNT;
diff --git a/src/com/android/settings/accounts/AccountTypePreference.java b/src/com/android/settings/accounts/AccountTypePreference.java
index 54866ee..c82a599 100644
--- a/src/com/android/settings/accounts/AccountTypePreference.java
+++ b/src/com/android/settings/accounts/AccountTypePreference.java
@@ -30,7 +30,7 @@
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.widget.AppPreference;
+import com.android.settingslib.widget.apppreference.AppPreference;
public class AccountTypePreference extends AppPreference implements OnPreferenceClickListener {
/**
diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
index 2494664..9770332 100644
--- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
+++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
@@ -157,10 +157,6 @@
new AccountManagerCallback<Bundle>() {
@Override
public void run(AccountManagerFuture<Bundle> future) {
- // If already out of this screen, don't proceed.
- if (!getTargetFragment().isResumed()) {
- return;
- }
boolean failed = true;
try {
if (future.getResult()
diff --git a/src/com/android/settings/applications/AppStateNotificationBridge.java b/src/com/android/settings/applications/AppStateNotificationBridge.java
index d06aeb1..fc9e14f 100644
--- a/src/com/android/settings/applications/AppStateNotificationBridge.java
+++ b/src/com/android/settings/applications/AppStateNotificationBridge.java
@@ -100,18 +100,20 @@
}
public static CharSequence getSummary(Context context, NotificationsSentState state,
- boolean sortByRecency) {
- if (sortByRecency) {
+ int sortOrder) {
+ if (sortOrder == R.id.sort_order_recent_notification) {
if (state.lastSent == 0) {
return context.getString(R.string.notifications_sent_never);
}
return StringUtil.formatRelativeTime(
context, System.currentTimeMillis() - state.lastSent, true);
- } else {
+ } else if (sortOrder == R.id.sort_order_frequent_notification) {
if (state.avgSentWeekly > 0) {
return context.getString(R.string.notifications_sent_weekly, state.avgSentWeekly);
}
return context.getString(R.string.notifications_sent_daily, state.avgSentDaily);
+ } else {
+ return "";
}
}
@@ -267,6 +269,21 @@
}
};
+ public static final AppFilter FILTER_APP_NOTIFICATION_BLOCKED = new AppFilter() {
+ @Override
+ public void init() {
+ }
+
+ @Override
+ public boolean filterApp(AppEntry info) {
+ NotificationsSentState state = getNotificationsSentState(info);
+ if (state != null) {
+ return state.blocked;
+ }
+ return false;
+ }
+ };
+
public static final Comparator<AppEntry> RECENT_NOTIFICATION_COMPARATOR
= new Comparator<AppEntry>() {
@Override
diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java
index 6452198..4249381 100644
--- a/src/com/android/settings/applications/ProcessStatsPreference.java
+++ b/src/com/android/settings/applications/ProcessStatsPreference.java
@@ -22,7 +22,7 @@
import android.text.format.Formatter;
import android.util.Log;
-import com.android.settings.widget.AppPreference;
+import com.android.settingslib.widget.apppreference.AppPreference;
public class ProcessStatsPreference extends AppPreference {
static final String TAG = "ProcessStatsPreference";
diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java
index c866474..b6e8f4c 100644
--- a/src/com/android/settings/applications/RecentAppsPreferenceController.java
+++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java
@@ -42,11 +42,11 @@
import com.android.settings.R;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.utils.StringUtil;
+import com.android.settingslib.widget.apppreference.AppPreference;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
index 2e4a640..7d1e159 100644
--- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
+++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
@@ -49,6 +49,7 @@
FILTER_APPS_WITH_OVERLAY,
FILTER_APPS_WRITE_SETTINGS,
FILTER_APPS_INSTALL_SOURCES,
+ FILTER_APPS_BLOCKED,
})
@interface FilterType {
}
@@ -71,14 +72,15 @@
public static final int FILTER_APPS_INSTALL_SOURCES = 13;
public static final int FILTER_APP_HAS_DIRECTORY_ACCESS = 14;
public static final int FILTER_APP_CAN_CHANGE_WIFI_STATE = 15;
- // Next id: 16
+ public static final int FILTER_APPS_BLOCKED = 16;
+ // Next id: 17
private static AppFilterRegistry sRegistry;
private final AppFilterItem[] mFilters;
private AppFilterRegistry() {
- mFilters = new AppFilterItem[16];
+ mFilters = new AppFilterItem[17];
// High power whitelist, on
mFilters[FILTER_APPS_POWER_WHITELIST] = new AppFilterItem(
@@ -178,6 +180,12 @@
AppStateChangeWifiStateBridge.FILTER_CHANGE_WIFI_STATE,
FILTER_APP_CAN_CHANGE_WIFI_STATE,
R.string.filter_write_settings_apps);
+
+ // Blocked Notifications
+ mFilters[FILTER_APPS_BLOCKED] = new AppFilterItem(
+ AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED,
+ FILTER_APPS_BLOCKED,
+ R.string.filter_notif_blocked_apps);
}
public static AppFilterRegistry getInstance() {
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 35c6d1c..1f577b4 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -21,6 +21,8 @@
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_ALL;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
+ .FILTER_APPS_BLOCKED;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_DISABLED;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_ENABLED;
@@ -409,6 +411,7 @@
if (mListType == LIST_TYPE_NOTIFICATION) {
mFilterAdapter.enableFilter(FILTER_APPS_RECENT);
mFilterAdapter.enableFilter(FILTER_APPS_FREQUENT);
+ mFilterAdapter.enableFilter(FILTER_APPS_BLOCKED);
mFilterAdapter.disableFilter(FILTER_APPS_ALL);
}
if (mListType == LIST_TYPE_HIGH_POWER) {
@@ -955,6 +958,8 @@
rebuild(R.id.sort_order_frequent_notification);
} else if (FILTER_APPS_RECENT == appFilter.getFilterType()) {
rebuild(R.id.sort_order_recent_notification);
+ } else if (FILTER_APPS_BLOCKED == appFilter.getFilterType()) {
+ rebuild(R.id.sort_order_alpha);
} else {
rebuild();
}
@@ -1111,16 +1116,7 @@
@VisibleForTesting
static boolean shouldUseStableItemHeight(int listType) {
- switch (listType) {
- case LIST_TYPE_NOTIFICATION:
- // Most entries in notification type has no summary. Don't use stable height
- // so height is short for most entries.
- return false;
- default:
- // Other types have non-empty summary, so keep the height as we expect summary
- // to fill in.
- return true;
- }
+ return true;
}
private static boolean packageNameEquals(PackageItemInfo info1, PackageItemInfo info2) {
@@ -1338,8 +1334,7 @@
if (entry.extraInfo != null
&& entry.extraInfo instanceof NotificationsSentState) {
holder.setSummary(AppStateNotificationBridge.getSummary(mContext,
- (NotificationsSentState) entry.extraInfo,
- (mLastSortMode == R.id.sort_order_recent_notification)));
+ (NotificationsSentState) entry.extraInfo, mLastSortMode));
} else {
holder.setSummary(null);
}
@@ -1388,8 +1383,7 @@
if (entry.extraInfo != null
&& entry.extraInfo instanceof NotificationsSentState) {
holder.setSummary(AppStateNotificationBridge.getSummary(mContext,
- (NotificationsSentState) entry.extraInfo,
- (mLastSortMode == R.id.sort_order_recent_notification)));
+ (NotificationsSentState) entry.extraInfo, mLastSortMode));
} else {
holder.setSummary(null);
}
diff --git a/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java b/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java
index ef9d5d4..94d2818 100644
--- a/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java
+++ b/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java
@@ -27,8 +27,8 @@
import com.android.settings.R;
import com.android.settings.Utils;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.widget.apppreference.AppPreference;
public class DomainAppPreference extends AppPreference {
diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java
index d6734b7..d2cb2a7 100644
--- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java
+++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java
@@ -42,9 +42,9 @@
import com.android.settings.applications.AppInfoBase;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
-import com.android.settings.widget.AppPreference;
import com.android.settings.widget.EmptyTextSettings;
import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.widget.apppreference.AppPreference;
import java.text.Collator;
import java.util.ArrayList;
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index c718dde..748f874 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -104,7 +104,7 @@
if (mFaceManager == null) {
return 0;
}
- return mFaceManager.preEnroll();
+ return mFaceManager.generateChallenge();
}
@Override
diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index 4944c7f..d7dc9f8 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -16,11 +16,16 @@
package com.android.settings.biometrics.face;
+import static android.app.Activity.RESULT_OK;
+
import static com.android.settings.biometrics.BiometricEnrollBase.CONFIRM_REQUEST;
+import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_FINISHED;
import android.content.Context;
+import android.content.Intent;
import android.hardware.face.FaceManager;
import android.os.Bundle;
+import android.os.UserHandle;
import android.provider.SearchIndexableResource;
import android.util.Log;
@@ -30,6 +35,7 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.VideoPreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
@@ -47,7 +53,11 @@
private static final String TAG = "FaceSettings";
private static final String KEY_LAUNCHED_CONFIRM = "key_launched_confirm";
+ private FaceManager mFaceManager;
+ private int mUserId;
private boolean mLaunchedConfirm;
+ private byte[] mToken;
+ private FaceSettingsAttentionPreferenceController mAttentionController;
public static boolean isAvailable(Context context) {
FaceManager manager = Utils.getFaceManagerOrNull(context);
@@ -79,14 +89,20 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ mFaceManager = getPrefContext().getSystemService(FaceManager.class);
+ mUserId = getActivity().getIntent().getIntExtra(
+ Intent.EXTRA_USER_ID, UserHandle.myUserId());
+
if (savedInstanceState != null) {
mLaunchedConfirm = savedInstanceState.getBoolean(KEY_LAUNCHED_CONFIRM, false);
}
if (!mLaunchedConfirm) {
+ final long challenge = mFaceManager.generateChallenge();
ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
if (!helper.launchConfirmationActivity(CONFIRM_REQUEST,
- getString(R.string.security_settings_face_preference_title))) {
+ getString(R.string.security_settings_face_preference_title),
+ null, null, challenge, mUserId)) {
Log.e(TAG, "Password not set");
finish();
}
@@ -94,16 +110,59 @@
}
@Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == CONFIRM_REQUEST) {
+ if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
+ // The pin/pattern/password was set.
+ if (data != null) {
+ mToken = data.getByteArrayExtra(
+ ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+ if (mToken != null) {
+ mAttentionController.setToken(mToken);
+ }
+ }
+ }
+ }
+
+ if (mToken == null) {
+ // Didn't get an authentication, finishing
+ getActivity().finish();
+ }
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ if (getActivity().isFinishing()) {
+ final int result = mFaceManager.revokeChallenge();
+ if (result < 0) {
+ Log.w(TAG, "revokeChallenge failed, result: " + result);
+ }
+ }
+ }
+
+ @Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- return buildPreferenceControllers(context, getSettingsLifecycle());
+ final List<AbstractPreferenceController> controllers =
+ buildPreferenceControllers(context, getSettingsLifecycle());
+ for (AbstractPreferenceController controller : controllers) {
+ if (controller instanceof FaceSettingsAttentionPreferenceController) {
+ mAttentionController = (FaceSettingsAttentionPreferenceController) controller;
+ break;
+ }
+ }
+
+ return controllers;
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new FaceSettingsVideoPreferenceController(context));
controllers.add(new FaceSettingsImprovePreferenceController(context));
- controllers.add(new FaceSettingsUnlockPreferenceController(context));
+ controllers.add(new FaceSettingsKeyguardPreferenceController(context));
+ controllers.add(new FaceSettingsAppPreferenceController(context));
+ controllers.add(new FaceSettingsAttentionPreferenceController(context));
controllers.add(new FaceSettingsRemoveButtonPreferenceController(context));
controllers.add(new FaceSettingsFooterPreferenceController(context));
return controllers;
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java
new file mode 100644
index 0000000..038dbd8
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2018 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.face;
+
+import static android.provider.Settings.Secure.FACE_UNLOCK_APP_ENABLED;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * Preference controller for Face settings page controlling the ability to use
+ * Face authentication in apps (through BiometricPrompt).
+ */
+public class FaceSettingsAppPreferenceController extends TogglePreferenceController {
+
+ private static final String KEY = "security_settings_face_app";
+
+ private static final int ON = 1;
+ private static final int OFF = 0;
+ private static final int DEFAULT = ON; // face unlock is enabled for BiometricPrompt by default
+
+ public FaceSettingsAppPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ public FaceSettingsAppPreferenceController(Context context) {
+ this(context, KEY);
+ }
+
+ @Override
+ public boolean isChecked() {
+ if (!FaceSettings.isAvailable(mContext)) {
+ return false;
+ }
+ return Settings.Secure.getInt(
+ mContext.getContentResolver(), FACE_UNLOCK_APP_ENABLED, DEFAULT) == ON;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.Secure.putInt(mContext.getContentResolver(), FACE_UNLOCK_APP_ENABLED,
+ isChecked ? ON : OFF);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
new file mode 100644
index 0000000..e26f881
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2018 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.face;
+
+import android.content.Context;
+import android.hardware.face.FaceManager;
+import android.util.Log;
+
+import com.android.settings.core.TogglePreferenceController;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+/**
+ * Preference controller that manages the ability to use face authentication with/without
+ * user attention. See {@link FaceManager#setRequireAttention(boolean, byte[])}.
+ */
+public class FaceSettingsAttentionPreferenceController extends TogglePreferenceController {
+
+ public static final String KEY = "security_settings_face_require_attention";
+
+ private byte[] mToken;
+ private FaceManager mFaceManager;
+ private SwitchPreference mPreference;
+
+ public FaceSettingsAttentionPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ mFaceManager = context.getSystemService(FaceManager.class);
+ }
+
+ public FaceSettingsAttentionPreferenceController(Context context) {
+ this(context, KEY);
+ }
+
+ public void setToken(byte[] token) {
+ mToken = token;
+ mPreference.setChecked(mFaceManager.getRequireAttention(mToken));
+ }
+
+ /**
+ * Displays preference in this controller.
+ */
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = (SwitchPreference) screen.findPreference(KEY);
+ }
+
+ @Override
+ public boolean isChecked() {
+ if (!FaceSettings.isAvailable(mContext)) {
+ return true;
+ } else if (mToken == null) {
+ // The token will be null when the controller is first created, since CC has not been
+ // completed by the user. Once it's completed, FaceSettings will use setToken which
+ // will retrieve the correct value from FaceService
+ return true;
+ }
+ return mFaceManager.getRequireAttention(mToken);
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ mFaceManager.setRequireAttention(isChecked, mToken);
+ return true;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsUnlockPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java
similarity index 89%
rename from src/com/android/settings/biometrics/face/FaceSettingsUnlockPreferenceController.java
rename to src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java
index 5c84646..fe7d398 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsUnlockPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java
@@ -31,19 +31,19 @@
* Preference controller for Face settings page controlling the ability to unlock the phone
* with face.
*/
-public class FaceSettingsUnlockPreferenceController extends TogglePreferenceController {
+public class FaceSettingsKeyguardPreferenceController extends TogglePreferenceController {
- private static final String KEY = "security_settings_face_unlock";
+ private static final String KEY = "security_settings_face_keyguard";
private static final int ON = 1;
private static final int OFF = 0;
private static final int DEFAULT = ON; // face unlock is enabled on keyguard by default
- public FaceSettingsUnlockPreferenceController(Context context, String preferenceKey) {
+ public FaceSettingsKeyguardPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
- public FaceSettingsUnlockPreferenceController(Context context) {
+ public FaceSettingsKeyguardPreferenceController(Context context) {
this(context, KEY);
}
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsVideoPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsVideoPreferenceController.java
deleted file mode 100644
index 6fbb9c4..0000000
--- a/src/com/android/settings/biometrics/face/FaceSettingsVideoPreferenceController.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2018 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.face;
-
-import android.content.Context;
-
-import com.android.settings.core.BasePreferenceController;
-
-public class FaceSettingsVideoPreferenceController extends BasePreferenceController {
-
- private static final String PREF_KEY_VIDEO = "security_settings_face_video";
-
- public FaceSettingsVideoPreferenceController(Context context,
- String preferenceKey) {
- super(context, preferenceKey);
- }
-
- public FaceSettingsVideoPreferenceController(Context context) {
- this(context, PREF_KEY_VIDEO);
- }
-
- @Override
- public int getAvailabilityStatus() {
- return AVAILABLE;
- }
-}
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index c39f1d9..94bdfe8 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -54,8 +54,7 @@
// Bluetooth dependencies for the connection we are trying to establish
private LocalBluetoothManager mBluetoothManager;
- @VisibleForTesting
- BluetoothDevice mDevice;
+ private BluetoothDevice mDevice;
@VisibleForTesting
int mType;
private String mUserInput;
@@ -189,16 +188,16 @@
*
*/
public void setContactSharingState() {
- if ((mDevice.getPhonebookAccessPermission() != BluetoothDevice.ACCESS_ALLOWED)
- && (mDevice.getPhonebookAccessPermission() != BluetoothDevice.ACCESS_REJECTED)) {
- if (mDevice.getBluetoothClass().getDeviceClass()
- == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) {
- onCheckedChanged(null, true);
- } else {
- onCheckedChanged(null, false);
- }
- }
- }
+ final int permission = mDevice.getPhonebookAccessPermission();
+ if (permission == BluetoothDevice.ACCESS_ALLOWED
+ || (permission == BluetoothDevice.ACCESS_UNKNOWN && mDevice.getBluetoothClass().
+ getDeviceClass() == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE)) {
+ onCheckedChanged(null, true);
+ } else {
+ onCheckedChanged(null, false);
+ }
+
+ }
/**
* A method for querying if the provided editable is a valid passkey/pin format for this device.
diff --git a/src/com/android/settings/core/PreferenceXmlParserUtils.java b/src/com/android/settings/core/PreferenceXmlParserUtils.java
index 8ef7f8d..9fdeeef 100644
--- a/src/com/android/settings/core/PreferenceXmlParserUtils.java
+++ b/src/com/android/settings/core/PreferenceXmlParserUtils.java
@@ -69,7 +69,8 @@
MetadataFlag.FLAG_NEED_PREF_TITLE,
MetadataFlag.FLAG_NEED_PREF_SUMMARY,
MetadataFlag.FLAG_NEED_PREF_ICON,
- MetadataFlag.FLAG_NEED_SEARCHABLE})
+ MetadataFlag.FLAG_NEED_SEARCHABLE,
+ MetadataFlag.FLAG_ALLOW_DYNAMIC_SUMMARY_IN_SLICE})
@Retention(RetentionPolicy.SOURCE)
public @interface MetadataFlag {
int FLAG_INCLUDE_PREF_SCREEN = 1;
@@ -82,6 +83,7 @@
int FLAG_NEED_PLATFORM_SLICE_FLAG = 1 << 7;
int FLAG_NEED_KEYWORDS = 1 << 8;
int FLAG_NEED_SEARCHABLE = 1 << 9;
+ int FLAG_ALLOW_DYNAMIC_SUMMARY_IN_SLICE = 1 << 10;
}
public static final String METADATA_PREF_TYPE = "type";
@@ -93,6 +95,8 @@
public static final String METADATA_PLATFORM_SLICE_FLAG = "platform_slice";
public static final String METADATA_KEYWORDS = "keywords";
public static final String METADATA_SEARCHABLE = "searchable";
+ public static final String METADATA_ALLOW_DYNAMIC_SUMMARY_IN_SLICE =
+ "allow_dynamic_summary_in_slice";
private static final String ENTRIES_SEPARATOR = "|";
@@ -228,6 +232,10 @@
preferenceMetadata.putBoolean(METADATA_SEARCHABLE,
isSearchable(preferenceAttributes));
}
+ if (hasFlag(flags, MetadataFlag.FLAG_ALLOW_DYNAMIC_SUMMARY_IN_SLICE)) {
+ preferenceMetadata.putBoolean(METADATA_ALLOW_DYNAMIC_SUMMARY_IN_SLICE,
+ isDynamicSummaryAllowed(preferenceAttributes));
+ }
metadata.add(preferenceMetadata);
preferenceAttributes.recycle();
@@ -312,6 +320,11 @@
return styledAttributes.getBoolean(R.styleable.Preference_searchable, true /* default */);
}
+ private static boolean isDynamicSummaryAllowed(TypedArray styledAttributes) {
+ return styledAttributes.getBoolean(R.styleable.Preference_allowDynamicSummaryInSlice,
+ false /* default */);
+ }
+
private static String getKeywords(TypedArray styleAttributes) {
return styleAttributes.getString(R.styleable.Preference_keywords);
}
diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java
index db296ab..5265b82 100644
--- a/src/com/android/settings/dashboard/DashboardData.java
+++ b/src/com/android/settings/dashboard/DashboardData.java
@@ -41,7 +41,6 @@
*/
public class DashboardData {
public static final int POSITION_NOT_FOUND = -1;
- public static final int MAX_SUGGESTION_COUNT = 2;
// stable id for different type of items.
@VisibleForTesting
@@ -185,7 +184,7 @@
final List<ConditionalCard> conditions = mConditions;
final boolean hasConditions = sizeOf(conditions) > 0;
- final List<Suggestion> suggestions = getSuggestionsToShow(mSuggestions);
+ final List<Suggestion> suggestions = mSuggestions;
final boolean hasSuggestions = sizeOf(suggestions) > 0;
/* Suggestion container. This is the card view that contains the list of suggestions.
@@ -225,20 +224,6 @@
return list == null ? 0 : list.size();
}
- private List<Suggestion> getSuggestionsToShow(List<Suggestion> suggestions) {
- if (suggestions == null) {
- return null;
- }
- if (suggestions.size() <= MAX_SUGGESTION_COUNT) {
- return suggestions;
- }
- final List<Suggestion> suggestionsToShow = new ArrayList<>(MAX_SUGGESTION_COUNT);
- for (int i = 0; i < MAX_SUGGESTION_COUNT; i++) {
- suggestionsToShow.add(suggestions.get(i));
- }
- return suggestionsToShow;
- }
-
/**
* Builder used to build the ItemsData
*/
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
index 92744ae..0011177 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
@@ -23,11 +23,8 @@
import androidx.annotation.NonNull;
-import com.android.settingslib.drawer.Tile;
import com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
-import java.util.List;
-
/** Interface should be implemented if you have added new suggestions */
public interface SuggestionFeatureProvider {
@@ -50,11 +47,6 @@
SharedPreferences getSharedPrefs(Context context);
/**
- * Only keep top few suggestions from exclusive suggestions.
- */
- void filterExclusiveSuggestions(List<Tile> suggestions);
-
- /**
* Dismisses a suggestion.
*/
void dismissSuggestion(Context context, SuggestionControllerMixinCompat suggestionMixin,
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 4dd0a5c..39d0299 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -45,7 +45,6 @@
public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider {
private static final String TAG = "SuggestionFeature";
- private static final int EXCLUSIVE_SUGGESTION_MAX_COUNT = 3;
private static final String SHARED_PREF_FILENAME = "suggestions";
@@ -98,17 +97,6 @@
}
@Override
- public void filterExclusiveSuggestions(List<Tile> suggestions) {
- if (suggestions == null) {
- return;
- }
- for (int i = suggestions.size() - 1; i >= EXCLUSIVE_SUGGESTION_MAX_COUNT; i--) {
- Log.d(TAG, "Removing exclusive suggestion");
- suggestions.remove(i);
- }
- }
-
- @Override
public void dismissSuggestion(Context context, SuggestionControllerMixinCompat mixin,
Suggestion suggestion) {
if (mixin == null || suggestion == null || context == null) {
diff --git a/src/com/android/settings/datausage/AppDataUsagePreference.java b/src/com/android/settings/datausage/AppDataUsagePreference.java
index 0eab5ab..f5a204a 100644
--- a/src/com/android/settings/datausage/AppDataUsagePreference.java
+++ b/src/com/android/settings/datausage/AppDataUsagePreference.java
@@ -20,11 +20,11 @@
import androidx.preference.PreferenceViewHolder;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.AppItem;
import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider;
import com.android.settingslib.utils.ThreadUtils;
+import com.android.settingslib.widget.apppreference.AppPreference;
public class AppDataUsagePreference extends AppPreference {
diff --git a/src/com/android/settings/datausage/AppDataUsageV2.java b/src/com/android/settings/datausage/AppDataUsageV2.java
new file mode 100644
index 0000000..6d6089e
--- /dev/null
+++ b/src/com/android/settings/datausage/AppDataUsageV2.java
@@ -0,0 +1,451 @@
+/*
+ * Copyright (C) 2016 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 android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+
+import android.app.Activity;
+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.INetworkStatsSession;
+import android.net.NetworkPolicy;
+import android.net.NetworkStatsHistory;
+import android.net.NetworkTemplate;
+import android.net.TrafficStats;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.util.ArraySet;
+import android.util.IconDrawableFactory;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+
+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 com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.applications.AppInfoBase;
+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.ChartData;
+import com.android.settingslib.net.ChartDataLoaderCompat;
+import com.android.settingslib.net.UidDetail;
+import com.android.settingslib.net.UidDetailProvider;
+
+public class AppDataUsageV2 extends DataUsageBaseFragment implements OnPreferenceChangeListener,
+ DataSaverBackend.Listener {
+
+ private static final String TAG = "AppDataUsageV2";
+
+ public static final String ARG_APP_ITEM = "app_item";
+ public static final String ARG_NETWORK_TEMPLATE = "network_template";
+
+ 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_CHART_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;
+ private CharSequence mLabel;
+ private String mPackageName;
+ private INetworkStatsSession mStatsSession;
+ private CycleAdapter mCycleAdapter;
+
+ private long mStart;
+ private long mEnd;
+ private ChartData mChartData;
+ private NetworkTemplate mTemplate;
+ private NetworkPolicy mPolicy;
+ private AppItem mAppItem;
+ private Intent mAppSettingsIntent;
+ private SpinnerPreference mCycle;
+ private RestrictedSwitchPreference mUnrestrictedData;
+ private DataSaverBackend mDataSaverBackend;
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ mPackageManager = getPackageManager();
+ final Bundle args = getArguments();
+
+ try {
+ mStatsSession = services.mStatsService.openSession();
+ } catch (RemoteException e) {
+ throw new RuntimeException(e);
+ }
+
+ mAppItem = (args != null) ? (AppItem) args.getParcelable(ARG_APP_ITEM) : null;
+ mTemplate = (args != null) ? (NetworkTemplate) args.getParcelable(ARG_NETWORK_TEMPLATE)
+ : null;
+ if (mTemplate == null) {
+ Context context = getContext();
+ mTemplate = DataUsageUtils.getDefaultTemplate(context,
+ DataUsageUtils.getDefaultSubscriptionId(context));
+ }
+ 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();
+ } else {
+ addUid(uid);
+ mAppItem = new AppItem(uid);
+ mAppItem.addUid(uid);
+ }
+ } else {
+ for (int i = 0; i < mAppItem.uids.size(); i++) {
+ addUid(mAppItem.uids.keyAt(i));
+ }
+ }
+
+ mTotalUsage = findPreference(KEY_TOTAL_USAGE);
+ mForegroundUsage = findPreference(KEY_FOREGROUND_USAGE);
+ mBackgroundUsage = findPreference(KEY_BACKGROUND_USAGE);
+
+ mCycle = (SpinnerPreference) findPreference(KEY_CYCLE);
+ mCycleAdapter = new CycleAdapter(getContext(), mCycle, mCycleListener, false);
+
+ if (mAppItem.key > 0) {
+ if (mPackages.size() != 0) {
+ try {
+ ApplicationInfo info = mPackageManager.getApplicationInfoAsUser(
+ mPackages.valueAt(0), 0, UserHandle.getUserId(mAppItem.key));
+ mIcon = IconDrawableFactory.newInstance(getActivity()).getBadgedIcon(info);
+ mLabel = info.loadLabel(mPackageManager);
+ mPackageName = info.packageName;
+ } catch (PackageManager.NameNotFoundException e) {
+ }
+ }
+ if (!UserHandle.isApp(mAppItem.key)) {
+ removePreference(KEY_UNRESTRICTED_DATA);
+ removePreference(KEY_RESTRICT_BACKGROUND);
+ } else {
+ mRestrictBackground = (RestrictedSwitchPreference) findPreference(
+ KEY_RESTRICT_BACKGROUND);
+ mRestrictBackground.setOnPreferenceChangeListener(this);
+ mUnrestrictedData = (RestrictedSwitchPreference) findPreference(
+ KEY_UNRESTRICTED_DATA);
+ mUnrestrictedData.setOnPreferenceChangeListener(this);
+ }
+ mDataSaverBackend = new DataSaverBackend(getContext());
+ mAppSettings = findPreference(KEY_APP_SETTINGS);
+
+ mAppSettingsIntent = new Intent(Intent.ACTION_MANAGE_NETWORK_USAGE);
+ mAppSettingsIntent.addCategory(Intent.CATEGORY_DEFAULT);
+
+ 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 = (PreferenceCategory) findPreference(KEY_APP_LIST);
+ getLoaderManager().initLoader(LOADER_APP_PREF, Bundle.EMPTY, mAppPrefCallbacks);
+ } else {
+ removePreference(KEY_APP_LIST);
+ }
+ } else {
+ final Context context = getActivity();
+ UidDetail uidDetail = new UidDetailProvider(context).getUidDetail(mAppItem.key, true);
+ mIcon = uidDetail.icon;
+ mLabel = uidDetail.label;
+ mPackageName = context.getPackageName();
+
+ removePreference(KEY_UNRESTRICTED_DATA);
+ removePreference(KEY_APP_SETTINGS);
+ removePreference(KEY_RESTRICT_BACKGROUND);
+ removePreference(KEY_APP_LIST);
+ }
+ }
+
+ @Override
+ public void onDestroy() {
+ TrafficStats.closeQuietly(mStatsSession);
+ super.onDestroy();
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ if (mDataSaverBackend != null) {
+ mDataSaverBackend.addListener(this);
+ }
+ mPolicy = services.mPolicyEditor.getPolicy(mTemplate);
+ getLoaderManager().restartLoader(LOADER_CHART_DATA,
+ ChartDataLoaderCompat.buildArgs(mTemplate, mAppItem), mChartDataCallbacks);
+ updatePrefs();
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ if (mDataSaverBackend != null) {
+ mDataSaverBackend.remListener(this);
+ }
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ if (preference == mRestrictBackground) {
+ mDataSaverBackend.setIsBlacklisted(mAppItem.key, mPackageName, !(Boolean) newValue);
+ updatePrefs();
+ return true;
+ } else if (preference == mUnrestrictedData) {
+ mDataSaverBackend.setIsWhitelisted(mAppItem.key, mPackageName, (Boolean) newValue);
+ return true;
+ }
+ return false;
+ }
+
+ @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;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @VisibleForTesting
+ void updatePrefs() {
+ updatePrefs(getAppRestrictBackground(), getUnrestrictData());
+ }
+
+ private void updatePrefs(boolean restrictBackground, boolean unrestrictData) {
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfMeteredDataRestricted(
+ getContext(), mPackageName, UserHandle.getUserId(mAppItem.key));
+ if (mRestrictBackground != null) {
+ mRestrictBackground.setChecked(!restrictBackground);
+ mRestrictBackground.setDisabledByAdmin(admin);
+ }
+ if (mUnrestrictedData != null) {
+ if (restrictBackground) {
+ mUnrestrictedData.setVisible(false);
+ } else {
+ mUnrestrictedData.setVisible(true);
+ mUnrestrictedData.setChecked(unrestrictData);
+ mUnrestrictedData.setDisabledByAdmin(admin);
+ }
+ }
+ }
+
+ private void addUid(int uid) {
+ String[] packages = getPackageManager().getPackagesForUid(uid);
+ if (packages != null) {
+ for (int i = 0; i < packages.length; i++) {
+ mPackages.add(packages[i]);
+ }
+ }
+ }
+
+ private void bindData() {
+ final long backgroundBytes, foregroundBytes;
+ if (mChartData == null || mStart == 0) {
+ backgroundBytes = foregroundBytes = 0;
+ mCycle.setVisible(false);
+ } else {
+ mCycle.setVisible(true);
+ final long now = System.currentTimeMillis();
+ NetworkStatsHistory.Entry entry = null;
+ entry = mChartData.detailDefault.getValues(mStart, mEnd, now, entry);
+ backgroundBytes = entry.rxBytes + entry.txBytes;
+ entry = mChartData.detailForeground.getValues(mStart, mEnd, now, entry);
+ foregroundBytes = entry.rxBytes + entry.txBytes;
+ }
+ final long totalBytes = backgroundBytes + foregroundBytes;
+ final Context context = getContext();
+
+ mTotalUsage.setSummary(DataUsageUtils.formatDataUsage(context, totalBytes));
+ mForegroundUsage.setSummary(DataUsageUtils.formatDataUsage(context, foregroundBytes));
+ mBackgroundUsage.setSummary(DataUsageUtils.formatDataUsage(context, backgroundBytes));
+ }
+
+ private boolean getAppRestrictBackground() {
+ final int uid = mAppItem.key;
+ final int uidPolicy = services.mPolicyManager.getUidPolicy(uid);
+ return (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0;
+ }
+
+ private boolean getUnrestrictData() {
+ if (mDataSaverBackend != null) {
+ return mDataSaverBackend.isWhitelisted(mAppItem.key);
+ }
+ return false;
+ }
+
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+
+ String pkg = mPackages.size() != 0 ? mPackages.valueAt(0) : null;
+ int uid = 0;
+ if (pkg != null) {
+ try {
+ uid = mPackageManager.getPackageUidAsUser(pkg,
+ UserHandle.getUserId(mAppItem.key));
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.w(TAG, "Skipping UID because cannot find package " + pkg);
+ }
+ }
+
+ final boolean showInfoButton = mAppItem.key > 0;
+
+ final Activity activity = getActivity();
+ final Preference pref = EntityHeaderController
+ .newInstance(activity, this, null /* header */)
+ .setRecyclerView(getListView(), getSettingsLifecycle())
+ .setUid(uid)
+ .setHasAppInfoLink(showInfoButton)
+ .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
+ EntityHeaderController.ActionType.ACTION_NONE)
+ .setIcon(mIcon)
+ .setLabel(mLabel)
+ .setPackageName(pkg)
+ .done(activity, getPrefContext());
+ getPreferenceScreen().addPreference(pref);
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsEvent.APP_DATA_USAGE;
+ }
+
+ private AdapterView.OnItemSelectedListener mCycleListener =
+ new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+ final CycleAdapter.CycleItem cycle = (CycleAdapter.CycleItem) mCycle.getSelectedItem();
+
+ mStart = cycle.start;
+ mEnd = cycle.end;
+ bindData();
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView<?> parent) {
+ // ignored
+ }
+ };
+
+ private final LoaderManager.LoaderCallbacks<ChartData> mChartDataCallbacks =
+ new LoaderManager.LoaderCallbacks<ChartData>() {
+ @Override
+ public Loader<ChartData> onCreateLoader(int id, Bundle args) {
+ return new ChartDataLoaderCompat(getActivity(), mStatsSession, args);
+ }
+
+ @Override
+ public void onLoadFinished(Loader<ChartData> loader, ChartData data) {
+ mChartData = data;
+ mCycleAdapter.updateCycleList(mPolicy, mChartData);
+ bindData();
+ }
+
+ @Override
+ public void onLoaderReset(Loader<ChartData> loader) {
+ }
+ };
+
+ private final LoaderManager.LoaderCallbacks<ArraySet<Preference>> mAppPrefCallbacks =
+ new LoaderManager.LoaderCallbacks<ArraySet<Preference>>() {
+ @Override
+ public Loader<ArraySet<Preference>> onCreateLoader(int i, Bundle bundle) {
+ return new AppPrefLoader(getPrefContext(), mPackages, getPackageManager());
+ }
+
+ @Override
+ public void onLoadFinished(Loader<ArraySet<Preference>> loader,
+ ArraySet<Preference> preferences) {
+ if (preferences != null && mAppList != null) {
+ for (Preference preference : preferences) {
+ mAppList.addPreference(preference);
+ }
+ }
+ }
+
+ @Override
+ public void onLoaderReset(Loader<ArraySet<Preference>> loader) {
+ }
+ };
+
+ @Override
+ public void onDataSaverChanged(boolean isDataSaving) {
+
+ }
+
+ @Override
+ public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+ if (mAppItem.uids.get(uid, false)) {
+ updatePrefs(getAppRestrictBackground(), isWhitelisted);
+ }
+ }
+
+ @Override
+ public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+ if (mAppItem.uids.get(uid, false)) {
+ updatePrefs(isBlacklisted, getUnrestrictData());
+ }
+ }
+}
diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java
index 72a1094..321cf74 100644
--- a/src/com/android/settings/datausage/ChartDataUsagePreference.java
+++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java
@@ -23,6 +23,8 @@
import android.text.format.Formatter;
import android.text.style.ForegroundColorSpan;
import android.util.AttributeSet;
+import android.util.FeatureFlagUtils;
+import android.util.Pair;
import android.util.SparseIntArray;
import androidx.annotation.VisibleForTesting;
@@ -31,7 +33,11 @@
import com.android.settings.R;
import com.android.settings.Utils;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.widget.UsageView;
+import com.android.settingslib.net.NetworkCycleData;
+
+import java.util.List;
public class ChartDataUsagePreference extends Preference {
@@ -45,7 +51,9 @@
private NetworkPolicy mPolicy;
private long mStart;
private long mEnd;
+ @Deprecated
private NetworkStatsHistory mNetwork;
+ private NetworkCycleData mNetworkCycleData;
private int mSecondaryColor;
private int mSeriesColor;
@@ -60,13 +68,25 @@
@Override
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
- UsageView chart = (UsageView) holder.findViewById(R.id.data_usage);
- if (mNetwork == null) return;
+ final UsageView chart = (UsageView) holder.findViewById(R.id.data_usage);
+ if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) {
+ if (mNetworkCycleData == null) {
+ return;
+ }
+ } else {
+ if (mNetwork == null) {
+ return;
+ }
+ }
- int top = getTop();
+ final int top = getTop();
chart.clearPaths();
chart.configureGraph(toInt(mEnd - mStart), top);
- calcPoints(chart);
+ if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) {
+ calcPoints(chart, mNetworkCycleData.usageBuckets);
+ } else {
+ calcPoints(chart);
+ }
chart.setBottomLabels(new CharSequence[] {
Utils.formatDateRange(getContext(), mStart, mStart),
Utils.formatDateRange(getContext(), mEnd, mEnd),
@@ -76,21 +96,26 @@
}
public int getTop() {
- NetworkStatsHistory.Entry entry = null;
long totalData = 0;
- final int start = mNetwork.getIndexBefore(mStart);
- final int end = mNetwork.getIndexAfter(mEnd);
+ if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) {
+ totalData = mNetworkCycleData.totalUsage;
+ } else {
+ NetworkStatsHistory.Entry entry = null;
+ final int start = mNetwork.getIndexBefore(mStart);
+ final int end = mNetwork.getIndexAfter(mEnd);
- for (int i = start; i <= end; i++) {
- entry = mNetwork.getValues(i, entry);
+ for (int i = start; i <= end; i++) {
+ entry = mNetwork.getValues(i, entry);
- // increment by current bucket total
- totalData += entry.rxBytes + entry.txBytes;
+ // increment by current bucket total
+ totalData += entry.rxBytes + entry.txBytes;
+ }
}
long policyMax = mPolicy != null ? Math.max(mPolicy.limitBytes, mPolicy.warningBytes) : 0;
return (int) (Math.max(totalData, policyMax) / RESOLUTION);
}
+ @Deprecated
@VisibleForTesting
void calcPoints(UsageView chart) {
SparseIntArray points = new SparseIntArray();
@@ -123,6 +148,33 @@
}
}
+ @VisibleForTesting
+ void calcPoints(UsageView chart, List<NetworkCycleData> usageSummary) {
+ if (usageSummary == null) {
+ return;
+ }
+ final SparseIntArray points = new SparseIntArray();
+ points.put(0, 0);
+
+ long totalData = 0;
+ for (NetworkCycleData data : usageSummary) {
+ final long startTime = data.startTime;
+ final long endTime = data.endTime;
+
+ // increment by current bucket total
+ totalData += data.totalUsage;
+
+ if (points.size() == 1) {
+ points.put(toInt(data.startTime - mStart) - 1, -1);
+ }
+ points.put(toInt(startTime - mStart + 1), (int) (totalData / RESOLUTION));
+ points.put(toInt(endTime - mStart), (int) (totalData / RESOLUTION));
+ }
+ if (points.size() > 1) {
+ chart.addPath(points);
+ }
+ }
+
private int toInt(long l) {
// Don't need that much resolution on these times.
return (int) (l / (1000 * 60));
@@ -168,6 +220,7 @@
notifyChanged();
}
+ @Deprecated
public void setVisibleRange(long start, long end) {
mStart = start;
mEnd = end;
@@ -182,11 +235,19 @@
return mEnd;
}
+ @Deprecated
public void setNetworkStats(NetworkStatsHistory network) {
mNetwork = network;
notifyChanged();
}
+ public void setNetworkCycleData(NetworkCycleData data) {
+ mNetworkCycleData = data;
+ mStart = data.startTime;
+ mEnd = data.endTime;
+ notifyChanged();
+ }
+
public void setColors(int seriesColor, int secondaryColor) {
mSeriesColor = seriesColor;
mSecondaryColor = secondaryColor;
diff --git a/src/com/android/settings/datausage/CycleAdapter.java b/src/com/android/settings/datausage/CycleAdapter.java
index e5c4e43..bc4f649 100644
--- a/src/com/android/settings/datausage/CycleAdapter.java
+++ b/src/com/android/settings/datausage/CycleAdapter.java
@@ -25,9 +25,11 @@
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.net.ChartData;
+import com.android.settingslib.net.NetworkCycleData;
import java.time.ZonedDateTime;
import java.util.Iterator;
+import java.util.List;
import java.util.Objects;
public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> {
@@ -68,7 +70,8 @@
* {@link NetworkStatsHistory} data. Always selects the newest item,
* updating the inspection range on chartData.
*/
- public boolean updateCycleList(NetworkPolicy policy, ChartData chartData) {
+ @Deprecated
+ public boolean updateCycleList(NetworkPolicy policy, ChartData chartData) {
// stash away currently selected cycle to try restoring below
final CycleAdapter.CycleItem previousItem = (CycleAdapter.CycleItem)
mSpinner.getSelectedItem();
@@ -150,6 +153,37 @@
}
/**
+ * Rebuild list based on network data. Always selects the newest item,
+ * updating the inspection range on chartData.
+ */
+ public boolean updateCycleList(List<NetworkCycleData> cycleData) {
+ // stash away currently selected cycle to try restoring below
+ final CycleAdapter.CycleItem previousItem = (CycleAdapter.CycleItem)
+ mSpinner.getSelectedItem();
+ clear();
+
+ final Context context = getContext();
+ for (NetworkCycleData data : cycleData) {
+ add(new CycleAdapter.CycleItem(context, data.startTime, data.endTime));
+ }
+
+ // force pick the current cycle (first item)
+ if (getCount() > 0) {
+ final int position = findNearestPosition(previousItem);
+ mSpinner.setSelection(position);
+
+ // only force-update cycle when changed; skipping preserves any
+ // user-defined inspection region.
+ final CycleAdapter.CycleItem selectedItem = getItem(position);
+ if (!Objects.equals(selectedItem, previousItem)) {
+ mListener.onItemSelected(null, null, position, 0);
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
* List item that reflects a specific data usage cycle.
*/
public static class CycleItem implements Comparable<CycleItem> {
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index a3c9612..cc40564 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -352,7 +352,7 @@
/**
* Bind the given {@link NetworkStats}, or {@code null} to clear list.
*/
- public void bindStats(NetworkStats stats, int[] restrictedUids) {
+ private void bindStats(NetworkStats stats, int[] restrictedUids) {
ArrayList<AppItem> items = new ArrayList<>();
long largest = 0;
@@ -464,7 +464,7 @@
* @param entry the network stats entry to extract data usage from.
* @param itemCategory the item is categorized on the list view by this category. Must be
*/
- private static long accumulate(int collapseKey, final SparseArray<AppItem> knownItems,
+ private long accumulate(int collapseKey, final SparseArray<AppItem> knownItems,
NetworkStats.Entry entry, int itemCategory, ArrayList<AppItem> items, long largest) {
final int uid = entry.uid;
AppItem item = knownItems.get(collapseKey);
diff --git a/src/com/android/settings/datausage/DataUsageListV2.java b/src/com/android/settings/datausage/DataUsageListV2.java
index c3b2bb2..301eb44 100644
--- a/src/com/android/settings/datausage/DataUsageListV2.java
+++ b/src/com/android/settings/datausage/DataUsageListV2.java
@@ -14,12 +14,11 @@
package com.android.settings.datausage;
-import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
import static android.net.TrafficStats.UID_REMOVED;
import static android.net.TrafficStats.UID_TETHERING;
-import static android.telephony.TelephonyManager.SIM_STATE_READY;
+import android.app.Activity;
import android.app.ActivityManager;
import android.app.usage.NetworkStats;
import android.app.usage.NetworkStats.Bucket;
@@ -28,15 +27,12 @@
import android.content.pm.UserInfo;
import android.graphics.Color;
import android.net.ConnectivityManager;
-import android.net.INetworkStatsSession;
import android.net.NetworkPolicy;
import android.net.NetworkStatsHistory;
import android.net.NetworkTemplate;
-import android.net.TrafficStats;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.RemoteException;
-import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
@@ -64,9 +60,10 @@
import com.android.settings.datausage.CycleAdapter.SpinnerInterface;
import com.android.settings.widget.LoadingViewController;
import com.android.settingslib.AppItem;
-import com.android.settingslib.net.ChartData;
import com.android.settingslib.net.ChartDataLoaderCompat;
-import com.android.settingslib.net.NetworkStatsDetailLoader;
+import com.android.settingslib.net.NetworkCycleDataLoader;
+import com.android.settingslib.net.NetworkCycleData;
+import com.android.settingslib.net.NetworkStatsSummaryLoader;
import com.android.settingslib.net.UidDetailProvider;
import java.util.ArrayList;
@@ -101,8 +98,8 @@
}
};
- private INetworkStatsSession mStatsSession;
private ChartDataUsagePreference mChart;
+ private TelephonyManager mTelephonyManager;
@VisibleForTesting
NetworkTemplate mTemplate;
@@ -110,7 +107,7 @@
int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@VisibleForTesting
int mNetworkType;
- private ChartData mChartData;
+ private List<NetworkCycleData> mCycleData;
private LoadingViewController mLoadingViewController;
private UidDetailProvider mUidDetailProvider;
@@ -120,7 +117,6 @@
private PreferenceGroup mApps;
private View mHeader;
-
@Override
public int getMetricsCategory() {
return MetricsEvent.DATA_USAGE_LIST;
@@ -129,21 +125,15 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- final Context context = getActivity();
+ final Activity activity = getActivity();
if (!isBandwidthControlEnabled()) {
Log.w(TAG, "No bandwidth control; leaving");
- getActivity().finish();
+ activity.finish();
}
- try {
- mStatsSession = services.mStatsService.openSession();
- } catch (RemoteException e) {
- throw new RuntimeException(e);
- }
-
- mUidDetailProvider = new UidDetailProvider(context);
-
+ mUidDetailProvider = new UidDetailProvider(activity);
+ mTelephonyManager = activity.getSystemService(TelephonyManager.class);
mUsageAmount = findPreference(KEY_USAGE_AMOUNT);
mChart = (ChartDataUsagePreference) findPreference(KEY_CHART_DATA);
mApps = (PreferenceGroup) findPreference(KEY_APPS_GROUP);
@@ -233,8 +223,6 @@
mUidDetailProvider.clearCache();
mUidDetailProvider = null;
- TrafficStats.closeQuietly(mStatsSession);
-
super.onDestroy();
}
@@ -277,7 +265,7 @@
// TODO: consider chaining two loaders together instead of reloading
// network history when showing app detail.
getLoaderManager().restartLoader(LOADER_CHART_DATA,
- ChartDataLoaderCompat.buildArgs(mTemplate, null), mChartDataCallbacks);
+ ChartDataLoaderCompat.buildArgs(mTemplate, null), mNetworkCycleDataCallbacks);
// detail mode can change visible menus, invalidate
getActivity().invalidateOptionsMenu();
@@ -316,7 +304,7 @@
}
// generate cycle list based on policy and available history
- if (mCycleAdapter.updateCycleList(policy, mChartData)) {
+ if (mCycleAdapter.updateCycleList(mCycleData)) {
updateDetailData();
}
}
@@ -329,30 +317,20 @@
private void updateDetailData() {
if (LOGD) Log.d(TAG, "updateDetailData()");
- final long start = mChart.getInspectStart();
- final long end = mChart.getInspectEnd();
- final long now = System.currentTimeMillis();
-
- final Context context = getActivity();
-
- NetworkStatsHistory.Entry entry = null;
- if (mChartData != null) {
- entry = mChartData.network.getValues(start, end, now, null);
- }
-
// kick off loader for detailed stats
getLoaderManager().restartLoader(LOADER_SUMMARY, null /* args */,
mNetworkStatsDetailCallbacks);
- final long totalBytes = entry != null ? entry.rxBytes + entry.txBytes : 0;
- final CharSequence totalPhrase = DataUsageUtils.formatDataUsage(context, totalBytes);
+ final long totalBytes = mCycleData != null
+ ? mCycleData.get(mCycleSpinner.getSelectedItemPosition()).totalUsage : 0;
+ final CharSequence totalPhrase = DataUsageUtils.formatDataUsage(getActivity(), totalBytes);
mUsageAmount.setTitle(getString(R.string.data_used_template, totalPhrase));
}
/**
* Bind the given {@link NetworkStats}, or {@code null} to clear list.
*/
- public void bindStats(NetworkStats stats, int[] restrictedUids) {
+ private void bindStats(NetworkStats stats, int[] restrictedUids) {
mApps.removeAll();
if (stats == null) {
if (LOGD) {
@@ -496,7 +474,7 @@
// update chart to show selected cycle, and update detail data
// to match updated sweep bounds.
- mChart.setVisibleRange(cycle.start, cycle.end);
+ mChart.setNetworkCycleData(mCycleData.get(position));
updateDetailData();
}
@@ -507,27 +485,30 @@
}
};
- private final LoaderCallbacks<ChartData> mChartDataCallbacks = new LoaderCallbacks<
- ChartData>() {
+ private final LoaderCallbacks<List<NetworkCycleData>> mNetworkCycleDataCallbacks =
+ new LoaderCallbacks<List<NetworkCycleData>>() {
@Override
- public Loader<ChartData> onCreateLoader(int id, Bundle args) {
- return new ChartDataLoaderCompat(getActivity(), mStatsSession, args);
+ public Loader<List<NetworkCycleData>> onCreateLoader(int id, Bundle args) {
+ return new NetworkCycleDataLoader.Builder(getContext())
+ .setNetworkPolicy(services.mPolicyEditor.getPolicy(mTemplate))
+ .setNetworkType(mNetworkType)
+ .setNetworkTemplate(mTemplate)
+ .setSubscriberId(mTelephonyManager.getSubscriberId(mSubId))
+ .build();
}
@Override
- public void onLoadFinished(Loader<ChartData> loader, ChartData data) {
+ public void onLoadFinished(Loader<List<NetworkCycleData>> loader,
+ List<NetworkCycleData> data) {
mLoadingViewController.showContent(false /* animate */);
- mChartData = data;
- mChart.setNetworkStats(mChartData.network);
-
+ mCycleData = data;
// calculate policy cycles based on available data
updatePolicy();
}
@Override
- public void onLoaderReset(Loader<ChartData> loader) {
- mChartData = null;
- mChart.setNetworkStats(null);
+ public void onLoaderReset(Loader<List<NetworkCycleData>> loader) {
+ mCycleData = null;
}
};
@@ -535,11 +516,11 @@
new LoaderCallbacks<NetworkStats>() {
@Override
public Loader<NetworkStats> onCreateLoader(int id, Bundle args) {
- return new NetworkStatsDetailLoader.Builder(getContext())
+ return new NetworkStatsSummaryLoader.Builder(getContext())
.setStartTime(mChart.getInspectStart())
.setEndTime(mChart.getInspectEnd())
.setNetworkType(mNetworkType)
- .setSubscriptionId(mSubId)
+ .setSubscriberId(mTelephonyManager.getSubscriberId(mSubId))
.build();
}
diff --git a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
index 3170dac..2719818 100644
--- a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
+++ b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
@@ -27,8 +27,8 @@
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.UserAppInfo;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.widget.apppreference.AppPreference;
import java.util.List;
@@ -80,6 +80,7 @@
/**
* Simple interface for building application list within {
+ *
* @link ApplicationListPreferenceController}
*/
public interface ApplicationListBuilder {
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index 7c21774..8cac2b2 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge;
import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.widget.TextView;
@@ -26,7 +25,7 @@
import com.android.settings.R;
import com.android.settings.Utils;
-import com.android.settings.widget.AppPreference;
+import com.android.settingslib.widget.apppreference.AppPreference;
/**
* Custom preference for displaying battery usage info as a bar and an icon on
diff --git a/src/com/android/settings/homepage/CardDatabaseHelper.java b/src/com/android/settings/homepage/CardDatabaseHelper.java
index b53479e..53de441 100644
--- a/src/com/android/settings/homepage/CardDatabaseHelper.java
+++ b/src/com/android/settings/homepage/CardDatabaseHelper.java
@@ -30,7 +30,7 @@
public class CardDatabaseHelper extends SQLiteOpenHelper {
private static final String TAG = "CardDatabaseHelper";
private static final String DATABASE_NAME = "homepage_cards.db";
- private static final int DATABASE_VERSION = 2;
+ private static final int DATABASE_VERSION = 3;
public static final String CARD_TABLE = "cards";
@@ -143,7 +143,7 @@
CardColumns.PACKAGE_NAME +
" TEXT NOT NULL, " +
CardColumns.APP_VERSION +
- " TEXT NOT NULL, " +
+ " INTEGER NOT NULL, " +
CardColumns.TITLE_RES_NAME +
" TEXT, " +
CardColumns.TITLE_TEXT +
diff --git a/src/com/android/settings/homepage/ContextualCard.java b/src/com/android/settings/homepage/ContextualCard.java
index 5bd265b..130b878 100644
--- a/src/com/android/settings/homepage/ContextualCard.java
+++ b/src/com/android/settings/homepage/ContextualCard.java
@@ -50,7 +50,7 @@
private final int mCategory;
private final String mLocalizedToLocale;
private final String mPackageName;
- private final String mAppVersion;
+ private final long mAppVersion;
private final String mTitleResName;
private final String mTitleText;
private final String mSummaryResName;
@@ -94,7 +94,7 @@
return mPackageName;
}
- public String getAppVersion() {
+ public long getAppVersion() {
return mAppVersion;
}
@@ -172,7 +172,7 @@
mLocalizedToLocale = c.getString(
c.getColumnIndex(CardDatabaseHelper.CardColumns.LOCALIZED_TO_LOCALE));
mPackageName = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.PACKAGE_NAME));
- mAppVersion = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.APP_VERSION));
+ mAppVersion = c.getLong(c.getColumnIndex(CardDatabaseHelper.CardColumns.APP_VERSION));
mTitleResName = c.getString(
c.getColumnIndex(CardDatabaseHelper.CardColumns.TITLE_RES_NAME));
mTitleText = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.TITLE_TEXT));
@@ -217,7 +217,7 @@
private int mCategory;
private String mLocalizedToLocale;
private String mPackageName;
- private String mAppVersion;
+ private long mAppVersion;
private String mTitleResName;
private String mTitleText;
private String mSummaryResName;
@@ -264,7 +264,7 @@
return this;
}
- public Builder setAppVersion(String appVersion) {
+ public Builder setAppVersion(long appVersion) {
mAppVersion = appVersion;
return this;
}
diff --git a/src/com/android/settings/homepage/conditional/AirplaneModeConditionCard.java b/src/com/android/settings/homepage/conditional/AirplaneModeConditionCard.java
index f56fcc3..2fbe80a 100644
--- a/src/com/android/settings/homepage/conditional/AirplaneModeConditionCard.java
+++ b/src/com/android/settings/homepage/conditional/AirplaneModeConditionCard.java
@@ -47,7 +47,7 @@
@Override
public Drawable getIcon() {
- return mAppContext.getDrawable(R.drawable.ic_airplane);
+ return mAppContext.getDrawable(R.drawable.ic_airplanemode_active);
}
@Override
diff --git a/src/com/android/settings/homepage/deviceinfo/DataUsageSlice.java b/src/com/android/settings/homepage/deviceinfo/DataUsageSlice.java
new file mode 100644
index 0000000..d78b93d
--- /dev/null
+++ b/src/com/android/settings/homepage/deviceinfo/DataUsageSlice.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2018 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.homepage.deviceinfo;
+
+import android.app.PendingIntent;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.format.Formatter;
+import android.text.style.TextAppearanceSpan;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SubSettings;
+import com.android.settings.Utils;
+import com.android.settings.datausage.DataUsageSummary;
+import com.android.settings.datausage.DataUsageUtils;
+import com.android.settings.slices.CustomSliceable;
+import com.android.settings.slices.SettingsSliceProvider;
+import com.android.settings.slices.SliceBuilderUtils;
+import com.android.settingslib.net.DataUsageController;
+
+import java.util.concurrent.TimeUnit;
+
+public class DataUsageSlice implements CustomSliceable {
+ private static final String TAG = "DataUsageSlice";
+ private static final long MILLIS_IN_A_DAY = TimeUnit.DAYS.toMillis(1);
+
+ /**
+ * The path denotes the unique name of data usage slice.
+ */
+ public static final String PATH_DATA_USAGE_CARD = "data_usage_card";
+
+ /**
+ * Backing Uri for the Data usage Slice.
+ */
+ public static final Uri DATA_USAGE_CARD_URI = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendPath(PATH_DATA_USAGE_CARD)
+ .build();
+
+ private final Context mContext;
+
+ public DataUsageSlice(Context context) {
+ mContext = context;
+ }
+
+ @Override
+ public Uri getUri() {
+ return DATA_USAGE_CARD_URI;
+ }
+
+ /**
+ * Return a Data usage Slice bound to {@link #DATA_USAGE_CARD_URI}
+ */
+ @Override
+ public Slice getSlice() {
+ final IconCompat icon = IconCompat.createWithResource(mContext,
+ R.drawable.ic_settings_data_usage);
+ final String title = mContext.getString(R.string.data_usage_summary_title);
+ final SliceAction primaryAction = new SliceAction(getPrimaryAction(), icon, title);
+ final DataUsageController dataUsageController = new DataUsageController(mContext);
+ final DataUsageController.DataUsageInfo info = dataUsageController.getDataUsageInfo();
+ final ListBuilder listBuilder =
+ new ListBuilder(mContext, DATA_USAGE_CARD_URI, ListBuilder.INFINITY)
+ .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
+ .setHeader(new ListBuilder.HeaderBuilder().setTitle(title));
+ if (DataUsageUtils.hasSim(mContext)) {
+ listBuilder.addRow(new ListBuilder.RowBuilder()
+ .setTitle(getDataUsageText(info))
+ .setSubtitle(getCycleTime(info))
+ .setPrimaryAction(primaryAction));
+ } else {
+ listBuilder.addRow(new ListBuilder.RowBuilder()
+ .setTitle(mContext.getText(R.string.no_sim_card))
+ .setPrimaryAction(primaryAction));
+ }
+ return listBuilder.build();
+ }
+
+ @Override
+ public Intent getIntent() {
+ final String screenTitle = mContext.getText(R.string.data_usage_wifi_title).toString();
+ final Uri contentUri = new Uri.Builder().appendPath(PATH_DATA_USAGE_CARD).build();
+ return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
+ DataUsageSummary.class.getName(), PATH_DATA_USAGE_CARD, screenTitle,
+ MetricsProto.MetricsEvent.SLICE)
+ .setClassName(mContext.getPackageName(), SubSettings.class.getName())
+ .setData(contentUri);
+ }
+
+ private PendingIntent getPrimaryAction() {
+ final Intent intent = getIntent();
+ return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
+ }
+
+ @VisibleForTesting
+ CharSequence getDataUsageText(DataUsageController.DataUsageInfo info) {
+ final Formatter.BytesResult usedResult = Formatter.formatBytes(mContext.getResources(),
+ info.usageLevel, Formatter.FLAG_CALCULATE_ROUNDED | Formatter.FLAG_IEC_UNITS);
+ final SpannableString usageNumberText = new SpannableString(usedResult.value);
+ usageNumberText.setSpan(
+ new TextAppearanceSpan(mContext, android.R.style.TextAppearance_Large), 0,
+ usageNumberText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ return TextUtils.expandTemplate(mContext.getText(R.string.data_used_formatted),
+ usageNumberText, usedResult.units);
+ }
+
+ @VisibleForTesting
+ CharSequence getCycleTime(DataUsageController.DataUsageInfo info) {
+ final long millisLeft = info.cycleEnd - System.currentTimeMillis();
+ if (millisLeft <= 0) {
+ return mContext.getString(R.string.billing_cycle_none_left);
+ } else {
+ final int daysLeft = (int) (millisLeft / MILLIS_IN_A_DAY);
+ return daysLeft < 1 ? mContext.getString(R.string.billing_cycle_less_than_one_day_left)
+ : mContext.getResources().getQuantityString(R.plurals.billing_cycle_days_left,
+ daysLeft, daysLeft);
+ }
+ }
+
+ @Override
+ public void onNotifyChange(Intent intent) {
+
+ }
+}
diff --git a/src/com/android/settings/location/AppSettingsInjector.java b/src/com/android/settings/location/AppSettingsInjector.java
index b8111f2..8120821 100644
--- a/src/com/android/settings/location/AppSettingsInjector.java
+++ b/src/com/android/settings/location/AppSettingsInjector.java
@@ -21,10 +21,10 @@
import androidx.preference.Preference;
-import com.android.settings.widget.AppPreference;
import com.android.settings.widget.RestrictedAppPreference;
import com.android.settingslib.location.InjectedSetting;
import com.android.settingslib.location.SettingsInjector;
+import com.android.settingslib.widget.apppreference.AppPreference;
/**
* Adds the preferences specified by the {@link InjectedSetting} objects to a preference group.
diff --git a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
index 7660312..60374eb 100644
--- a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
@@ -26,9 +26,9 @@
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.location.RecentLocationApps;
+import com.android.settingslib.widget.apppreference.AppPreference;
import java.util.List;
@@ -43,7 +43,7 @@
private PreferenceCategory mCategoryRecentLocationRequests;
private Preference mSeeAllButton;
- /** Used in this class and {@link RecentLocationRequestSeeAllPreferenceController}*/
+ /** Used in this class and {@link RecentLocationRequestSeeAllPreferenceController} */
static class PackageEntryClickedListener implements Preference.OnPreferenceClickListener {
private final DashboardFragment mFragment;
private final String mPackage;
@@ -111,7 +111,7 @@
if (recentLocationRequests.size() > 3) {
// Display the top 3 preferences to container in original order.
- for (int i = 0; i < 3; i ++) {
+ for (int i = 0; i < 3; i++) {
mCategoryRecentLocationRequests.addPreference(
createAppPreference(prefContext, recentLocationRequests.get(i)));
}
diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java
index 6a1ebd9..3fa0f00 100644
--- a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java
@@ -23,9 +23,9 @@
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.location.RecentLocationApps;
+import com.android.settingslib.widget.apppreference.AppPreference;
import java.util.List;
diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index 47a75c3..6b99e1f 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -241,7 +241,7 @@
CarrierConfigManager configManager = (CarrierConfigManager)
getSystemService(Context.CARRIER_CONFIG_SERVICE);
if (configManager != null) {
- PersistableBundle b = configManager.getConfig();
+ PersistableBundle b = configManager.getConfigForSubId(mSubId);
if (b != null) {
mReadOnlyApnTypes = b.getStringArray(
CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY);
diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java
index df0b1b4..beeaab3 100755
--- a/src/com/android/settings/network/ApnSettings.java
+++ b/src/com/android/settings/network/ApnSettings.java
@@ -186,7 +186,7 @@
CarrierConfigManager configManager = (CarrierConfigManager)
getSystemService(Context.CARRIER_CONFIG_SERVICE);
- PersistableBundle b = configManager.getConfig();
+ PersistableBundle b = configManager.getConfigForSubId(mSubId);
mHideImsApn = b.getBoolean(CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL);
mAllowAddingApns = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL);
if (mAllowAddingApns) {
diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java
index d5641cd..bf55271 100644
--- a/src/com/android/settings/password/SetNewPasswordController.java
+++ b/src/com/android/settings/password/SetNewPasswordController.java
@@ -148,7 +148,7 @@
private Bundle getFaceChooseLockExtras() {
Bundle chooseLockExtras = new Bundle();
- long challenge = mFaceManager.preEnroll();
+ long challenge = mFaceManager.generateChallenge();
chooseLockExtras.putInt(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
PASSWORD_QUALITY_SOMETHING);
chooseLockExtras.putBoolean(
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 759cf3b..58e4ada 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -190,8 +190,6 @@
if (emptyView == null) {
emptyView = getActivity().getLayoutInflater().inflate(
R.layout.empty_print_state, contentRoot, false);
- ImageView iconView = (ImageView) emptyView.findViewById(R.id.icon);
- iconView.setContentDescription(getString(R.string.print_service_disabled));
TextView textView = (TextView) emptyView.findViewById(R.id.message);
textView.setText(R.string.print_service_disabled);
contentRoot.addView(emptyView);
@@ -216,8 +214,6 @@
if (emptyView == null) {
emptyView = getActivity().getLayoutInflater().inflate(
R.layout.empty_print_state, contentRoot, false);
- ImageView iconView = (ImageView) emptyView.findViewById(R.id.icon);
- iconView.setContentDescription(getString(R.string.print_no_printers_found));
TextView textView = (TextView) emptyView.findViewById(R.id.message);
textView.setText(R.string.print_no_printers_found);
contentRoot.addView(emptyView);
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 2f1f63d..63ffe87 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -55,8 +55,8 @@
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.widget.apppreference.AppPreference;
import java.text.DateFormat;
import java.util.ArrayList;
@@ -356,7 +356,7 @@
printJob.getCreationTime(), printJob.getCreationTime(),
DateFormat.SHORT, DateFormat.SHORT)));
- TypedArray a = getActivity().obtainStyledAttributes(new int[] {
+ TypedArray a = getActivity().obtainStyledAttributes(new int[]{
android.R.attr.colorControlNormal});
int tintColor = a.getColor(0, 0);
a.recycle();
diff --git a/src/com/android/settings/slices/CustomSliceManager.java b/src/com/android/settings/slices/CustomSliceManager.java
index 8230a6f..3d81392 100644
--- a/src/com/android/settings/slices/CustomSliceManager.java
+++ b/src/com/android/settings/slices/CustomSliceManager.java
@@ -20,6 +20,7 @@
import android.net.Uri;
import android.util.ArrayMap;
+import com.android.settings.homepage.deviceinfo.DataUsageSlice;
import com.android.settings.wifi.WifiSlice;
import java.util.Map;
@@ -87,5 +88,6 @@
private void addSlices() {
mUriMap.put(WifiSlice.WIFI_URI, WifiSlice.class);
+ mUriMap.put(DataUsageSlice.DATA_USAGE_CARD_URI, DataUsageSlice.class);
}
}
\ No newline at end of file
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index 0306fc9..a947fb2 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -184,12 +184,23 @@
*/
public static CharSequence getSubtitleText(Context context,
AbstractPreferenceController controller, SliceData sliceData) {
- CharSequence summaryText = sliceData.getScreenTitle();
+ final boolean isDynamicSummaryAllowed = sliceData.isDynamicSummaryAllowed();
+ CharSequence summaryText = controller.getSummary();
+
+ // Priority 1 : User prefers showing the dynamic summary in slice view rather than static
+ // summary.
+ if (isDynamicSummaryAllowed && isValidSummary(context, summaryText)) {
+ return summaryText;
+ }
+
+ // Priority 2 : Show screen title.
+ summaryText = sliceData.getScreenTitle();
if (isValidSummary(context, summaryText) && !TextUtils.equals(summaryText,
sliceData.getTitle())) {
return summaryText;
}
+ // Priority 3 : Show dynamic summary from preference controller.
if (controller != null) {
summaryText = controller.getSummary();
@@ -198,11 +209,13 @@
}
}
+ // Priority 4 : Show summary from slice data.
summaryText = sliceData.getSummary();
if (isValidSummary(context, summaryText)) {
return summaryText;
}
+ // Priority 5 : Show empty text.
return "";
}
@@ -217,7 +230,7 @@
.build();
}
- public static Intent buildSearchResultPageIntent(Context context, String className, String key,
+ public static Intent buildSearchResultPageIntent(Context context, String className, String key,
String screenTitle, int sourceMetricsCategory) {
final Bundle args = new Bundle();
args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);
diff --git a/src/com/android/settings/slices/SliceData.java b/src/com/android/settings/slices/SliceData.java
index 72729a8..8705884 100644
--- a/src/com/android/settings/slices/SliceData.java
+++ b/src/com/android/settings/slices/SliceData.java
@@ -74,6 +74,8 @@
private final boolean mIsPlatformDefined;
+ private final boolean mIsDynamicSummaryAllowed;
+
public String getKey() {
return mKey;
}
@@ -118,6 +120,10 @@
return mIsPlatformDefined;
}
+ public boolean isDynamicSummaryAllowed() {
+ return mIsDynamicSummaryAllowed;
+ }
+
private SliceData(Builder builder) {
mKey = builder.mKey;
mTitle = builder.mTitle;
@@ -130,6 +136,7 @@
mPreferenceController = builder.mPrefControllerClassName;
mSliceType = builder.mSliceType;
mIsPlatformDefined = builder.mIsPlatformDefined;
+ mIsDynamicSummaryAllowed = builder.mIsDynamicSummaryAllowed;
}
@Override
@@ -169,6 +176,8 @@
private boolean mIsPlatformDefined;
+ private boolean mIsDynamicSummaryAllowed;
+
public Builder setKey(String key) {
mKey = key;
return this;
@@ -224,6 +233,11 @@
return this;
}
+ public Builder setDynamicSummaryAllowed(boolean isDynamicSummaryAllowed) {
+ mIsDynamicSummaryAllowed = isDynamicSummaryAllowed;
+ return this;
+ }
+
public SliceData build() {
if (TextUtils.isEmpty(mKey)) {
throw new InvalidSliceDataException("Key cannot be empty");
diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java
index 7c233a6..29e3d6b 100644
--- a/src/com/android/settings/slices/SliceDataConverter.java
+++ b/src/com/android/settings/slices/SliceDataConverter.java
@@ -16,6 +16,8 @@
package com.android.settings.slices;
+import static com.android.settings.core.PreferenceXmlParserUtils
+ .METADATA_ALLOW_DYNAMIC_SUMMARY_IN_SLICE;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_CONTROLLER;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_ICON;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
@@ -186,7 +188,8 @@
| MetadataFlag.FLAG_NEED_PREF_TITLE
| MetadataFlag.FLAG_NEED_PREF_ICON
| MetadataFlag.FLAG_NEED_PREF_SUMMARY
- | MetadataFlag.FLAG_NEED_PLATFORM_SLICE_FLAG);
+ | MetadataFlag.FLAG_NEED_PLATFORM_SLICE_FLAG
+ | MetadataFlag.FLAG_ALLOW_DYNAMIC_SUMMARY_IN_SLICE);
for (Bundle bundle : metadata) {
// TODO (b/67996923) Non-controller Slices should become intent-only slices.
@@ -203,6 +206,8 @@
final int sliceType = SliceBuilderUtils.getSliceType(mContext, controllerClassName,
key);
final boolean isPlatformSlice = bundle.getBoolean(METADATA_PLATFORM_SLICE_FLAG);
+ final boolean isDynamicSummaryAllowed = bundle.getBoolean(
+ METADATA_ALLOW_DYNAMIC_SUMMARY_IN_SLICE);
final SliceData xmlSlice = new SliceData.Builder()
.setKey(key)
@@ -214,6 +219,7 @@
.setFragmentName(fragmentName)
.setSliceType(sliceType)
.setPlatformDefined(isPlatformSlice)
+ .setDynamicSummaryAllowed(isDynamicSummaryAllowed)
.build();
final BasePreferenceController controller =
diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java
index 79d3bc6..35a0a5d 100644
--- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java
+++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java
@@ -49,6 +49,7 @@
IndexColumns.CONTROLLER,
IndexColumns.PLATFORM_SLICE,
IndexColumns.SLICE_TYPE,
+ IndexColumns.ALLOW_DYNAMIC_SUMMARY_IN_SLICE,
};
// Cursor value for boolean true
@@ -159,6 +160,8 @@
cursor.getColumnIndex(IndexColumns.CONTROLLER));
final boolean isPlatformDefined = cursor.getInt(
cursor.getColumnIndex(IndexColumns.PLATFORM_SLICE)) == TRUE;
+ final boolean isDynamicSummaryAllowed = cursor.getInt(
+ cursor.getColumnIndex(IndexColumns.ALLOW_DYNAMIC_SUMMARY_IN_SLICE)) == TRUE;
int sliceType = cursor.getInt(
cursor.getColumnIndex(IndexColumns.SLICE_TYPE));
@@ -178,6 +181,7 @@
.setUri(uri)
.setPlatformDefined(isPlatformDefined)
.setSliceType(sliceType)
+ .setDynamicSummaryAllowed(isDynamicSummaryAllowed)
.build();
}
diff --git a/src/com/android/settings/slices/SlicesDatabaseHelper.java b/src/com/android/settings/slices/SlicesDatabaseHelper.java
index f1628e7..e463099 100644
--- a/src/com/android/settings/slices/SlicesDatabaseHelper.java
+++ b/src/com/android/settings/slices/SlicesDatabaseHelper.java
@@ -36,7 +36,7 @@
private static final String DATABASE_NAME = "slices_index.db";
private static final String SHARED_PREFS_TAG = "slices_shared_prefs";
- private static final int DATABASE_VERSION = 2;
+ private static final int DATABASE_VERSION = 3;
public interface Tables {
String TABLE_SLICES_INDEX = "slices_index";
@@ -93,6 +93,12 @@
* {@link SliceData.SliceType} representing the inline type of the result.
*/
String SLICE_TYPE = "slice_type";
+
+ /**
+ * Boolean flag, {@code true} when the slice object prefers using the dynamic summary from
+ * preference controller.
+ */
+ String ALLOW_DYNAMIC_SUMMARY_IN_SLICE = "allow_dynamic_summary_in_slice";
}
private static final String CREATE_SLICES_TABLE =
@@ -117,6 +123,8 @@
IndexColumns.PLATFORM_SLICE +
", " +
IndexColumns.SLICE_TYPE +
+ ", " +
+ IndexColumns.ALLOW_DYNAMIC_SUMMARY_IN_SLICE +
");";
private final Context mContext;
diff --git a/src/com/android/settings/slices/SlicesIndexer.java b/src/com/android/settings/slices/SlicesIndexer.java
index f88af8f..0ccd223 100644
--- a/src/com/android/settings/slices/SlicesIndexer.java
+++ b/src/com/android/settings/slices/SlicesIndexer.java
@@ -111,6 +111,8 @@
values.put(IndexColumns.CONTROLLER, dataRow.getPreferenceController());
values.put(IndexColumns.PLATFORM_SLICE, dataRow.isPlatformDefined());
values.put(IndexColumns.SLICE_TYPE, dataRow.getSliceType());
+ values.put(IndexColumns.ALLOW_DYNAMIC_SUMMARY_IN_SLICE,
+ dataRow.isDynamicSummaryAllowed());
database.replaceOrThrow(Tables.TABLE_SLICES_INDEX, null /* nullColumnHack */,
values);
diff --git a/src/com/android/settings/widget/AppPreference.java b/src/com/android/settings/widget/AppPreference.java
deleted file mode 100644
index 91e700a..0000000
--- a/src/com/android/settings/widget/AppPreference.java
+++ /dev/null
@@ -1,64 +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.widget;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ProgressBar;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-
-public class AppPreference extends Preference {
-
- private int mProgress;
- private boolean mProgressVisible;
-
- public AppPreference(Context context) {
- super(context);
- setLayoutResource(R.layout.preference_app);
- }
-
- public AppPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- setLayoutResource(R.layout.preference_app);
- }
-
- public void setProgress(int amount) {
- mProgress = amount;
- mProgressVisible = true;
- notifyChanged();
- }
-
- @Override
- public void onBindViewHolder(PreferenceViewHolder view) {
- super.onBindViewHolder(view);
-
- view.findViewById(R.id.summary_container)
- .setVisibility(TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE);
- final ProgressBar progress = (ProgressBar) view.findViewById(android.R.id.progress);
- if (mProgressVisible) {
- progress.setProgress(mProgress);
- progress.setVisibility(View.VISIBLE);
- } else {
- progress.setVisibility(View.GONE);
- }
- }
-}
diff --git a/src/com/android/settings/widget/RestrictedAppPreference.java b/src/com/android/settings/widget/RestrictedAppPreference.java
index e33c342..8a2cc91 100644
--- a/src/com/android/settings/widget/RestrictedAppPreference.java
+++ b/src/com/android/settings/widget/RestrictedAppPreference.java
@@ -28,6 +28,7 @@
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreferenceHelper;
+import com.android.settingslib.widget.apppreference.AppPreference;
/**
* {@link AppPreference} that implements user restriction utilities using
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index 1ed50c9..38108f7 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -28,6 +28,7 @@
com.android.settings.bluetooth.BluetoothPairingDetail
com.android.settings.bluetooth.DevicePickerFragment
com.android.settings.datausage.AppDataUsage
+com.android.settings.datausage.AppDataUsageV2
com.android.settings.datausage.DataUsageList
com.android.settings.datausage.DataUsageListV2
com.android.settings.datetime.timezone.TimeZoneSettings
diff --git a/tests/robotests/res/xml-mcc998/location_settings.xml b/tests/robotests/res/xml-mcc998/location_settings.xml
index f61ca63..16f0d82 100644
--- a/tests/robotests/res/xml-mcc998/location_settings.xml
+++ b/tests/robotests/res/xml-mcc998/location_settings.xml
@@ -25,13 +25,15 @@
android:title="title"
android:icon="@drawable/ic_android"
android:summary="summary1"
- settings:controller="com.android.settings.core.BadPreferenceController"/>
+ settings:controller="com.android.settings.core.BadPreferenceController"
+ settings:allowDynamicSummaryInSlice="true"/>
<Preference
android:key="key2"
android:title="title"
android:icon="@drawable/ic_android"
android:summary="summary2"
- settings:controller="com.android.settings.slices.FakePreferenceController"/>
+ settings:controller="com.android.settings.slices.FakePreferenceController"
+ settings:allowDynamicSummaryInSlice="true"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/tests/robotests/res/xml-mcc999/location_settings.xml b/tests/robotests/res/xml-mcc999/location_settings.xml
index da71a1e..91e4c41 100644
--- a/tests/robotests/res/xml-mcc999/location_settings.xml
+++ b/tests/robotests/res/xml-mcc999/location_settings.xml
@@ -26,6 +26,7 @@
android:summary="summary"
settings:controller="com.android.settings.slices.FakePreferenceController"
settings:keywords="a, b, c"
- settings:platform_slice="true"/>
+ settings:platform_slice="true"
+ settings:allowDynamicSummaryInSlice="true"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java
index b1cd714..e124365 100644
--- a/tests/robotests/src/com/android/settings/MasterClearTest.java
+++ b/tests/robotests/src/com/android/settings/MasterClearTest.java
@@ -18,7 +18,6 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
@@ -51,7 +50,6 @@
import androidx.fragment.app.FragmentActivity;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUtils;
@@ -61,6 +59,7 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowActivity;
@@ -358,8 +357,9 @@
when(mPackageManager.resolveActivity(any(), eq(0))).thenReturn(resolveInfo);
Intent actualIntent = mMasterClear.getAccountConfirmationIntent();
- assertEquals(TEST_CONFIRMATION_PACKAGE, actualIntent.getComponent().getPackageName());
- assertEquals(TEST_CONFIRMATION_CLASS, actualIntent.getComponent().getClassName());
+ assertThat(TEST_CONFIRMATION_PACKAGE).isEqualTo(
+ actualIntent.getComponent().getPackageName());
+ assertThat(TEST_CONFIRMATION_CLASS).isEqualTo(actualIntent.getComponent().getClassName());
}
@Test
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
index f2fb121..a4d1567 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
@@ -23,9 +23,13 @@
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.accounts.Account;
+import android.accounts.AccountManager;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
@@ -49,6 +53,8 @@
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowAccountManager;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -73,10 +79,11 @@
final Bundle args = new Bundle();
args.putParcelable(METADATA_USER_HANDLE, UserHandle.CURRENT);
- mFragment = new AccountDetailDashboardFragment();
+ mFragment = spy(new AccountDetailDashboardFragment());
mFragment.setArguments(args);
mFragment.mAccountType = "com.abc";
mFragment.mAccount = new Account("name1@abc.com", "com.abc");
+ when(mFragment.getContext()).thenReturn(mContext);
}
@Test
@@ -143,4 +150,20 @@
assertThat(intent.getStringExtra("extra.accountName")).isEqualTo("name1@abc.com");
}
+
+ @Test
+ @Config(shadows = {ShadowAccountManager.class})
+ public void onResume_accountMissing_shouldFinish() {
+ mFragment.finishIfAccountMissing();
+ verify(mFragment).finish();
+ }
+
+ @Test
+ @Config(shadows = {ShadowAccountManager.class})
+ public void onResume_accountPresent_shouldNotFinish() {
+ AccountManager mgr = mContext.getSystemService(AccountManager.class);
+ Shadows.shadowOf(mgr).addAccount(mFragment.mAccount);
+ mFragment.finishIfAccountMissing();
+ verify(mFragment, never()).finish();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
index de67bd2..3bebd66 100644
--- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
@@ -15,6 +15,8 @@
*/
package com.android.settings.accounts;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
@@ -28,7 +30,10 @@
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AccountManagerCallback;
+import android.accounts.AccountManagerFuture;
import android.accounts.AuthenticatorDescription;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
@@ -56,12 +61,14 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -157,7 +164,8 @@
@Test
@Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
- public void confirmRemove_shouldRemoveAccount() {
+ public void confirmRemove_shouldRemoveAccount()
+ throws AuthenticatorException, OperationCanceledException, IOException {
when(mFragment.isAdded()).thenReturn(true);
FragmentActivity activity = mock(FragmentActivity.class);
when(activity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
@@ -170,7 +178,18 @@
mFragment, account, userHandle);
dialog.onCreate(new Bundle());
dialog.onClick(null, 0);
+ ArgumentCaptor<AccountManagerCallback<Bundle>> callbackCaptor = ArgumentCaptor.forClass(
+ AccountManagerCallback.class);
verify(mAccountManager).removeAccountAsUser(eq(account), nullable(Activity.class),
- nullable(AccountManagerCallback.class), nullable(Handler.class), eq(userHandle));
+ callbackCaptor.capture(), nullable(Handler.class), eq(userHandle));
+
+ AccountManagerCallback<Bundle> callback = callbackCaptor.getValue();
+ assertThat(callback).isNotNull();
+ AccountManagerFuture<Bundle> future = mock(AccountManagerFuture.class);
+ Bundle resultBundle = new Bundle();
+ resultBundle.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, true);
+ when(future.getResult()).thenReturn(resultBundle);
+ callback.run(future);
+ verify(activity).finish();
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
index 8e3bb42..cb50486 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
@@ -19,6 +19,8 @@
import static android.text.format.DateUtils.DAY_IN_MILLIS;
import static com.android.settings.applications.AppStateNotificationBridge
+ .FILTER_APP_NOTIFICATION_BLOCKED;
+import static com.android.settings.applications.AppStateNotificationBridge
.FILTER_APP_NOTIFICATION_FREQUENCY;
import static com.android.settings.applications.AppStateNotificationBridge
.FILTER_APP_NOTIFICATION_RECENCY;
@@ -379,10 +381,11 @@
NotificationsSentState sent = new NotificationsSentState();
sent.lastSent = System.currentTimeMillis() - (2 * DAY_IN_MILLIS);
- assertThat(AppStateNotificationBridge.getSummary(mContext, neverSent, true)).isEqualTo(
- mContext.getString(R.string.notifications_sent_never));
- assertThat(AppStateNotificationBridge.getSummary(mContext, sent, true).toString())
- .contains("2");
+ assertThat(AppStateNotificationBridge.getSummary(
+ mContext, neverSent, R.id.sort_order_recent_notification)).isEqualTo(
+ mContext.getString(R.string.notifications_sent_never));
+ assertThat(AppStateNotificationBridge.getSummary(
+ mContext, sent, R.id.sort_order_recent_notification).toString()).contains("2");
}
@Test
@@ -392,13 +395,24 @@
NotificationsSentState sentOften = new NotificationsSentState();
sentOften.avgSentDaily = 8;
- assertThat(AppStateNotificationBridge.getSummary(mContext, sentRarely, false).toString())
+ assertThat(AppStateNotificationBridge.getSummary(
+ mContext, sentRarely, R.id.sort_order_frequent_notification).toString())
.contains("1");
- assertThat(AppStateNotificationBridge.getSummary(mContext, sentOften, false).toString())
+ assertThat(AppStateNotificationBridge.getSummary(
+ mContext, sentOften, R.id.sort_order_frequent_notification).toString())
.contains("8");
}
@Test
+ public void testSummary_alpha() {
+ NotificationsSentState sentRarely = new NotificationsSentState();
+ sentRarely.avgSentWeekly = 1;
+ assertThat(AppStateNotificationBridge.getSummary(
+ mContext, sentRarely, R.id.sort_order_alpha).toString())
+ .isEqualTo("");
+ }
+
+ @Test
public void testFilterRecency() {
NotificationsSentState allowState = new NotificationsSentState();
allowState.lastSent = 1;
@@ -433,6 +447,23 @@
}
@Test
+ public void testFilterBlocked() {
+ NotificationsSentState allowState = new NotificationsSentState();
+ allowState.blocked = true;
+ AppEntry allow = mock(AppEntry.class);
+ allow.extraInfo = allowState;
+
+ assertTrue(FILTER_APP_NOTIFICATION_BLOCKED.filterApp(allow));
+
+ NotificationsSentState denyState = new NotificationsSentState();
+ denyState.blocked = false;
+ AppEntry deny = mock(AppEntry.class);
+ deny.extraInfo = denyState;
+
+ assertFalse(FILTER_APP_NOTIFICATION_BLOCKED.filterApp(deny));
+ }
+
+ @Test
public void testComparators_nullsNoCrash() {
List<AppEntry> entries = new ArrayList<>();
AppEntry a = mock(AppEntry.class);
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
index c9ab7c0..b3f5b5e 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
@@ -200,13 +200,13 @@
}
@Test
- public void shouldUseStableItemHeight_mainType_yes() {
+ public void shouldUseStableItemHeight() {
assertThat(ManageApplications.ApplicationsAdapter.shouldUseStableItemHeight(
LIST_TYPE_MAIN))
.isTrue();
assertThat(ManageApplications.ApplicationsAdapter.shouldUseStableItemHeight(
LIST_TYPE_NOTIFICATION))
- .isFalse();
+ .isTrue();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
index e321b4b..5c4289c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
@@ -106,7 +106,7 @@
}
@Override
- public boolean isConnectable() {
+ public boolean accessProfileEnabled() {
return true;
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
index b28a8b2..5233d84 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
@@ -17,9 +17,10 @@
import static android.bluetooth.BluetoothDevice.PAIRING_VARIANT_CONSENT;
-import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.content.Intent;
@@ -39,6 +40,8 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class})
public class BluetoothPairingControllerTest {
+ private final BluetoothClass mBluetoothClass =
+ new BluetoothClass(BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE);
@Mock
private BluetoothDevice mBluetoothDevice;
private Context mContext;
@@ -51,7 +54,7 @@
mContext = RuntimeEnvironment.application;
final Intent intent = new Intent();
intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
- mBluetoothPairingController = spy(new BluetoothPairingController(intent, mContext));
+ mBluetoothPairingController = new BluetoothPairingController(intent, mContext);
}
@Test
@@ -63,4 +66,36 @@
verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
}
+
+ @Test
+ public void onSetContactSharingState_permissionAllowed_setPBAPAllowed() {
+ when(mBluetoothDevice.getPhonebookAccessPermission()).thenReturn(
+ BluetoothDevice.ACCESS_ALLOWED);
+ mBluetoothPairingController.setContactSharingState();
+ mBluetoothPairingController.onDialogPositiveClick(null);
+
+ verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+ }
+
+ @Test
+ public void onSetContactSharingState_permissionUnknown_audioVideoHandsfree_setPBAPAllowed() {
+ when(mBluetoothDevice.getPhonebookAccessPermission()).thenReturn(
+ BluetoothDevice.ACCESS_UNKNOWN);
+ when(mBluetoothDevice.getBluetoothClass()).thenReturn(mBluetoothClass);
+ mBluetoothPairingController.setContactSharingState();
+ mBluetoothPairingController.onDialogPositiveClick(null);
+
+ verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+ }
+
+ @Test
+ public void onSetContactSharingState_permissionRejected_setPBAPRejected() {
+ when(mBluetoothDevice.getPhonebookAccessPermission()).thenReturn(
+ BluetoothDevice.ACCESS_REJECTED);
+ when(mBluetoothDevice.getBluetoothClass()).thenReturn(mBluetoothClass);
+ mBluetoothPairingController.setContactSharingState();
+ mBluetoothPairingController.onDialogPositiveClick(null);
+
+ verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
index 06d75da..3b1b5af 100644
--- a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
@@ -16,6 +16,8 @@
package com.android.settings.core;
+import static com.android.settings.core.PreferenceXmlParserUtils
+ .METADATA_ALLOW_DYNAMIC_SUMMARY_IN_SLICE;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEYWORDS;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_SEARCHABLE;
@@ -289,6 +291,30 @@
assertThat(foundKey).isTrue();
}
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void extractMetadata_requestIsDynamicSummaryAllowed_shouldDefaultToFalse()
+ throws Exception {
+ final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
+ R.xml.display_settings, MetadataFlag.FLAG_ALLOW_DYNAMIC_SUMMARY_IN_SLICE);
+
+ for (Bundle bundle : metadata) {
+ assertThat(bundle.getBoolean(METADATA_ALLOW_DYNAMIC_SUMMARY_IN_SLICE)).isFalse();
+ }
+ }
+
+ @Test
+ @Config(qualifiers = "mcc998")
+ public void extractMetadata_requestIsDynamicSummaryAllowed_shouldReturnAttributeValue()
+ throws Exception {
+ final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
+ R.xml.location_settings, MetadataFlag.FLAG_ALLOW_DYNAMIC_SUMMARY_IN_SLICE);
+
+ for (Bundle bundle : metadata) {
+ assertThat(bundle.getBoolean(METADATA_ALLOW_DYNAMIC_SUMMARY_IN_SLICE)).isTrue();
+ }
+ }
+
/**
* @param resId the ID for the XML preference
* @return an XML resource parser that points to the start tag
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
index 5fdf458..f9a7379 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
@@ -143,20 +143,4 @@
anyString());
verify(mSuggestionControllerMixin).dismissSuggestion(mSuggestion);
}
-
- @Test
- public void filterExclusiveSuggestions_shouldOnlyKeepFirst3() {
- final List<Tile> suggestions = new ArrayList<>();
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
-
- mProvider.filterExclusiveSuggestions(suggestions);
-
- assertThat(suggestions).hasSize(3);
- }
}
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageV2Test.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageV2Test.java
new file mode 100644
index 0000000..d979b68
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageV2Test.java
@@ -0,0 +1,175 @@
+/*
+ * 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 static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+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.pm.PackageManager;
+import android.net.NetworkPolicyManager;
+import android.os.Bundle;
+import android.util.ArraySet;
+import android.view.View;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.AppItem;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowEntityHeaderController.class, ShadowRestrictedLockUtilsInternal.class})
+public class AppDataUsageV2Test {
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private EntityHeaderController mHeaderController;
+ @Mock
+ private PackageManager mPackageManager;
+
+ private AppDataUsageV2 mFragment;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ FakeFeatureFactory.setupForTest();
+ }
+
+ @After
+ public void tearDown() {
+ ShadowEntityHeaderController.reset();
+ }
+
+ @Test
+ public void bindAppHeader_allWorkApps_shouldNotShowAppInfoLink() {
+ ShadowEntityHeaderController.setUseMock(mHeaderController);
+ when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController);
+ when(mHeaderController.setUid(anyInt())).thenReturn(mHeaderController);
+
+ mFragment = spy(new AppDataUsageV2());
+
+ when(mFragment.getPreferenceManager())
+ .thenReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS));
+ doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
+ ReflectionHelpers.setField(mFragment, "mAppItem", mock(AppItem.class));
+
+ mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
+
+ verify(mHeaderController).setHasAppInfoLink(false);
+ }
+
+ @Test
+ public void bindAppHeader_workApp_shouldSetWorkAppUid() throws
+ PackageManager.NameNotFoundException {
+ final int fakeUserId = 100;
+
+ mFragment = spy(new AppDataUsageV2());
+ final ArraySet<String> packages = new ArraySet<>();
+ packages.add("pkg");
+ final AppItem appItem = new AppItem(123456789);
+
+ ReflectionHelpers.setField(mFragment, "mPackageManager", mPackageManager);
+ ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
+ ReflectionHelpers.setField(mFragment, "mPackages", packages);
+
+ when(mPackageManager.getPackageUidAsUser(anyString(), anyInt()))
+ .thenReturn(fakeUserId);
+
+ ShadowEntityHeaderController.setUseMock(mHeaderController);
+ when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController);
+ when(mHeaderController.setUid(fakeUserId)).thenReturn(mHeaderController);
+ when(mHeaderController.setHasAppInfoLink(anyBoolean())).thenReturn(mHeaderController);
+
+ when(mFragment.getPreferenceManager())
+ .thenReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS));
+ doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
+
+ mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
+
+ verify(mHeaderController).setHasAppInfoLink(true);
+ verify(mHeaderController).setUid(fakeUserId);
+ }
+
+ @Test
+ public void changePreference_backgroundData_shouldUpdateUI() {
+ mFragment = spy(new AppDataUsageV2());
+ final AppItem appItem = new AppItem(123456789);
+ final RestrictedSwitchPreference pref = mock(RestrictedSwitchPreference.class);
+ final DataSaverBackend dataSaverBackend = mock(DataSaverBackend.class);
+ ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
+ ReflectionHelpers.setField(mFragment, "mRestrictBackground", pref);
+ ReflectionHelpers.setField(mFragment, "mDataSaverBackend", dataSaverBackend);
+
+ doNothing().when(mFragment).updatePrefs();
+
+ mFragment.onPreferenceChange(pref, true /* value */);
+
+ verify(mFragment).updatePrefs();
+ }
+
+ @Test
+ public void updatePrefs_restrictedByAdmin_shouldDisablePreference() {
+ mFragment = spy(new AppDataUsageV2());
+ final int testUid = 123123;
+ final AppItem appItem = new AppItem(testUid);
+ final RestrictedSwitchPreference restrictBackgroundPref
+ = mock(RestrictedSwitchPreference.class);
+ final RestrictedSwitchPreference unrestrictedDataPref
+ = mock(RestrictedSwitchPreference.class);
+ final DataSaverBackend dataSaverBackend = mock(DataSaverBackend.class);
+ final NetworkPolicyManager networkPolicyManager = mock(NetworkPolicyManager.class);
+ ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
+ ReflectionHelpers.setField(mFragment, "mRestrictBackground", restrictBackgroundPref);
+ ReflectionHelpers.setField(mFragment, "mUnrestrictedData", unrestrictedDataPref);
+ ReflectionHelpers.setField(mFragment, "mDataSaverBackend", dataSaverBackend);
+ ReflectionHelpers.setField(mFragment.services, "mPolicyManager", networkPolicyManager);
+
+ ShadowRestrictedLockUtilsInternal.setRestricted(true);
+ doReturn(NetworkPolicyManager.POLICY_NONE).when(networkPolicyManager)
+ .getUidPolicy(testUid);
+
+ mFragment.updatePrefs();
+
+ verify(restrictBackgroundPref).setDisabledByAdmin(any(EnforcedAdmin.class));
+ verify(unrestrictedDataPref).setDisabledByAdmin(any(EnforcedAdmin.class));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
index 9861d70..e7e01c9 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
@@ -32,13 +32,13 @@
import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.ItemViewHolder;
import com.android.settings.datetime.timezone.RegionSearchPicker.RegionItem;
import com.android.settings.datetime.timezone.model.TimeZoneData;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import libcore.util.CountryZonesFinder;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
index 058bc76..abcce00 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
@@ -29,13 +29,13 @@
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java
index fad75c3..768a9ea 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java
@@ -28,7 +28,6 @@
import com.android.settings.R;
import com.android.settings.deviceinfo.PrivateVolumeForget.ForgetConfirmFragment;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowStorageManager;
@@ -38,6 +37,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowStorageManager.class, SettingsShadowResourcesImpl.class})
@@ -50,8 +50,12 @@
public void setUp() {
final Bundle bundle = new Bundle();
bundle.putString(VolumeRecord.EXTRA_FS_UUID, "id");
- mFragment = Robolectric.buildFragment(PrivateVolumeForget.class,
- bundle).create().start().resume().get();
+ mFragment = FragmentController.of(new PrivateVolumeForget(), bundle)
+ .create()
+ .start()
+ .resume()
+ .visible()
+ .get();
mActivity = mFragment.getActivity();
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java
index 0d720e3..81c52c5 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java
@@ -25,7 +25,6 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowStorageManager;
@@ -36,6 +35,7 @@
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowActivity;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -49,8 +49,12 @@
public void setUp() {
final Bundle bundle = new Bundle();
bundle.putString(VolumeInfo.EXTRA_VOLUME_ID, "id");
- mFragment = Robolectric.buildFragment(PrivateVolumeFormat.class,
- bundle).create().start().resume().get();
+ mFragment = FragmentController.of(new PrivateVolumeFormat(), bundle)
+ .create()
+ .start()
+ .resume()
+ .visible()
+ .get();
mShadowActivity = Shadows.shadowOf(mFragment.getActivity());
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java
index 94f5286..65f24e3 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java
@@ -23,7 +23,6 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowStorageManager;
@@ -32,6 +31,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -44,8 +44,12 @@
public void setUp() {
Bundle bundle = new Bundle();
bundle.putString(VolumeInfo.EXTRA_VOLUME_ID, "id");
- mFragment = Robolectric.buildFragment(PrivateVolumeUnmount.class,
- bundle).create().start().resume().get();
+ mFragment = FragmentController.of(new PrivateVolumeUnmount(), bundle)
+ .create()
+ .start()
+ .resume()
+ .visible()
+ .get();
}
@After
@@ -57,7 +61,7 @@
public void OnClickListener_shouldCallUnmount() {
assertThat(ShadowStorageManager.isUnmountCalled()).isFalse();
- Button confirm = (Button) mFragment.getView().findViewById(R.id.confirm);
+ final Button confirm = mFragment.getView().findViewById(R.id.confirm);
confirm.performClick();
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/deviceinfo/DeviceNameWarningDialogTest.java b/tests/robotests/src/com/android/settings/deviceinfo/deviceinfo/DeviceNameWarningDialogTest.java
index 9e1400b..0be0ac2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/deviceinfo/DeviceNameWarningDialogTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/deviceinfo/DeviceNameWarningDialogTest.java
@@ -1,7 +1,6 @@
package com.android.settings.deviceinfo.deviceinfo;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -9,12 +8,11 @@
import com.android.settings.deviceinfo.aboutphone.DeviceNameWarningDialog;
import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
-import com.android.settings.testutils.FragmentController;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
public class DeviceNameWarningDialogTest {
@@ -23,7 +21,7 @@
@Test
public void onClick_okSetsName() {
final FragmentController<DeviceNameWarningDialog> fragmentController =
- Robolectric.buildFragment(DeviceNameWarningDialog.class);
+ FragmentController.of(new DeviceNameWarningDialog());
final DeviceNameWarningDialog fragment = spy(fragmentController.get());
final MyDeviceInfoFragment deviceInfoFragment = mock(MyDeviceInfoFragment.class);
fragment.setTargetFragment(deviceInfoFragment, 0);
@@ -36,7 +34,7 @@
@Test
public void onClick_cancelDoesNothing() {
final FragmentController<DeviceNameWarningDialog> fragmentController =
- Robolectric.buildFragment(DeviceNameWarningDialog.class);
+ FragmentController.of(new DeviceNameWarningDialog());
final DeviceNameWarningDialog fragment = spy(fragmentController.get());
final MyDeviceInfoFragment deviceInfoFragment = mock(MyDeviceInfoFragment.class);
fragment.setTargetFragment(deviceInfoFragment, 0);
diff --git a/tests/robotests/src/com/android/settings/homepage/CardContentProviderTest.java b/tests/robotests/src/com/android/settings/homepage/CardContentProviderTest.java
index 84955e2..f89d037 100644
--- a/tests/robotests/src/com/android/settings/homepage/CardContentProviderTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/CardContentProviderTest.java
@@ -235,7 +235,7 @@
"content://com.android.settings.slices/action/auto_rotate");
values.put(CardDatabaseHelper.CardColumns.CATEGORY, 2);
values.put(CardDatabaseHelper.CardColumns.PACKAGE_NAME, "com.android.settings");
- values.put(CardDatabaseHelper.CardColumns.APP_VERSION, "1.0.0");
+ values.put(CardDatabaseHelper.CardColumns.APP_VERSION, 10001);
return values;
}
@@ -252,7 +252,7 @@
"content://com.android.settings.slices/action/toggle_airplane");
values.put(CardDatabaseHelper.CardColumns.CATEGORY, 2);
values.put(CardDatabaseHelper.CardColumns.PACKAGE_NAME, "com.android.settings");
- values.put(CardDatabaseHelper.CardColumns.APP_VERSION, "1.0.0");
+ values.put(CardDatabaseHelper.CardColumns.APP_VERSION, 10001);
twoRows[1] = values;
return twoRows;
diff --git a/tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.java
new file mode 100644
index 0000000..c03070c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/deviceinfo/DataUsageSliceTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2018 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.homepage.deviceinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.widget.SliceLiveData;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SliceTester;
+import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowDataUsageUtils.class)
+public class DataUsageSliceTest {
+ private static final String DATA_USAGE_TITLE = "Data usage";
+ private static final String DATA_USAGE_SUMMARY = "test_summary";
+
+ private Context mContext;
+ private DataUsageSlice mDataUsageSlice;
+
+ @Before
+ public void setUp() {
+ mContext = spy(RuntimeEnvironment.application);
+
+ // Prevent crash in SliceMetadata.
+ Resources resources = spy(mContext.getResources());
+ doReturn(60).when(resources).getDimensionPixelSize(anyInt());
+ doReturn(resources).when(mContext).getResources();
+
+ // Set-up specs for SliceMetadata.
+ SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+
+ mDataUsageSlice = spy(new DataUsageSlice(mContext));
+ }
+
+ @Test
+ public void getSlice_hasSim_shouldBeCorrectSliceContent() {
+ ShadowDataUsageUtils.HAS_SIM = true;
+ doReturn(DATA_USAGE_TITLE).when(mDataUsageSlice).getDataUsageText(any());
+ doReturn(DATA_USAGE_SUMMARY).when(mDataUsageSlice).getCycleTime(any());
+ final Slice slice = mDataUsageSlice.getSlice();
+ final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+ final SliceAction primaryAction = metadata.getPrimaryAction();
+ final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
+ R.drawable.ic_settings_data_usage);
+ assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedIcon.toString());
+
+ final List<SliceItem> sliceItems = slice.getItems();
+ SliceTester.assertTitle(sliceItems, mContext.getString(R.string.data_usage_summary_title));
+ }
+
+ @Test
+ public void getSlice_hasNoSim_shouldShowNoSimCard() {
+ ShadowDataUsageUtils.HAS_SIM = false;
+ final Slice slice = mDataUsageSlice.getSlice();
+ final List<SliceItem> sliceItems = slice.getItems();
+
+ SliceTester.assertTitle(sliceItems, mContext.getString(R.string.data_usage_summary_title));
+ SliceTester.assertTitle(sliceItems, mContext.getString(R.string.no_sim_card));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
index 3d3dd28..10e5681 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
@@ -42,10 +42,10 @@
import com.android.settings.R;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.location.RecentLocationApps;
import com.android.settingslib.location.RecentLocationApps.Request;
+import com.android.settingslib.widget.apppreference.AppPreference;
import org.junit.Before;
import org.junit.Test;
@@ -173,7 +173,7 @@
@Test
public void onPreferenceClick_shouldLaunchAppDetails() {
- final Context context= mock(Context.class);
+ final Context context = mock(Context.class);
when(mFragment.getContext()).thenReturn(context);
final List<RecentLocationApps.Request> requests = new ArrayList<>();
@@ -210,7 +210,7 @@
AppPreference appPreference = mock(AppPreference.class, "AppPreference" + i);
doReturn(title).when(appPreference).getTitle();
doReturn(appPreference)
- .when(mController).createAppPreference(any(Context.class), eq(req));
+ .when(mController).createAppPreference(any(Context.class), eq(req));
}
return requests;
}
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java
index a012c51..be56f96 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java
@@ -32,10 +32,10 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.location.RecentLocationApps;
import com.android.settingslib.location.RecentLocationApps.Request;
+import com.android.settingslib.widget.apppreference.AppPreference;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
index 69d8638..cc480c3 100644
--- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
+++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
@@ -44,7 +44,6 @@
import com.android.settings.R;
import com.android.settings.network.ApnEditor.ApnData;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -55,6 +54,7 @@
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
@RunWith(SettingsRobolectricTestRunner.class)
public class ApnEditorTest {
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
index af77ad8..67f7b0a 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
@@ -84,7 +84,7 @@
when(mFingerprintManager.preEnroll()).thenReturn(FINGERPRINT_CHALLENGE);
when(mPackageManager.hasSystemFeature(eq(FEATURE_FINGERPRINT))).thenReturn(true);
- when(mFaceManager.preEnroll()).thenReturn(FACE_CHALLENGE);
+ when(mFaceManager.generateChallenge()).thenReturn(FACE_CHALLENGE);
when(mPackageManager.hasSystemFeature(eq(FEATURE_FACE))).thenReturn(true);
}
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
index 3802a83..e586958 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -31,7 +31,6 @@
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
import com.android.settings.password.ChooseLockPassword.IntentBuilder;
import com.android.settings.password.SetupChooseLockPassword.SetupChooseLockPasswordFragment;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
@@ -42,6 +41,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Shadows;
+import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@@ -74,11 +74,12 @@
@Test
public void createActivity_shouldNotCrash() {
// Basic sanity test for activity created without crashing
- Robolectric.buildActivity(SetupChooseLockPassword.class,
+ final Intent intent =
SetupChooseLockPassword.modifyIntentForSetup(
application,
- new IntentBuilder(application).build()))
- .setup().get();
+ new IntentBuilder(application).build());
+
+ ActivityController.of(new SetupChooseLockPassword(), intent).setup().get();
}
@Test
@@ -119,7 +120,7 @@
intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
SetupChooseLockPassword activity =
- Robolectric.buildActivity(SetupChooseLockPassword.class, intent).setup().get();
+ ActivityController.of(new SetupChooseLockPassword(), intent).setup().get();
SetupChooseLockPasswordFragment fragment =
(SetupChooseLockPasswordFragment) activity.getSupportFragmentManager()
@@ -136,11 +137,12 @@
}
private SetupChooseLockPassword createSetupChooseLockPassword() {
- Intent intent = SetupChooseLockPassword.modifyIntentForSetup(
- application,
- new IntentBuilder(application).build());
+ final Intent intent =
+ SetupChooseLockPassword.modifyIntentForSetup(
+ application,
+ new IntentBuilder(application).build());
intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
- return Robolectric.buildActivity(SetupChooseLockPassword.class, intent).setup().get();
+ return ActivityController.of(new SetupChooseLockPassword(), intent).setup().get();
}
@Implements(ChooseLockGenericController.class)
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
index 39e69d5..0dcd31b 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
@@ -21,6 +21,7 @@
import static org.robolectric.RuntimeEnvironment.application;
import android.content.ComponentName;
+import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.UserHandle;
import android.view.View;
@@ -36,7 +37,6 @@
import com.android.settings.SetupRedactionInterstitial;
import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;
import com.android.settings.password.ChooseLockPattern.IntentBuilder;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
@@ -47,6 +47,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Shadows;
+import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.util.ReflectionHelpers;
@@ -72,14 +73,13 @@
PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
- mActivity = Robolectric.buildActivity(
- SetupChooseLockPattern.class,
+ final Intent intent =
SetupChooseLockPattern.modifyIntentForSetup(
application,
new IntentBuilder(application)
.setUserId(UserHandle.myUserId())
- .build()))
- .setup().get();
+ .build());
+ mActivity = ActivityController.of(new SetupChooseLockPattern(), intent).setup().get();
}
@Test
@@ -173,16 +173,17 @@
@Test
public void skipButton_shouldNotBeVisible_duringFingerprintFlow() {
- mActivity = Robolectric.buildActivity(
- SetupChooseLockPattern.class,
+ final Intent intent =
SetupChooseLockPattern.modifyIntentForSetup(
application,
new IntentBuilder(application)
.setUserId(UserHandle.myUserId())
.setForFingerprint(true)
- .build()))
- .setup().get();
+ .build());
+
+ mActivity = ActivityController.of(new SetupChooseLockPattern(), intent).setup().get();
Button skipButton = mActivity.findViewById(R.id.skip_button);
+
assertThat(skipButton).isNotNull();
assertThat(skipButton.getVisibility()).isEqualTo(View.GONE);
}
diff --git a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
index 5e46c8c..0e4e5dc 100644
--- a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
@@ -22,7 +22,6 @@
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
@@ -32,6 +31,7 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
diff --git a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
index b7ff79c..fe7c559 100644
--- a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
+++ b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
@@ -22,12 +22,11 @@
import android.content.DialogInterface;
-import com.android.settings.testutils.FragmentController;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -36,7 +35,7 @@
@Test
public void displayDialog_clickPositiveButton_launchSetNewPassword() {
final FragmentController<ConfigureKeyGuardDialog> fragmentController =
- Robolectric.buildFragment(ConfigureKeyGuardDialog.class);
+ FragmentController.of(new ConfigureKeyGuardDialog());
final ConfigureKeyGuardDialog fragment = spy(fragmentController.get());
doNothing().when(fragment).startPasswordSetup();
fragmentController.create().start().resume();
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
index 705c0eb..16e9cb7 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
@@ -70,6 +70,7 @@
private final Class TOGGLE_CONTROLLER = FakeToggleController.class;
private final Class SLIDER_CONTROLLER = FakeSliderController.class;
private final Class CONTEXT_CONTROLLER = FakeContextOnlyPreferenceController.class;
+ private final boolean IS_DYNAMIC_SUMMARY_ALLOWED = false;
private final String INTENT_PATH = SettingsSlicesContract.PATH_SETTING_INTENT + "/" + KEY;
private final String ACTION_PATH = SettingsSlicesContract.PATH_SETTING_ACTION + "/" + KEY;
@@ -206,6 +207,19 @@
}
@Test
+ public void getDynamicSummary_allowDynamicSummary_returnsControllerSummary() {
+ final SliceData data = getDummyData(true /*isDynamicSummaryAllowed*/);
+ final FakePreferenceController controller = spy(
+ new FakePreferenceController(mContext, KEY));
+ final String controllerSummary = "new_Summary";
+ doReturn(controllerSummary).when(controller).getSummary();
+
+ final CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
+
+ assertThat(summary).isEqualTo(controllerSummary);
+ }
+
+ @Test
public void getDynamicSummary_returnsScreenTitle() {
final SliceData data = getDummyData();
final FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
@@ -470,25 +484,31 @@
private SliceData getDummyData() {
return getDummyData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE,
- ICON);
+ ICON, IS_DYNAMIC_SUMMARY_ALLOWED);
+ }
+
+ private SliceData getDummyData(boolean isDynamicSummaryAllowed) {
+ return getDummyData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE,
+ ICON, isDynamicSummaryAllowed);
}
private SliceData getDummyData(Class prefController, int sliceType, int icon) {
return getDummyData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE,
- icon);
+ icon, IS_DYNAMIC_SUMMARY_ALLOWED);
}
private SliceData getDummyData(String summary, String screenTitle) {
return getDummyData(TOGGLE_CONTROLLER, summary, SliceData.SliceType.SWITCH, screenTitle,
- ICON);
+ ICON, IS_DYNAMIC_SUMMARY_ALLOWED);
}
private SliceData getDummyData(Class prefController, int sliceType) {
- return getDummyData(prefController, SUMMARY, sliceType, SCREEN_TITLE, ICON);
+ return getDummyData(prefController, SUMMARY, sliceType, SCREEN_TITLE, ICON,
+ IS_DYNAMIC_SUMMARY_ALLOWED);
}
private SliceData getDummyData(Class prefController, String summary, int sliceType,
- String screenTitle, int icon) {
+ String screenTitle, int icon, boolean isDynamicSummaryAllowed) {
return new SliceData.Builder()
.setKey(KEY)
.setTitle(TITLE)
@@ -500,6 +520,7 @@
.setUri(URI)
.setPreferenceControllerClassName(prefController.getName())
.setSliceType(sliceType)
+ .setDynamicSummaryAllowed(isDynamicSummaryAllowed)
.build();
}
}
diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
index a7df5a7..83c35ba 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
@@ -124,6 +124,7 @@
assertThat(fakeSlice.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
assertThat(fakeSlice.getSliceType()).isEqualTo(SliceData.SliceType.SLIDER);
assertThat(fakeSlice.isPlatformDefined()).isTrue(); // from XML
+ assertThat(fakeSlice.isDynamicSummaryAllowed()).isTrue(); // from XML
}
private void assertFakeA11ySlice(SliceData fakeSlice) {
diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
index 0d91968..9adee07 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
@@ -39,6 +39,7 @@
private final String PREF_CONTROLLER = "com.android.settings.slices.tester";
private final int SLICE_TYPE = SliceData.SliceType.SWITCH;
private final boolean IS_PLATFORM_DEFINED = true;
+ private final boolean IS_DYNAMIC_SUMMARY_ALLOWED = true;
@Test
public void testBuilder_buildsMatchingObject() {
@@ -53,7 +54,8 @@
.setUri(URI)
.setPreferenceControllerClassName(PREF_CONTROLLER)
.setSliceType(SLICE_TYPE)
- .setPlatformDefined(IS_PLATFORM_DEFINED);
+ .setPlatformDefined(IS_PLATFORM_DEFINED)
+ .setDynamicSummaryAllowed(IS_DYNAMIC_SUMMARY_ALLOWED);
SliceData data = builder.build();
@@ -68,6 +70,7 @@
assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
assertThat(data.getSliceType()).isEqualTo(SLICE_TYPE);
assertThat(data.isPlatformDefined()).isEqualTo(IS_PLATFORM_DEFINED);
+ assertThat(data.isDynamicSummaryAllowed()).isEqualTo(IS_DYNAMIC_SUMMARY_ALLOWED);
}
@Test(expected = SliceData.InvalidSliceDataException.class)
@@ -216,7 +219,7 @@
}
@Test
- public void testEquality_identicalObjects() {
+ public void testBuilder_noDynamicSummaryAllowed_buildsMatchingObject() {
SliceData.Builder builder = new SliceData.Builder()
.setKey(KEY)
.setTitle(TITLE)
@@ -227,6 +230,32 @@
.setUri(URI)
.setPreferenceControllerClassName(PREF_CONTROLLER);
+ SliceData data = builder.build();
+
+ assertThat(data.getKey()).isEqualTo(KEY);
+ assertThat(data.getTitle()).isEqualTo(TITLE);
+ assertThat(data.getSummary()).isEqualTo(SUMMARY);
+ assertThat(data.getScreenTitle()).isEqualTo(SCREEN_TITLE);
+ assertThat(data.getIconResource()).isEqualTo(ICON);
+ assertThat(data.getFragmentClassName()).isEqualTo(FRAGMENT_NAME);
+ assertThat(data.getUri()).isEqualTo(URI);
+ assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
+ assertThat(data.isDynamicSummaryAllowed()).isFalse();
+ }
+
+ @Test
+ public void testEquality_identicalObjects() {
+ SliceData.Builder builder = new SliceData.Builder()
+ .setKey(KEY)
+ .setTitle(TITLE)
+ .setSummary(SUMMARY)
+ .setScreenTitle(SCREEN_TITLE)
+ .setIcon(ICON)
+ .setFragmentName(FRAGMENT_NAME)
+ .setUri(URI)
+ .setPreferenceControllerClassName(PREF_CONTROLLER)
+ .setDynamicSummaryAllowed(IS_DYNAMIC_SUMMARY_ALLOWED);
+
SliceData dataOne = builder.build();
SliceData dataTwo = builder.build();
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
index bea5e89..949d151 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
@@ -97,6 +97,45 @@
assertThat(data.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_NAME);
assertThat(data.getUri()).isNull();
assertThat(data.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
+ assertThat(data.isDynamicSummaryAllowed()).isFalse(); /* default value */
+ }
+
+ @Test
+ public void testGetSliceDataFromKey_allowDynamicSummary_validSliceReturned() {
+ String key = "key";
+ insertSpecialCase(key, true /* isPlatformSlice */, true /* isDynamicSummaryAllowed */);
+
+ SliceData data = mAccessor.getSliceDataFromKey(key);
+
+ assertThat(data.getKey()).isEqualTo(key);
+ assertThat(data.getTitle()).isEqualTo(FAKE_TITLE);
+ assertThat(data.getSummary()).isEqualTo(FAKE_SUMMARY);
+ assertThat(data.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE);
+ assertThat(data.getKeywords()).isEqualTo(FAKE_KEYWORDS);
+ assertThat(data.getIconResource()).isEqualTo(FAKE_ICON);
+ assertThat(data.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_NAME);
+ assertThat(data.getUri()).isNull();
+ assertThat(data.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
+ assertThat(data.isDynamicSummaryAllowed()).isTrue();
+ }
+
+ @Test
+ public void testGetSliceDataFromKey_doNotAllowDynamicSummary_validSliceReturned() {
+ String key = "key";
+ insertSpecialCase(key, true /* isPlatformSlice */, false /* isDynamicSummaryAllowed */);
+
+ SliceData data = mAccessor.getSliceDataFromKey(key);
+
+ assertThat(data.getKey()).isEqualTo(key);
+ assertThat(data.getTitle()).isEqualTo(FAKE_TITLE);
+ assertThat(data.getSummary()).isEqualTo(FAKE_SUMMARY);
+ assertThat(data.getScreenTitle()).isEqualTo(FAKE_SCREEN_TITLE);
+ assertThat(data.getKeywords()).isEqualTo(FAKE_KEYWORDS);
+ assertThat(data.getIconResource()).isEqualTo(FAKE_ICON);
+ assertThat(data.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_NAME);
+ assertThat(data.getUri()).isNull();
+ assertThat(data.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
+ assertThat(data.isDynamicSummaryAllowed()).isFalse();
}
@Test(expected = IllegalStateException.class)
@@ -198,6 +237,11 @@
}
private void insertSpecialCase(String key, boolean isPlatformSlice) {
+ insertSpecialCase(key, isPlatformSlice, false /* isDynamicSummaryAllowed */);
+ }
+
+ private void insertSpecialCase(String key, boolean isPlatformSlice,
+ boolean isDynamicSummaryAllowed) {
ContentValues values = new ContentValues();
values.put(SlicesDatabaseHelper.IndexColumns.KEY, key);
values.put(SlicesDatabaseHelper.IndexColumns.TITLE, FAKE_TITLE);
@@ -208,6 +252,8 @@
values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, FAKE_FRAGMENT_NAME);
values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, FAKE_CONTROLLER_NAME);
values.put(SlicesDatabaseHelper.IndexColumns.PLATFORM_SLICE, isPlatformSlice);
+ values.put(SlicesDatabaseHelper.IndexColumns.ALLOW_DYNAMIC_SUMMARY_IN_SLICE,
+ isDynamicSummaryAllowed);
values.put(SlicesDatabaseHelper.IndexColumns.SLICE_TYPE, SliceData.SliceType.INTENT);
mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
index 602a7fd..a00d343 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
@@ -73,6 +73,7 @@
IndexColumns.CONTROLLER,
IndexColumns.PLATFORM_SLICE,
IndexColumns.SLICE_TYPE,
+ IndexColumns.ALLOW_DYNAMIC_SUMMARY_IN_SLICE,
};
assertThat(columnNames).isEqualTo(expectedNames);
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
index b823105..c92ee91 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
@@ -53,6 +53,7 @@
private final Uri URI = Uri.parse("content://com.android.settings.slices/test");
private final String PREF_CONTROLLER = "com.android.settings.slices.tester";
private final boolean PLATFORM_DEFINED = true;
+ private final boolean IS_DYNAMIC_SUMMARY_ALLOWED = true;
private final int SLICE_TYPE = SliceData.SliceType.SLIDER;
private Context mContext;
@@ -131,6 +132,9 @@
1 /* true */);
assertThat(cursor.getInt(cursor.getColumnIndex(IndexColumns.SLICE_TYPE))).isEqualTo(
SLICE_TYPE);
+ assertThat(cursor.getInt(
+ cursor.getColumnIndex(IndexColumns.ALLOW_DYNAMIC_SUMMARY_IN_SLICE))).isEqualTo(
+ 1 /* true */);
cursor.moveToNext();
}
}
@@ -154,7 +158,8 @@
.setUri(URI)
.setPreferenceControllerClassName(PREF_CONTROLLER)
.setPlatformDefined(PLATFORM_DEFINED)
- .setSliceType(SLICE_TYPE);
+ .setSliceType(SLICE_TYPE)
+ .setDynamicSummaryAllowed(IS_DYNAMIC_SUMMARY_ALLOWED);
for (int i = 0; i < KEYS.length; i++) {
builder.setKey(KEYS[i]).setTitle(TITLES[i]);
diff --git a/tests/robotests/src/com/android/settings/testutils/FragmentController.java b/tests/robotests/src/com/android/settings/testutils/FragmentController.java
deleted file mode 100644
index 63c68b1..0000000
--- a/tests/robotests/src/com/android/settings/testutils/FragmentController.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.widget.LinearLayout;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
-import org.robolectric.android.controller.ActivityController;
-import org.robolectric.android.controller.ComponentController;
-import org.robolectric.util.ReflectionHelpers;
-
-/**
- * Controller class for driving fragment lifecycles, similar to {@link ActivityController}.
- */
-// TODO(b/111195167) - Duplicated from org.robolectric.android.controller.FragmentController.
-@Deprecated
-public class FragmentController<F extends Fragment> extends
- ComponentController<FragmentController<F>, F> {
- private final F fragment;
- private final ActivityController<? extends FragmentActivity> activityController;
-
- public static <F extends Fragment> FragmentController<F> of(F fragment) {
- return of(fragment, FragmentControllerActivity.class, null, null);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment,
- Class<? extends FragmentActivity> activityClass) {
- return of(fragment, activityClass, null, null);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment, Intent intent) {
- return new FragmentController<>(fragment, FragmentControllerActivity.class, intent);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment, Bundle arguments) {
- return new FragmentController<>(fragment, FragmentControllerActivity.class, arguments);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment, Intent intent,
- Bundle arguments) {
- return new FragmentController<>(fragment, FragmentControllerActivity.class, intent,
- arguments);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment,
- Class<? extends FragmentActivity> activityClass, Intent intent) {
- return new FragmentController<>(fragment, activityClass, intent);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment,
- Class<? extends FragmentActivity> activityClass, Bundle arguments) {
- return new FragmentController<>(fragment, activityClass, arguments);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment,
- Class<? extends FragmentActivity> activityClass,
- Intent intent, Bundle arguments) {
- return new FragmentController<>(fragment, activityClass, intent, arguments);
- }
-
- private FragmentController(F fragment, Class<? extends FragmentActivity> activityClass,
- Intent intent) {
- this(fragment, activityClass, intent, null);
- }
-
- private FragmentController(F fragment, Class<? extends FragmentActivity> activityClass,
- Bundle arguments) {
- this(fragment, activityClass, null, arguments);
- }
-
- private FragmentController(F fragment, Class<? extends FragmentActivity> activityClass,
- Intent intent, Bundle arguments) {
- super(fragment, intent);
- this.fragment = fragment;
- if (arguments != null) {
- this.fragment.setArguments(arguments);
- }
- this.activityController = ActivityController.of(
- ReflectionHelpers.callConstructor(activityClass), intent);
- }
-
- /**
- * Creates the activity with {@link Bundle} and adds the fragment to the view with ID {@code
- * contentViewId}.
- */
- public FragmentController<F> create(final int contentViewId, final Bundle bundle) {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.create(
- bundle).get().getSupportFragmentManager().beginTransaction().add(
- contentViewId, fragment).commit();
- }
- });
- return this;
- }
-
- /**
- * Creates the activity with {@link Bundle} and adds the fragment to it. Note that the fragment
- * will be added to the view with ID 1.
- */
- public FragmentController<F> create(Bundle bundle) {
- return create(1, bundle);
- }
-
- @Override
- public FragmentController<F> create() {
- return create(null);
- }
-
- @Override
- public FragmentController<F> destroy() {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.destroy();
- }
- });
- return this;
- }
-
- public FragmentController<F> start() {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.start();
- }
- });
- return this;
- }
-
- public FragmentController<F> resume() {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.resume();
- }
- });
- return this;
- }
-
- public FragmentController<F> pause() {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.pause();
- }
- });
- return this;
- }
-
- public FragmentController<F> visible() {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.visible();
- }
- });
- return this;
- }
-
- public FragmentController<F> stop() {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.stop();
- }
- });
- return this;
- }
-
- public FragmentController<F> saveInstanceState(final Bundle outState) {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.saveInstanceState(outState);
- }
- });
- return this;
- }
-
- private static class FragmentControllerActivity extends FragmentActivity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- LinearLayout view = new LinearLayout(this);
- view.setId(1);
-
- setContentView(view);
- }
- }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/Robolectric.java b/tests/robotests/src/com/android/settings/testutils/Robolectric.java
deleted file mode 100644
index 549aad8..0000000
--- a/tests/robotests/src/com/android/settings/testutils/Robolectric.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils;
-
-
-import android.app.IntentService;
-import android.app.Service;
-import android.app.backup.BackupAgent;
-import android.content.ContentProvider;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.AttributeSet;
-import android.view.View;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.android.XmlResourceParserImpl;
-import org.robolectric.android.controller.ActivityController;
-import org.robolectric.android.controller.BackupAgentController;
-import org.robolectric.android.controller.ContentProviderController;
-import org.robolectric.android.controller.IntentServiceController;
-import org.robolectric.android.controller.ServiceController;
-import org.robolectric.res.ResName;
-import org.robolectric.res.ResourceTable;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-import org.robolectric.util.Scheduler;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-// TODO(b/111195450) - Duplicated from org.robolectric.Robolectric.
-@Deprecated
-public class Robolectric {
-
- /**
- * This method is internal and shouldn't be called by developers.
- */
- @Deprecated
- public static void reset() {
- // No-op- is now handled in the test runner. Users should not be calling this method anyway.
- }
-
- public static <T extends Service> ServiceController<T> buildService(Class<T> serviceClass) {
- return buildService(serviceClass, null);
- }
-
- public static <T extends Service> ServiceController<T> buildService(Class<T> serviceClass,
- Intent intent) {
- return ServiceController.of(ReflectionHelpers.callConstructor(serviceClass), intent);
- }
-
- public static <T extends Service> T setupService(Class<T> serviceClass) {
- return buildService(serviceClass).create().get();
- }
-
- public static <T extends IntentService> IntentServiceController<T> buildIntentService(
- Class<T> serviceClass) {
- return buildIntentService(serviceClass, null);
- }
-
- public static <T extends IntentService> IntentServiceController<T> buildIntentService(
- Class<T> serviceClass, Intent intent) {
- return IntentServiceController.of(ReflectionHelpers.callConstructor(serviceClass,
- new ReflectionHelpers.ClassParameter<String>(String.class, "IntentService")),
- intent);
- }
-
- public static <T extends IntentService> T setupIntentService(Class<T> serviceClass) {
- return buildIntentService(serviceClass).create().get();
- }
-
- public static <T extends ContentProvider> ContentProviderController<T> buildContentProvider(
- Class<T> contentProviderClass) {
- return ContentProviderController.of(
- ReflectionHelpers.callConstructor(contentProviderClass));
- }
-
- public static <T extends ContentProvider> T setupContentProvider(
- Class<T> contentProviderClass) {
- return buildContentProvider(contentProviderClass).create().get();
- }
-
- public static <T extends ContentProvider> T setupContentProvider(Class<T> contentProviderClass,
- String authority) {
- return buildContentProvider(contentProviderClass).create(authority).get();
- }
-
- public static <T extends FragmentActivity> ActivityController<T> buildActivity(
- Class<T> activityClass) {
- return buildActivity(activityClass, null);
- }
-
- public static <T extends FragmentActivity> ActivityController<T> buildActivity(
- Class<T> activityClass, Intent intent) {
- return ActivityController.of(ReflectionHelpers.callConstructor(activityClass), intent);
- }
-
- public static <T extends FragmentActivity> T setupActivity(Class<T> activityClass) {
- return buildActivity(activityClass).setup().get();
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass));
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Bundle arguments) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass), arguments);
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Class<? extends FragmentActivity> activityClass) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass),
- activityClass);
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Intent intent) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass), intent);
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Intent intent,
- Bundle arguments) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass), intent,
- arguments);
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Class<? extends FragmentActivity> activityClass,
- Intent intent) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass),
- activityClass, intent);
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Class<? extends FragmentActivity> activityClass,
- Bundle arguments) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass),
- activityClass, arguments);
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Class<? extends FragmentActivity> activityClass,
- Intent intent,
- Bundle arguments) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass),
- activityClass, intent, arguments);
- }
-
- public static <T extends BackupAgent> BackupAgentController<T> buildBackupAgent(
- Class<T> backupAgentClass) {
- return BackupAgentController.of(ReflectionHelpers.callConstructor(backupAgentClass));
- }
-
- public static <T extends BackupAgent> T setupBackupAgent(Class<T> backupAgentClass) {
- return buildBackupAgent(backupAgentClass).create().get();
- }
-
- /**
- * Allows for the programatic creation of an {@link AttributeSet} useful for testing
- * {@link View} classes without
- * the need for creating XML snippets.
- */
- public static AttributeSetBuilder buildAttributeSet() {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- factory.setIgnoringComments(true);
- factory.setIgnoringElementContentWhitespace(true);
- Document document;
- try {
- DocumentBuilder documentBuilder = factory.newDocumentBuilder();
- document = documentBuilder.newDocument();
- Element dummy = document.createElementNS("http://schemas.android.com/apk/res/" +
- RuntimeEnvironment.application.getPackageName(), "dummy");
- document.appendChild(dummy);
- } catch (ParserConfigurationException e) {
- throw new RuntimeException(e);
- }
- return new AttributeSetBuilder(document, RuntimeEnvironment.getCompileTimeResourceTable());
- }
-
- public static class AttributeSetBuilder {
-
- private Document doc;
- private ResourceTable appResourceTable;
-
- AttributeSetBuilder(Document doc, ResourceTable resourceTable) {
- this.doc = doc;
- this.appResourceTable = resourceTable;
- }
-
- public AttributeSetBuilder addAttribute(int resId, String value) {
- ResName resName = appResourceTable.getResName(resId);
- if ("style".equals(resName.name)) {
- ((Element) doc.getFirstChild()).setAttribute(resName.name, value);
- } else {
- ((Element) doc.getFirstChild()).setAttributeNS(resName.getNamespaceUri(),
- resName.packageName + ":" + resName.name, value);
- }
- return this;
- }
-
- public AttributeSetBuilder setStyleAttribute(String value) {
- ((Element) doc.getFirstChild()).setAttribute("style", value);
- return this;
- }
-
- public AttributeSet build() {
- XmlResourceParserImpl parser = new XmlResourceParserImpl(doc, null,
- RuntimeEnvironment.application.getPackageName(),
- RuntimeEnvironment.application.getPackageName(), appResourceTable);
- try {
- parser.next(); // Root document element
- parser.next(); // "dummy" element
- } catch (Exception e) {
- throw new IllegalStateException(
- "Expected single dummy element in the document to contain the attributes.",
- e);
- }
-
- return parser;
- }
- }
-
- /**
- * Return the foreground scheduler (e.g. the UI thread scheduler).
- *
- * @return Foreground scheduler.
- */
- public static Scheduler getForegroundThreadScheduler() {
- return ShadowApplication.getInstance().getForegroundThreadScheduler();
- }
-
- /**
- * Execute all runnables that have been enqueued on the foreground scheduler.
- */
- public static void flushForegroundThreadScheduler() {
- getForegroundThreadScheduler().advanceToLastPostedRunnable();
- }
-
- /**
- * Return the background scheduler.
- *
- * @return Background scheduler.
- */
- public static Scheduler getBackgroundThreadScheduler() {
- return ShadowApplication.getInstance().getBackgroundThreadScheduler();
- }
-
- /**
- * Execute all runnables that have been enqueued on the background scheduler.
- */
- public static void flushBackgroundThreadScheduler() {
- getBackgroundThreadScheduler().advanceToLastPostedRunnable();
- }
-}
-
diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
index 2e3a140..008d7f7 100644
--- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
@@ -76,6 +76,8 @@
paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/res")), null));
paths.add(new ResourcePath(null,
+ Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/AppPreference/res/")), null));
+ paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/HelpUtils/res/")), null));
paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/RestrictedLockUtils/res/")), null));
diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
index af21dba..49a84f2 100644
--- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java
+++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
@@ -25,6 +25,7 @@
import android.app.PendingIntent;
import android.content.Context;
+import android.text.TextUtils;
import androidx.core.graphics.drawable.IconCompat;
import androidx.slice.Slice;
@@ -209,9 +210,11 @@
continue;
}
- hasTitle = true;
for (SliceItem subTitleItem : titleItems) {
- assertThat(subTitleItem.getText()).isEqualTo(title);
+ if (TextUtils.equals(subTitleItem.getText(), title)) {
+ hasTitle = true;
+ assertThat(subTitleItem.getText()).isEqualTo(title);
+ }
}
}
assertThat(hasTitle).isTrue();
diff --git a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
index caff2fa..97b3e69 100644
--- a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
@@ -39,7 +39,6 @@
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -50,6 +49,7 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -94,7 +94,7 @@
MockitoAnnotations.initMocks(this);
mUserManager = ShadowUserManager.getShadow();
mUserManager.setUserInfo(0, mUserInfo);
- mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());
+ mActivity = spy(ActivityController.of(new FragmentActivity()).get());
when(mFragment.getActivity()).thenReturn(mActivity);
when(mActivity.getLayoutInflater()).thenReturn(mInflater);
when(mInflater.inflate(eq(R.layout.edit_user_info_dialog_content), any())).thenReturn(
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index 49a4406..62135fe 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -29,7 +29,6 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.SharedPreferences;
@@ -52,7 +51,6 @@
import com.android.settings.R;
import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -66,6 +64,7 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@@ -103,7 +102,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());
+ mActivity = spy(ActivityController.of(new FragmentActivity()).get());
mContext = spy(RuntimeEnvironment.application);
mFragment = spy(new UserSettings());
ReflectionHelpers.setField(mFragment, "mAddUserWhenLockedPreferenceController",
diff --git a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
deleted file mode 100644
index c75d8fd..0000000
--- a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
+++ /dev/null
@@ -1,82 +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.widget;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.view.View;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class AppPreferenceTest {
-
- private Context mContext;
- private View mRootView;
- private AppPreference mPref;
- private PreferenceViewHolder mHolder;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
- mRootView = View.inflate(mContext, R.layout.preference_app, null /* parent */);
- mHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
- mPref = new AppPreference(mContext);
- }
-
- @Test
- public void setProgress_showProgress() {
- mPref.setProgress(1);
- mPref.onBindViewHolder(mHolder);
-
- assertThat(mHolder.findViewById(android.R.id.progress).getVisibility())
- .isEqualTo(View.VISIBLE);
- }
-
- @Test
- public void setSummary_showSummaryContainer() {
- mPref.setSummary("test");
- mPref.onBindViewHolder(mHolder);
-
- assertThat(mHolder.findViewById(R.id.summary_container).getVisibility())
- .isEqualTo(View.VISIBLE);
- }
-
- @Test
- public void noSummary_hideSummaryContainer() {
- mPref.setSummary(null);
- mPref.onBindViewHolder(mHolder);
-
- assertThat(mHolder.findViewById(R.id.summary_container).getVisibility())
- .isEqualTo(View.GONE);
- }
-
- @Test
- public void foobar_testName() {
- float iconSize = mContext.getResources().getDimension(R.dimen.secondary_app_icon_size);
- assertThat(Float.floatToIntBits(iconSize)).isEqualTo(Float.floatToIntBits(32));
- }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index ff93b7e..cc9bee0 100644
--- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -125,7 +125,7 @@
mController.setLabel(testString);
mController.setSummary(testString);
mController.setSecondSummary(testString);
- mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
+ mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add_24dp));
mController.done(mActivity);
assertThat(label).isNotNull();
@@ -238,7 +238,7 @@
when(mFragment.getActivity()).thenReturn(mock(FragmentActivity.class));
mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
String description = "Fake Description";
- mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
+ mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add_24dp));
mController.setIconContentDescription(description);
mController.done(mActivity);
assertThat(view.findViewById(R.id.entity_header_icon).getContentDescription().toString())
diff --git a/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java
index 097b582..2b4b4be 100644
--- a/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java
@@ -26,13 +26,13 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settingslib.testutils.FragmentTestUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowConnectivityManager.class)
@@ -44,7 +44,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mAddNetworkFragment = spy(new AddNetworkFragment());
- FragmentTestUtils.startFragment(mAddNetworkFragment);
+ FragmentController.setupFragment(mAddNetworkFragment);
}
@Test
