Merge "Add the USB device parameter to usb stylus feature preference provider." into udc-qpr-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ad153cd..80b481f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1577,6 +1577,19 @@
android:value="@string/menu_key_apps"/>
</activity-alias>
+ <activity android:name="Settings$UserAspectRatioAppListActivity"
+ android:exported="true"
+ android:label="@string/aspect_ratio_title">
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS"/>
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.applications.manageapplications.ManageApplications" />
+ <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+ android:value="@string/menu_key_apps"/>
+ </activity>
+
<activity
android:name="Settings$ManageDomainUrlsActivity"
android:exported="true"
diff --git a/res/drawable-night/ic_app_aspect_ratio_16_9.xml b/res/drawable-night/ic_app_aspect_ratio_16_9.xml
new file mode 100644
index 0000000..069003e
--- /dev/null
+++ b/res/drawable-night/ic_app_aspect_ratio_16_9.xml
@@ -0,0 +1,66 @@
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="412dp"
+ android:height="300dp"
+ android:viewportWidth="412"
+ android:viewportHeight="300">
+ <group>
+ <clip-path
+ android:pathData="M0,0h412v300h-412z"/>
+ <path
+ android:pathData="M384.18,300H27.82C12.53,300 0,287.17 0,271.52V28.48C0,12.83 12.53,0 27.82,0H384.29C399.47,0 412,12.83 412,28.48V271.63C412,287.17 399.47,300 384.18,300Z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M321.83,134.76V134C322.96,133.96 323.87,132.78 323.87,131.32V116.86C323.87,115.4 322.96,114.22 321.83,114.18V58.55C321.83,52.85 317.2,48.22 311.49,48.22H213.79C211.62,48.22 209.49,48.77 207.6,49.82C206.71,50.18 205.73,50.18 204.85,49.83L204.81,49.82C202.92,48.77 200.79,48.22 198.62,48.22H101.22C95.51,48.22 90.88,52.85 90.88,58.55V242.05C90.88,247.76 95.51,252.38 101.22,252.38H198.84C201,252.38 203.13,251.83 205.03,250.78C205.86,250.45 206.78,250.44 207.63,250.73L207.73,250.78C209.62,251.83 213.04,252.38 215.2,252.38H311.49C317.2,252.38 321.83,247.76 321.83,242.05V181.69C322.96,181.65 323.87,180.47 323.87,179.01V152.1C323.87,150.65 322.96,149.46 321.83,149.43V134.76ZM319.45,242.43C319.45,246.61 315.67,250.01 311.49,250.01H101.22C97.04,250.01 93.26,246.61 93.26,242.43V58.55C93.26,54.38 97.04,50.6 101.22,50.6H311.49C315.67,50.6 319.45,54.38 319.45,58.55V242.43Z"
+ android:fillColor="#80868B"/>
+ <path
+ android:pathData="M155,53L259,53A4,4 0,0 1,263 57L263,243A4,4 0,0 1,259 247L155,247A4,4 0,0 1,151 243L151,57A4,4 0,0 1,155 53z"
+ android:fillColor="#669DF6"/>
+ <path
+ android:pathData="M157,57L257,57A2,2 0,0 1,259 59L259,241A2,2 0,0 1,257 243L157,243A2,2 0,0 1,155 241L155,59A2,2 0,0 1,157 57z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M171.48,237H161V226.42"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M161,237L176,222"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M242.52,63L253,63L253,73.58"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M253,63L238,78"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ </group>
+</vector>
diff --git a/res/drawable-night/ic_app_aspect_ratio_3_2.xml b/res/drawable-night/ic_app_aspect_ratio_3_2.xml
new file mode 100644
index 0000000..22c0969
--- /dev/null
+++ b/res/drawable-night/ic_app_aspect_ratio_3_2.xml
@@ -0,0 +1,66 @@
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="412dp"
+ android:height="300dp"
+ android:viewportWidth="412"
+ android:viewportHeight="300">
+ <group>
+ <clip-path
+ android:pathData="M0,0h412v300h-412z"/>
+ <path
+ android:pathData="M384.18,300H27.82C12.53,300 0,287.17 0,271.52V28.48C0,12.83 12.53,0 27.82,0H384.29C399.47,0 412,12.83 412,28.48V271.63C412,287.17 399.47,300 384.18,300Z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M321.83,134.76V134C322.96,133.96 323.87,132.78 323.87,131.32V116.86C323.87,115.4 322.96,114.22 321.83,114.18V58.55C321.83,52.85 317.2,48.22 311.49,48.22H213.79C211.62,48.22 209.49,48.77 207.6,49.82C206.71,50.18 205.73,50.18 204.85,49.83L204.81,49.82C202.92,48.77 200.79,48.22 198.62,48.22H101.22C95.51,48.22 90.88,52.85 90.88,58.55V242.05C90.88,247.76 95.51,252.38 101.22,252.38H198.84C201,252.38 203.13,251.83 205.03,250.78C205.86,250.45 206.78,250.44 207.63,250.73L207.73,250.78C209.62,251.83 213.04,252.38 215.2,252.38H311.49C317.2,252.38 321.83,247.76 321.83,242.05V181.69C322.96,181.65 323.87,180.47 323.87,179.01V152.1C323.87,150.65 322.96,149.46 321.83,149.43V134.76ZM319.45,242.43C319.45,246.61 315.67,250.01 311.49,250.01H101.22C97.04,250.01 93.26,246.61 93.26,242.43V58.55C93.26,54.38 97.04,50.6 101.22,50.6H311.49C315.67,50.6 319.45,54.38 319.45,58.55V242.43Z"
+ android:fillColor="#80868B"/>
+ <path
+ android:pathData="M144,53L268,53A4,4 0,0 1,272 57L272,243A4,4 0,0 1,268 247L144,247A4,4 0,0 1,140 243L140,57A4,4 0,0 1,144 53z"
+ android:fillColor="#669DF6"/>
+ <path
+ android:pathData="M146,57L266,57A2,2 0,0 1,268 59L268,241A2,2 0,0 1,266 243L146,243A2,2 0,0 1,144 241L144,59A2,2 0,0 1,146 57z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M160.48,237H150V226.42"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M150,237L165,222"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M251.52,63L262,63L262,73.58"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M262,63L247,78"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ </group>
+</vector>
diff --git a/res/drawable-night/ic_app_aspect_ratio_4_3.xml b/res/drawable-night/ic_app_aspect_ratio_4_3.xml
new file mode 100644
index 0000000..0238311
--- /dev/null
+++ b/res/drawable-night/ic_app_aspect_ratio_4_3.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="412dp"
+ android:height="300dp"
+ android:viewportWidth="412"
+ android:viewportHeight="300">
+ <group>
+ <clip-path
+ android:pathData="M0,0h412v300h-412z"/>
+ <path
+ android:pathData="M384.18,300H27.82C12.53,300 0,287.17 0,271.52V28.48C0,12.83 12.53,0 27.82,0H384.29C399.47,0 412,12.83 412,28.48V271.63C412,287.17 399.47,300 384.18,300Z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M321.83,134.76V134C322.96,133.96 323.87,132.78 323.87,131.32V116.86C323.87,115.4 322.96,114.22 321.83,114.18V58.55C321.83,52.85 317.2,48.22 311.49,48.22H213.79C211.62,48.22 209.49,48.77 207.6,49.82C206.71,50.18 205.73,50.18 204.85,49.83L204.81,49.82C202.92,48.77 200.79,48.22 198.62,48.22H101.22C95.51,48.22 90.88,52.85 90.88,58.55V242.05C90.88,247.76 95.51,252.38 101.22,252.38H198.84C201,252.38 203.13,251.83 205.03,250.78C205.86,250.45 206.78,250.44 207.63,250.73L207.73,250.78C209.62,251.83 213.04,252.38 215.2,252.38H311.49C317.2,252.38 321.83,247.76 321.83,242.05V181.69C322.96,181.65 323.87,180.47 323.87,179.01V152.1C323.87,150.65 322.96,149.46 321.83,149.43V134.76ZM319.45,242.43C319.45,246.61 315.67,250.01 311.49,250.01H101.22C97.04,250.01 93.26,246.61 93.26,242.43V58.55C93.26,54.38 97.04,50.6 101.22,50.6H311.49C315.67,50.6 319.45,54.38 319.45,58.55V242.43Z"
+ android:fillColor="#80868B"/>
+ <path
+ android:pathData="M136,53L276,53A4,4 0,0 1,280 57L280,243A4,4 0,0 1,276 247L136,247A4,4 0,0 1,132 243L132,57A4,4 0,0 1,136 53z"
+ android:fillColor="#669DF6"/>
+ <path
+ android:pathData="M138,57L274,57A2,2 0,0 1,276 59L276,241A2,2 0,0 1,274 243L138,243A2,2 0,0 1,136 241L136,59A2,2 0,0 1,138 57z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M152.48,237H142V226.42"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M142,237L157,222"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M259.52,63L270,63L270,73.58"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M270,63L255,78"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ </group>
+</vector>
diff --git a/res/drawable-night/ic_app_aspect_ratio_display_size.xml b/res/drawable-night/ic_app_aspect_ratio_display_size.xml
new file mode 100644
index 0000000..91626d7
--- /dev/null
+++ b/res/drawable-night/ic_app_aspect_ratio_display_size.xml
@@ -0,0 +1,66 @@
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="412dp"
+ android:height="300dp"
+ android:viewportWidth="412"
+ android:viewportHeight="300">
+ <group>
+ <clip-path
+ android:pathData="M0,0h412v300h-412z"/>
+ <path
+ android:pathData="M384.18,300H27.82C12.53,300 0,287.17 0,271.52V28.48C0,12.83 12.53,0 27.82,0H384.29C399.47,0 412,12.83 412,28.48V271.63C412,287.17 399.47,300 384.18,300Z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M321.83,134.76V134C322.96,133.96 323.87,132.78 323.87,131.32V116.86C323.87,115.4 322.96,114.22 321.83,114.18V58.55C321.83,52.85 317.2,48.22 311.49,48.22H213.79C211.62,48.22 209.49,48.77 207.6,49.82C206.71,50.18 205.73,50.18 204.85,49.83L204.81,49.82C202.92,48.77 200.79,48.22 198.62,48.22H101.22C95.51,48.22 90.88,52.85 90.88,58.55V242.05C90.88,247.76 95.51,252.38 101.22,252.38H198.84C201,252.38 203.13,251.83 205.03,250.78C205.86,250.45 206.78,250.44 207.63,250.73L207.73,250.78C209.62,251.83 213.04,252.38 215.2,252.38H311.49C317.2,252.38 321.83,247.76 321.83,242.05V181.69C322.96,181.65 323.87,180.47 323.87,179.01V152.1C323.87,150.65 322.96,149.46 321.83,149.43V134.76ZM319.45,242.43C319.45,246.61 315.67,250.01 311.49,250.01H101.22C97.04,250.01 93.26,246.61 93.26,242.43V58.55C93.26,54.38 97.04,50.6 101.22,50.6H311.49C315.67,50.6 319.45,54.38 319.45,58.55V242.43Z"
+ android:fillColor="#80868B"/>
+ <path
+ android:pathData="M128,53L284,53A4,4 0,0 1,288 57L288,243A4,4 0,0 1,284 247L128,247A4,4 0,0 1,124 243L124,57A4,4 0,0 1,128 53z"
+ android:fillColor="#669DF6"/>
+ <path
+ android:pathData="M130,57L282,57A2,2 0,0 1,284 59L284,241A2,2 0,0 1,282 243L130,243A2,2 0,0 1,128 241L128,59A2,2 0,0 1,130 57z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M144.48,237H134V226.42"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M134,237L149,222"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M267.52,63L278,63L278,73.58"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M278,63L263,78"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ </group>
+</vector>
diff --git a/res/drawable-night/ic_app_aspect_ratio_fullscreen.xml b/res/drawable-night/ic_app_aspect_ratio_fullscreen.xml
new file mode 100644
index 0000000..aecc8f0
--- /dev/null
+++ b/res/drawable-night/ic_app_aspect_ratio_fullscreen.xml
@@ -0,0 +1,66 @@
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="412dp"
+ android:height="300dp"
+ android:viewportWidth="412"
+ android:viewportHeight="300">
+ <group>
+ <clip-path
+ android:pathData="M0,0h412v300h-412z"/>
+ <path
+ android:pathData="M384.18,300H27.82C12.53,300 0,287.17 0,271.52V28.48C0,12.83 12.53,0 27.82,0H384.29C399.47,0 412,12.83 412,28.48V271.63C412,287.17 399.47,300 384.18,300Z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M321.83,134.76V134C322.96,133.96 323.87,132.78 323.87,131.32V116.86C323.87,115.4 322.96,114.22 321.83,114.18V58.55C321.83,52.85 317.2,48.22 311.49,48.22H213.79C211.62,48.22 209.49,48.77 207.6,49.82C206.71,50.18 205.73,50.18 204.85,49.83L204.81,49.82C202.92,48.77 200.79,48.22 198.62,48.22H101.22C95.51,48.22 90.88,52.85 90.88,58.55V242.05C90.88,247.76 95.51,252.38 101.22,252.38H198.84C201,252.38 203.13,251.83 205.03,250.78C205.86,250.45 206.78,250.44 207.63,250.73L207.73,250.78C209.62,251.83 213.04,252.38 215.2,252.38H311.49C317.2,252.38 321.83,247.76 321.83,242.05V181.69C322.96,181.65 323.87,180.47 323.87,179.01V152.1C323.87,150.65 322.96,149.46 321.83,149.43V134.76ZM319.45,242.43C319.45,246.61 315.67,250.01 311.49,250.01H101.22C97.04,250.01 93.26,246.61 93.26,242.43V58.55C93.26,54.38 97.04,50.6 101.22,50.6H311.49C315.67,50.6 319.45,54.38 319.45,58.55V242.43Z"
+ android:fillColor="#80868B"/>
+ <path
+ android:pathData="M100,53L312,53A4,4 0,0 1,316 57L316,243A4,4 0,0 1,312 247L100,247A4,4 0,0 1,96 243L96,57A4,4 0,0 1,100 53z"
+ android:fillColor="#669DF6"/>
+ <path
+ android:pathData="M102,57L310,57A2,2 0,0 1,312 59L312,241A2,2 0,0 1,310 243L102,243A2,2 0,0 1,100 241L100,59A2,2 0,0 1,102 57z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M116.48,237H106V226.42"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M106,237L121,222"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M295.52,63L306,63L306,73.58"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M306,63L291,78"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ </group>
+</vector>
diff --git a/res/drawable-night/ic_app_aspect_ratio_half_screen.xml b/res/drawable-night/ic_app_aspect_ratio_half_screen.xml
new file mode 100644
index 0000000..af533ea
--- /dev/null
+++ b/res/drawable-night/ic_app_aspect_ratio_half_screen.xml
@@ -0,0 +1,66 @@
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="412dp"
+ android:height="300dp"
+ android:viewportWidth="412"
+ android:viewportHeight="300">
+ <group>
+ <clip-path
+ android:pathData="M0,0h412v300h-412z"/>
+ <path
+ android:pathData="M384.18,300H27.82C12.53,300 0,287.17 0,271.52V28.48C0,12.83 12.53,0 27.82,0H384.29C399.47,0 412,12.83 412,28.48V271.63C412,287.17 399.47,300 384.18,300Z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M321.83,134.76V134C322.96,133.96 323.87,132.78 323.87,131.32V116.86C323.87,115.4 322.96,114.22 321.83,114.18V58.55C321.83,52.85 317.2,48.22 311.49,48.22H213.79C211.62,48.22 209.49,48.77 207.6,49.82C206.71,50.18 205.73,50.18 204.85,49.83L204.81,49.82C202.92,48.77 200.79,48.22 198.62,48.22H101.22C95.51,48.22 90.88,52.85 90.88,58.55V242.05C90.88,247.76 95.51,252.38 101.22,252.38H198.84C201,252.38 203.13,251.83 205.03,250.78C205.86,250.45 206.78,250.44 207.63,250.73L207.73,250.78C209.62,251.83 213.04,252.38 215.2,252.38H311.49C317.2,252.38 321.83,247.76 321.83,242.05V181.69C322.96,181.65 323.87,180.47 323.87,179.01V152.1C323.87,150.65 322.96,149.46 321.83,149.43V134.76ZM319.45,242.43C319.45,246.61 315.67,250.01 311.49,250.01H101.22C97.04,250.01 93.26,246.61 93.26,242.43V58.55C93.26,54.38 97.04,50.6 101.22,50.6H311.49C315.67,50.6 319.45,54.38 319.45,58.55V242.43Z"
+ android:fillColor="#80868B"/>
+ <path
+ android:pathData="M148,53L264,53A4,4 0,0 1,268 57L268,243A4,4 0,0 1,264 247L148,247A4,4 0,0 1,144 243L144,57A4,4 0,0 1,148 53z"
+ android:fillColor="#669DF6"/>
+ <path
+ android:pathData="M150,57L262,57A2,2 0,0 1,264 59L264,241A2,2 0,0 1,262 243L150,243A2,2 0,0 1,148 241L148,59A2,2 0,0 1,150 57z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M164.48,237H154V226.42"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M154,237L169,222"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M247.52,63L258,63L258,73.58"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M258,63L243,78"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#669DF6"
+ android:strokeLineCap="round"/>
+ </group>
+</vector>
diff --git a/res/drawable/action_button_bg.xml b/res/drawable/action_button_bg.xml
new file mode 100644
index 0000000..b50cc41
--- /dev/null
+++ b/res/drawable/action_button_bg.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+ android:color="?android:attr/colorControlHighlight">
+ <item>
+ <inset
+ android:insetLeft="0dp"
+ android:insetTop="8dp"
+ android:insetRight="0dp"
+ android:insetBottom="8dp">
+ <shape android:shape="rectangle">
+ <corners android:radius="8dp" />
+ <stroke android:width="1dp"
+ android:color="?androidprv:attr/colorAccentPrimaryVariant"/>
+ </shape>
+ </inset>
+ </item>
+</ripple>
+
diff --git a/res/drawable/battery_tips_all_rounded_bg_ripple.xml b/res/drawable/battery_tips_all_rounded_bg_ripple.xml
new file mode 100644
index 0000000..3180570
--- /dev/null
+++ b/res/drawable/battery_tips_all_rounded_bg_ripple.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2023 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="?android:attr/colorControlHighlight">
+ <item android:drawable="@drawable/battery_tips_all_rounded_bg"/>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/ic_app_aspect_ratio_16_9.xml b/res/drawable/ic_app_aspect_ratio_16_9.xml
new file mode 100644
index 0000000..2300f3d
--- /dev/null
+++ b/res/drawable/ic_app_aspect_ratio_16_9.xml
@@ -0,0 +1,66 @@
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="412dp"
+ android:height="300dp"
+ android:viewportWidth="412"
+ android:viewportHeight="300">
+ <group>
+ <clip-path
+ android:pathData="M0,0h412v300h-412z"/>
+ <path
+ android:pathData="M384.18,300H27.82C12.53,300 0,287.17 0,271.52V28.48C0,12.83 12.53,0 27.82,0H384.29C399.47,0 412,12.83 412,28.48V271.63C412,287.17 399.47,300 384.18,300Z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M321.83,134.76V134C322.96,133.96 323.87,132.78 323.87,131.32V116.86C323.87,115.4 322.96,114.22 321.83,114.18V58.55C321.83,52.85 317.2,48.22 311.49,48.22H213.79C211.62,48.22 209.49,48.77 207.6,49.82C206.71,50.18 205.73,50.18 204.84,49.83L204.81,49.82C202.92,48.77 200.79,48.22 198.62,48.22H101.22C95.51,48.22 90.88,52.85 90.88,58.55V242.05C90.88,247.76 95.51,252.38 101.22,252.38H198.84C201,252.38 203.13,251.83 205.03,250.78C205.86,250.45 206.78,250.44 207.63,250.73L207.73,250.78C209.62,251.83 213.04,252.38 215.2,252.38H311.49C317.2,252.38 321.83,247.76 321.83,242.05V181.69C322.96,181.65 323.87,180.47 323.87,179.01V152.1C323.87,150.65 322.96,149.46 321.83,149.43V134.76ZM319.45,242.43C319.45,246.61 315.67,250.01 311.49,250.01H101.21C97.04,250.01 93.26,246.61 93.26,242.43V58.55C93.26,54.38 97.04,50.6 101.21,50.6H311.49C315.67,50.6 319.45,54.38 319.45,58.55V242.43Z"
+ android:fillColor="#DADCE0"/>
+ <path
+ android:pathData="M155,53L259,53A4,4 0,0 1,263 57L263,243A4,4 0,0 1,259 247L155,247A4,4 0,0 1,151 243L151,57A4,4 0,0 1,155 53z"
+ android:fillColor="#1A73E8"/>
+ <path
+ android:pathData="M157,57L257,57A2,2 0,0 1,259 59L259,241A2,2 0,0 1,257 243L157,243A2,2 0,0 1,155 241L155,59A2,2 0,0 1,157 57z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M171.48,237H161V226.42"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M161,237L176,222"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M242.52,63L253,63L253,73.58"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M253,63L238,78"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ </group>
+</vector>
diff --git a/res/drawable/ic_app_aspect_ratio_3_2.xml b/res/drawable/ic_app_aspect_ratio_3_2.xml
new file mode 100644
index 0000000..b28bdd4
--- /dev/null
+++ b/res/drawable/ic_app_aspect_ratio_3_2.xml
@@ -0,0 +1,66 @@
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="412dp"
+ android:height="300dp"
+ android:viewportWidth="412"
+ android:viewportHeight="300">
+ <group>
+ <clip-path
+ android:pathData="M0,0h412v300h-412z"/>
+ <path
+ android:pathData="M384.18,300H27.82C12.53,300 0,287.17 0,271.52V28.48C0,12.83 12.53,0 27.82,0H384.29C399.47,0 412,12.83 412,28.48V271.63C412,287.17 399.47,300 384.18,300Z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M321.83,134.76V134C322.96,133.96 323.87,132.78 323.87,131.32V116.86C323.87,115.4 322.96,114.22 321.83,114.18V58.55C321.83,52.85 317.2,48.22 311.49,48.22H213.79C211.62,48.22 209.49,48.77 207.6,49.82C206.71,50.18 205.73,50.18 204.84,49.83L204.81,49.82C202.92,48.77 200.79,48.22 198.62,48.22H101.22C95.51,48.22 90.88,52.85 90.88,58.55V242.05C90.88,247.76 95.51,252.38 101.22,252.38H198.84C201,252.38 203.13,251.83 205.03,250.78C205.86,250.45 206.78,250.44 207.63,250.73L207.73,250.78C209.62,251.83 213.04,252.38 215.2,252.38H311.49C317.2,252.38 321.83,247.76 321.83,242.05V181.69C322.96,181.65 323.87,180.47 323.87,179.01V152.1C323.87,150.65 322.96,149.46 321.83,149.43V134.76ZM319.45,242.43C319.45,246.61 315.67,250.01 311.49,250.01H101.21C97.04,250.01 93.26,246.61 93.26,242.43V58.55C93.26,54.38 97.04,50.6 101.21,50.6H311.49C315.67,50.6 319.45,54.38 319.45,58.55V242.43Z"
+ android:fillColor="#DADCE0"/>
+ <path
+ android:pathData="M144,53L268,53A4,4 0,0 1,272 57L272,243A4,4 0,0 1,268 247L144,247A4,4 0,0 1,140 243L140,57A4,4 0,0 1,144 53z"
+ android:fillColor="#1A73E8"/>
+ <path
+ android:pathData="M146,57L266,57A2,2 0,0 1,268 59L268,241A2,2 0,0 1,266 243L146,243A2,2 0,0 1,144 241L144,59A2,2 0,0 1,146 57z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M160.48,237H150V226.42"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M150,237L165,222"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M251.52,63L262,63L262,73.58"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M262,63L247,78"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ </group>
+</vector>
diff --git a/res/drawable/ic_app_aspect_ratio_4_3.xml b/res/drawable/ic_app_aspect_ratio_4_3.xml
new file mode 100644
index 0000000..ba875e9
--- /dev/null
+++ b/res/drawable/ic_app_aspect_ratio_4_3.xml
@@ -0,0 +1,66 @@
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="412dp"
+ android:height="300dp"
+ android:viewportWidth="412"
+ android:viewportHeight="300">
+ <group>
+ <clip-path
+ android:pathData="M0,0h412v300h-412z"/>
+ <path
+ android:pathData="M384.18,300H27.82C12.53,300 0,287.17 0,271.52V28.48C0,12.83 12.53,0 27.82,0H384.29C399.47,0 412,12.83 412,28.48V271.63C412,287.17 399.47,300 384.18,300Z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M321.83,134.76V134C322.96,133.96 323.87,132.78 323.87,131.32V116.86C323.87,115.4 322.96,114.22 321.83,114.18V58.55C321.83,52.85 317.2,48.22 311.49,48.22H213.79C211.62,48.22 209.49,48.77 207.6,49.82C206.71,50.18 205.73,50.18 204.84,49.83L204.81,49.82C202.92,48.77 200.79,48.22 198.62,48.22H101.22C95.51,48.22 90.88,52.85 90.88,58.55V242.05C90.88,247.76 95.51,252.38 101.22,252.38H198.84C201,252.38 203.13,251.83 205.03,250.78C205.86,250.45 206.78,250.44 207.63,250.73L207.73,250.78C209.62,251.83 213.04,252.38 215.2,252.38H311.49C317.2,252.38 321.83,247.76 321.83,242.05V181.69C322.96,181.65 323.87,180.47 323.87,179.01V152.1C323.87,150.65 322.96,149.46 321.83,149.43V134.76ZM319.45,242.43C319.45,246.61 315.67,250.01 311.49,250.01H101.21C97.04,250.01 93.26,246.61 93.26,242.43V58.55C93.26,54.38 97.04,50.6 101.21,50.6H311.49C315.67,50.6 319.45,54.38 319.45,58.55V242.43Z"
+ android:fillColor="#DADCE0"/>
+ <path
+ android:pathData="M136,53L276,53A4,4 0,0 1,280 57L280,243A4,4 0,0 1,276 247L136,247A4,4 0,0 1,132 243L132,57A4,4 0,0 1,136 53z"
+ android:fillColor="#1A73E8"/>
+ <path
+ android:pathData="M138,57L274,57A2,2 0,0 1,276 59L276,241A2,2 0,0 1,274 243L138,243A2,2 0,0 1,136 241L136,59A2,2 0,0 1,138 57z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M152.48,237H142V226.42"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M142,237L157,222"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M259.52,63L270,63L270,73.58"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M270,63L255,78"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ </group>
+</vector>
diff --git a/res/drawable/ic_app_aspect_ratio_display_size.xml b/res/drawable/ic_app_aspect_ratio_display_size.xml
new file mode 100644
index 0000000..1122395
--- /dev/null
+++ b/res/drawable/ic_app_aspect_ratio_display_size.xml
@@ -0,0 +1,66 @@
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="412dp"
+ android:height="300dp"
+ android:viewportWidth="412"
+ android:viewportHeight="300">
+ <group>
+ <clip-path
+ android:pathData="M0,0h412v300h-412z"/>
+ <path
+ android:pathData="M384.18,300H27.82C12.53,300 0,287.17 0,271.52V28.48C0,12.83 12.53,0 27.82,0H384.29C399.47,0 412,12.83 412,28.48V271.63C412,287.17 399.47,300 384.18,300Z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M321.83,134.76V134C322.96,133.96 323.87,132.78 323.87,131.32V116.86C323.87,115.4 322.96,114.22 321.83,114.18V58.55C321.83,52.85 317.2,48.22 311.49,48.22H213.79C211.62,48.22 209.49,48.77 207.6,49.82C206.71,50.18 205.73,50.18 204.84,49.83L204.81,49.82C202.92,48.77 200.79,48.22 198.62,48.22H101.22C95.51,48.22 90.88,52.85 90.88,58.55V242.05C90.88,247.76 95.51,252.38 101.22,252.38H198.84C201,252.38 203.13,251.83 205.03,250.78C205.86,250.45 206.78,250.44 207.63,250.73L207.73,250.78C209.62,251.83 213.04,252.38 215.2,252.38H311.49C317.2,252.38 321.83,247.76 321.83,242.05V181.69C322.96,181.65 323.87,180.47 323.87,179.01V152.1C323.87,150.65 322.96,149.46 321.83,149.43V134.76ZM319.45,242.43C319.45,246.61 315.67,250.01 311.49,250.01H101.21C97.04,250.01 93.26,246.61 93.26,242.43V58.55C93.26,54.38 97.04,50.6 101.21,50.6H311.49C315.67,50.6 319.45,54.38 319.45,58.55V242.43Z"
+ android:fillColor="#DADCE0"/>
+ <path
+ android:pathData="M128,53L284,53A4,4 0,0 1,288 57L288,243A4,4 0,0 1,284 247L128,247A4,4 0,0 1,124 243L124,57A4,4 0,0 1,128 53z"
+ android:fillColor="#1A73E8"/>
+ <path
+ android:pathData="M130,57L282,57A2,2 0,0 1,284 59L284,241A2,2 0,0 1,282 243L130,243A2,2 0,0 1,128 241L128,59A2,2 0,0 1,130 57z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M144.48,237H134V226.42"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M134,237L149,222"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M267.52,63L278,63L278,73.58"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M278,63L263,78"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ </group>
+</vector>
diff --git a/res/drawable/ic_app_aspect_ratio_fullscreen.xml b/res/drawable/ic_app_aspect_ratio_fullscreen.xml
new file mode 100644
index 0000000..0e62fe5
--- /dev/null
+++ b/res/drawable/ic_app_aspect_ratio_fullscreen.xml
@@ -0,0 +1,66 @@
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="412dp"
+ android:height="300dp"
+ android:viewportWidth="412"
+ android:viewportHeight="300">
+ <group>
+ <clip-path
+ android:pathData="M0,0h412v300h-412z"/>
+ <path
+ android:pathData="M384.18,300H27.82C12.53,300 0,287.17 0,271.52V28.48C0,12.83 12.53,0 27.82,0H384.29C399.47,0 412,12.83 412,28.48V271.63C412,287.17 399.47,300 384.18,300Z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M321.83,134.76V134C322.96,133.96 323.87,132.78 323.87,131.32V116.86C323.87,115.4 322.96,114.22 321.83,114.18V58.55C321.83,52.85 317.2,48.22 311.49,48.22H213.79C211.62,48.22 209.49,48.77 207.6,49.82C206.71,50.18 205.73,50.18 204.84,49.83L204.81,49.82C202.92,48.77 200.79,48.22 198.62,48.22H101.22C95.51,48.22 90.88,52.85 90.88,58.55V242.05C90.88,247.76 95.51,252.38 101.22,252.38H198.84C201,252.38 203.13,251.83 205.03,250.78C205.86,250.45 206.78,250.44 207.63,250.73L207.73,250.78C209.62,251.83 213.04,252.38 215.2,252.38H311.49C317.2,252.38 321.83,247.76 321.83,242.05V181.69C322.96,181.65 323.87,180.47 323.87,179.01V152.1C323.87,150.65 322.96,149.46 321.83,149.43V134.76ZM319.45,242.43C319.45,246.61 315.67,250.01 311.49,250.01H101.21C97.04,250.01 93.26,246.61 93.26,242.43V58.55C93.26,54.38 97.04,50.6 101.21,50.6H311.49C315.67,50.6 319.45,54.38 319.45,58.55V242.43Z"
+ android:fillColor="#DADCE0"/>
+ <path
+ android:pathData="M100,53L312,53A4,4 0,0 1,316 57L316,243A4,4 0,0 1,312 247L100,247A4,4 0,0 1,96 243L96,57A4,4 0,0 1,100 53z"
+ android:fillColor="#1A73E8"/>
+ <path
+ android:pathData="M102,57L310,57A2,2 0,0 1,312 59L312,241A2,2 0,0 1,310 243L102,243A2,2 0,0 1,100 241L100,59A2,2 0,0 1,102 57z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M116.48,237H106V226.42"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M106,237L121,222"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M295.52,63L306,63L306,73.58"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M306,63L291,78"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ </group>
+</vector>
diff --git a/res/drawable/ic_app_aspect_ratio_half_screen.xml b/res/drawable/ic_app_aspect_ratio_half_screen.xml
new file mode 100644
index 0000000..43afce1
--- /dev/null
+++ b/res/drawable/ic_app_aspect_ratio_half_screen.xml
@@ -0,0 +1,66 @@
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="412dp"
+ android:height="300dp"
+ android:viewportWidth="412"
+ android:viewportHeight="300">
+ <group>
+ <clip-path
+ android:pathData="M0,0h412v300h-412z"/>
+ <path
+ android:pathData="M384.18,300H27.82C12.53,300 0,287.17 0,271.52V28.48C0,12.83 12.53,0 27.82,0H384.29C399.47,0 412,12.83 412,28.48V271.63C412,287.17 399.47,300 384.18,300Z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M321.83,134.76V134C322.96,133.96 323.87,132.78 323.87,131.32V116.86C323.87,115.4 322.96,114.22 321.83,114.18V58.55C321.83,52.85 317.2,48.22 311.49,48.22H213.79C211.62,48.22 209.49,48.77 207.6,49.82C206.71,50.18 205.73,50.18 204.84,49.83L204.81,49.82C202.92,48.77 200.79,48.22 198.62,48.22H101.22C95.51,48.22 90.88,52.85 90.88,58.55V242.05C90.88,247.76 95.51,252.38 101.22,252.38H198.84C201,252.38 203.13,251.83 205.03,250.78C205.86,250.45 206.78,250.44 207.63,250.73L207.73,250.78C209.62,251.83 213.04,252.38 215.2,252.38H311.49C317.2,252.38 321.83,247.76 321.83,242.05V181.69C322.96,181.65 323.87,180.47 323.87,179.01V152.1C323.87,150.65 322.96,149.46 321.83,149.43V134.76ZM319.45,242.43C319.45,246.61 315.67,250.01 311.49,250.01H101.21C97.04,250.01 93.26,246.61 93.26,242.43V58.55C93.26,54.38 97.04,50.6 101.21,50.6H311.49C315.67,50.6 319.45,54.38 319.45,58.55V242.43Z"
+ android:fillColor="#DADCE0"/>
+ <path
+ android:pathData="M148,53L264,53A4,4 0,0 1,268 57L268,243A4,4 0,0 1,264 247L148,247A4,4 0,0 1,144 243L144,57A4,4 0,0 1,148 53z"
+ android:fillColor="#1A73E8"/>
+ <path
+ android:pathData="M150,57L262,57A2,2 0,0 1,264 59L264,241A2,2 0,0 1,262 243L150,243A2,2 0,0 1,148 241L148,59A2,2 0,0 1,150 57z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M164.48,237H154V226.42"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M154,237L169,222"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M247.52,63L258,63L258,73.58"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ <path
+ android:pathData="M258,63L243,78"
+ android:strokeLineJoin="round"
+ android:strokeWidth="4"
+ android:fillColor="#00000000"
+ android:strokeColor="#1A73E8"
+ android:strokeLineCap="round"/>
+ </group>
+</vector>
diff --git a/res/layout/action_button.xml b/res/layout/action_button.xml
new file mode 100644
index 0000000..00fdc1e
--- /dev/null
+++ b/res/layout/action_button.xml
@@ -0,0 +1,32 @@
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License
+ -->
+
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+ android:gravity="center_vertical|start"
+ android:paddingStart="12dp"
+ android:paddingEnd="12dp"
+ android:drawablePadding="8dp"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="12sp"
+ android:maxWidth="192dp"
+ android:singleLine="true"
+ android:clickable="true"
+ android:background="@drawable/action_button_bg"
+ android:drawableTint="?android:attr/textColorPrimary"
+ android:drawableTintMode="src_in"
+ style="?android:attr/borderlessButtonStyle"
+ />
+
diff --git a/res/layout/battery_tips_card.xml b/res/layout/battery_tips_card.xml
index d2edb51..2fa5bf2 100644
--- a/res/layout/battery_tips_card.xml
+++ b/res/layout/battery_tips_card.xml
@@ -12,36 +12,16 @@
android:id="@+id/tips_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/battery_tips_all_rounded_bg"
+ android:background="@drawable/battery_tips_all_rounded_bg_ripple"
android:orientation="vertical"
android:padding="24dp">
- <LinearLayout
- android:layout_width="match_parent"
+ <ImageView
+ android:id="@+id/icon"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@+id/icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical|start"
- android:src="@drawable/ic_battery_tips_lightbulb" />
-
- <Space
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_weight="1" />
-
- <ImageButton
- android:id="@+id/dismiss_button"
- style="@style/Banner.Dismiss.SettingsLib"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical|end"
- android:layout_marginEnd="0dp"
- android:src="@drawable/ic_battery_tips_close_icon" />
- </LinearLayout>
+ android:layout_gravity="center_vertical|start"
+ android:src="@drawable/ic_battery_tips_lightbulb" />
<TextView
android:id="@+id/title"
@@ -53,30 +33,40 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorPrimary" />
- <TextView
- android:id="@+id/summary"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:orientation="horizontal"
android:layout_marginTop="8dp"
- android:gravity="start"
- android:maxLines="10"
- android:textAlignment="viewStart"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorSecondary" />
+ android:gravity="end">
- <com.google.android.material.button.MaterialButton
- android:id="@+id/action_button"
- style="@style/Widget.Material3.Button.OutlinedButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="end"
- android:layout_marginTop="8dp"
- android:text="@string/battery_tips_card_action_button"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorPrimary"
- android:textStyle="bold"
- app:strokeColor="?android:attr/colorAccent"
- app:strokeWidth="1dp" />
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/dismiss_button"
+ style="@style/Widget.Material3.Button.TextButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:paddingHorizontal="16dp"
+ android:layout_marginEnd="8dp"
+ android:text="@string/battery_tips_card_dismiss_button"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/colorAccent"
+ android:textStyle="bold" />
+
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/main_button"
+ style="@style/Widget.Material3.Button.OutlinedButton"
+ android:paddingHorizontal="16dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:text="@string/battery_tips_card_action_button"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textStyle="bold"
+ app:strokeColor="?android:attr/colorAccent"
+ app:strokeWidth="1dp" />
+ </LinearLayout>
</LinearLayout>
<Space
diff --git a/res/layout/radio_with_image_preference.xml b/res/layout/radio_with_image_preference.xml
new file mode 100644
index 0000000..fcd0e26
--- /dev/null
+++ b/res/layout/radio_with_image_preference.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2023 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="?android:attr/selectableItemBackground"
+ android:gravity="center_vertical"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp">
+
+ <LinearLayout
+ android:id="@android:id/widget_frame"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingHorizontal="20dp"
+ android:gravity="center_horizontal"
+ android:minWidth="56dp"
+ android:orientation="vertical"/>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="2"
+ android:textAppearance="?android:attr/textAppearanceListItem"/>
+
+ <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="?android:attr/textAppearanceSmall"
+ android:textAlignment="viewStart"
+ android:textColor="?android:attr/textColorSecondary"/>
+ </LinearLayout>
+
+ <ImageView
+ android:id="@android:id/icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/settingslib_illustration_padding"
+ android:adjustViewBounds="true"
+ android:maxWidth="@dimen/settingslib_illustration_width"
+ android:maxHeight="@dimen/settingslib_illustration_height" />
+ </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/raw/user_aspect_ratio_education.json b/res/raw/user_aspect_ratio_education.json
new file mode 100644
index 0000000..ab74b45
--- /dev/null
+++ b/res/raw/user_aspect_ratio_education.json
@@ -0,0 +1 @@
+{"v":"5.12.0","fr":60,"ip":0,"op":226,"w":412,"h":300,"nm":"AppCompat_Felix_DT","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":".blue400","cl":"blue400","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[38.5,-79.5,0],"t":15,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.661,-79.5,0],"t":16,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[39.181,-79.5,0],"t":17,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[40.183,-79.5,0],"t":18,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[41.974,-79.5,0],"t":19,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[45.7,-79.5,0],"t":20,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[49.943,-79.5,0],"t":21,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.81,-79.5,0],"t":22,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.893,-79.5,0],"t":23,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[53.628,-79.5,0],"t":24,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[54.171,-79.5,0],"t":25,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[54.59,-79.5,0],"t":26,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[54.925,-79.5,0],"t":27,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.197,-79.5,0],"t":28,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.423,-79.5,0],"t":29,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.611,-79.5,0],"t":30,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.77,-79.5,0],"t":31,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.904,-79.5,0],"t":32,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.017,-79.5,0],"t":33,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.113,-79.5,0],"t":34,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.195,-79.5,0],"t":35,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.263,-79.5,0],"t":36,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.32,-79.5,0],"t":37,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.368,-79.5,0],"t":38,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.406,-79.5,0],"t":39,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.461,-79.5,0],"t":41,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.5,-79.5,0],"t":60,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.823,-79.5,0],"t":61,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[57.861,-79.5,0],"t":62,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[59.865,-79.5,0],"t":63,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[63.449,-79.5,0],"t":64,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[70.9,-79.5,0],"t":65,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[79.385,-79.5,0],"t":66,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.121,-79.5,0],"t":67,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[85.286,-79.5,0],"t":68,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[86.757,-79.5,0],"t":69,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[87.841,-79.5,0],"t":70,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[88.68,-79.5,0],"t":71,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[89.349,-79.5,0],"t":72,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[89.894,-79.5,0],"t":73,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[90.345,-79.5,0],"t":74,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[90.722,-79.5,0],"t":75,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[91.039,-79.5,0],"t":76,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[91.307,-79.5,0],"t":77,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[91.534,-79.5,0],"t":78,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[91.727,-79.5,0],"t":79,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[91.889,-79.5,0],"t":80,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[92.026,-79.5,0],"t":81,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[92.141,-79.5,0],"t":82,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[92.236,-79.5,0],"t":83,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[92.313,-79.5,0],"t":84,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[92.375,-79.5,0],"t":85,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[92.458,-79.5,0],"t":87,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[92.5,-79.5,0],"t":105,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[92.177,-79.5,0],"t":106,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[91.139,-79.5,0],"t":107,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[89.135,-79.5,0],"t":108,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[85.551,-79.5,0],"t":109,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[78.1,-79.5,0],"t":110,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[69.615,-79.5,0],"t":111,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.879,-79.5,0],"t":112,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[63.714,-79.5,0],"t":113,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[62.243,-79.5,0],"t":114,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[61.159,-79.5,0],"t":115,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[60.32,-79.5,0],"t":116,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[59.651,-79.5,0],"t":117,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[59.106,-79.5,0],"t":118,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[58.655,-79.5,0],"t":119,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[58.278,-79.5,0],"t":120,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[57.961,-79.5,0],"t":121,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[57.693,-79.5,0],"t":122,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[57.466,-79.5,0],"t":123,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[57.273,-79.5,0],"t":124,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[57.111,-79.5,0],"t":125,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.974,-79.5,0],"t":126,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.859,-79.5,0],"t":127,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.764,-79.5,0],"t":128,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.687,-79.5,0],"t":129,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.625,-79.5,0],"t":130,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.577,-79.5,0],"t":131,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.542,-79.5,0],"t":132,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.5,-79.5,0],"t":150,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.339,-79.5,0],"t":151,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.819,-79.5,0],"t":152,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[54.817,-79.5,0],"t":153,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[53.026,-79.5,0],"t":154,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[49.3,-79.5,0],"t":155,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[45.057,-79.5,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[43.19,-79.5,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[42.107,-79.5,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[41.372,-79.5,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[40.829,-79.5,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[40.41,-79.5,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[40.075,-79.5,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[39.803,-79.5,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[39.577,-79.5,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[39.389,-79.5,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[39.23,-79.5,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[39.096,-79.5,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.983,-79.5,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.887,-79.5,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.805,-79.5,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.737,-79.5,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.68,-79.5,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.632,-79.5,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.594,-79.5,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.563,-79.5,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.539,-79.5,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.502,-79.5,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[7.5,3.077],[7.5,-7.5],[-2.981,-7.5]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.5,7.5],[7.5,-7.5]],"c":false},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"st","c":{"a":0,"k":[0.40000000596,0.615686297417,0.964705884457,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Vector","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":2916,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".blue400","cl":"blue400","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[-38.5,79.5,0],"t":15,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-38.661,79.5,0],"t":16,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-39.181,79.5,0],"t":17,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-40.183,79.5,0],"t":18,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-41.974,79.5,0],"t":19,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-45.7,79.5,0],"t":20,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-49.943,79.5,0],"t":21,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-51.81,79.5,0],"t":22,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.893,79.5,0],"t":23,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.628,79.5,0],"t":24,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-54.171,79.5,0],"t":25,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-54.59,79.5,0],"t":26,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-54.925,79.5,0],"t":27,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-55.197,79.5,0],"t":28,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-55.423,79.5,0],"t":29,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-55.611,79.5,0],"t":30,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-55.77,79.5,0],"t":31,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-55.904,79.5,0],"t":32,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.017,79.5,0],"t":33,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.113,79.5,0],"t":34,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.195,79.5,0],"t":35,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.263,79.5,0],"t":36,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.32,79.5,0],"t":37,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.368,79.5,0],"t":38,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.406,79.5,0],"t":39,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.461,79.5,0],"t":41,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.5,79.5,0],"t":60,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.823,79.5,0],"t":61,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-57.861,79.5,0],"t":62,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-59.865,79.5,0],"t":63,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-63.449,79.5,0],"t":64,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.9,79.5,0],"t":65,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-79.385,79.5,0],"t":66,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-83.121,79.5,0],"t":67,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-85.286,79.5,0],"t":68,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-86.757,79.5,0],"t":69,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-87.841,79.5,0],"t":70,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-88.68,79.5,0],"t":71,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-89.349,79.5,0],"t":72,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-89.894,79.5,0],"t":73,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-90.345,79.5,0],"t":74,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-90.722,79.5,0],"t":75,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-91.039,79.5,0],"t":76,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-91.307,79.5,0],"t":77,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-91.534,79.5,0],"t":78,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-91.727,79.5,0],"t":79,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-91.889,79.5,0],"t":80,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-92.026,79.5,0],"t":81,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-92.141,79.5,0],"t":82,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-92.236,79.5,0],"t":83,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-92.313,79.5,0],"t":84,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-92.375,79.5,0],"t":85,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-92.458,79.5,0],"t":87,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-92.5,79.5,0],"t":105,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-92.177,79.5,0],"t":106,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-91.139,79.5,0],"t":107,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-89.135,79.5,0],"t":108,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-85.551,79.5,0],"t":109,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-78.1,79.5,0],"t":110,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.615,79.5,0],"t":111,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-65.879,79.5,0],"t":112,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-63.714,79.5,0],"t":113,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-62.243,79.5,0],"t":114,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-61.159,79.5,0],"t":115,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-60.32,79.5,0],"t":116,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-59.651,79.5,0],"t":117,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-59.106,79.5,0],"t":118,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-58.655,79.5,0],"t":119,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-58.278,79.5,0],"t":120,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-57.961,79.5,0],"t":121,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-57.693,79.5,0],"t":122,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-57.466,79.5,0],"t":123,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-57.273,79.5,0],"t":124,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-57.111,79.5,0],"t":125,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.974,79.5,0],"t":126,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.859,79.5,0],"t":127,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.764,79.5,0],"t":128,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.687,79.5,0],"t":129,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.625,79.5,0],"t":130,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.577,79.5,0],"t":131,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.542,79.5,0],"t":132,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.5,79.5,0],"t":150,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.339,79.5,0],"t":151,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-55.819,79.5,0],"t":152,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-54.817,79.5,0],"t":153,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.026,79.5,0],"t":154,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-49.3,79.5,0],"t":155,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-45.057,79.5,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-43.19,79.5,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-42.107,79.5,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-41.372,79.5,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-40.829,79.5,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-40.41,79.5,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-40.075,79.5,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-39.803,79.5,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-39.577,79.5,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-39.389,79.5,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-39.23,79.5,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-39.096,79.5,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-38.983,79.5,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-38.887,79.5,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-38.805,79.5,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-38.737,79.5,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-38.68,79.5,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-38.632,79.5,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-38.594,79.5,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-38.563,79.5,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-38.539,79.5,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-38.502,79.5,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-7.5,-3.077],[-7.5,7.5],[2.981,7.5]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.5,-7.5],[-7.5,7.5]],"c":false},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"st","c":{"a":0,"k":[0.40000000596,0.615686297417,0.964705884457,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":4,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Vector","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":2916,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".black","cl":"black","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.8,0.8],"y":[0.15,1]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":15,"s":[104,186]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.05,0.05],"y":[0.7,0]},"t":20,"s":[118.4,186]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0,0]},"t":45,"s":[140,186]},{"i":{"x":[0.8,0.8],"y":[0.15,1]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":60,"s":[140,186]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.05,0.05],"y":[0.7,0]},"t":65,"s":[168.8,186]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0,0]},"t":90,"s":[212,186]},{"i":{"x":[0.8,0.8],"y":[0.15,1]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":105,"s":[212,186]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.05,0.05],"y":[0.7,0]},"t":110,"s":[183.2,186]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":135,"s":[140,186]},{"i":{"x":[0.8,0.8],"y":[0.15,1]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":150,"s":[140,186]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.05,0.05],"y":[0.7,0]},"t":155,"s":[125.6,186]},{"t":180,"s":[104,186]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":2,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"inside","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":2916,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".blue400","cl":"blue400","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.8,0.8],"y":[0.15,1]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":15,"s":[112,194]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.05,0.05],"y":[0.7,0]},"t":20,"s":[126.4,194]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0,0]},"t":45,"s":[148,194]},{"i":{"x":[0.8,0.8],"y":[0.15,1]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":60,"s":[148,194]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.05,0.05],"y":[0.7,0]},"t":65,"s":[176.8,194]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.167,0.167],"y":[0,0]},"t":90,"s":[220,194]},{"i":{"x":[0.8,0.8],"y":[0.15,1]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":105,"s":[220,194]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.05,0.05],"y":[0.7,0]},"t":110,"s":[191.2,194]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":135,"s":[148,194]},{"i":{"x":[0.8,0.8],"y":[0.15,1]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":150,"s":[148,194]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.05,0.05],"y":[0.7,0]},"t":155,"s":[133.6,194]},{"t":180,"s":[112,194]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":4,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.40000000596,0.615686297417,0.964705884457,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"outside","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":2916,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":".grey600","cl":"grey600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[207.5,150.303,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.133,-0.038],[0,0],[0,0],[0,-1.46],[0,0],[1.133,-0.038],[0,0],[5.707,0],[0,0],[1.894,1.051],[0,0],[0.833,-0.334],[2.166,0],[0,0],[0,5.707],[0,0],[-5.707,0],[0,0],[-1.894,-1.05],[0,0],[-0.883,0.354],[-2.166,0],[0,0],[0,-5.707],[0,0],[0,-1.46],[0,0]],"o":[[0,0],[0,0],[1.133,0.038],[0,0],[0,1.46],[0,0],[0,5.706],[0,0],[-2.166,0],[0,0],[-0.846,-0.289],[-1.894,1.051],[0,0],[-5.707,0],[0,0],[0,-5.707],[0,0],[2.166,0],[0,0],[0.886,0.346],[1.894,-1.05],[0,0],[5.707,0],[0,0],[1.133,0.038],[0,0],[0,1.46]],"v":[[114.45,-16.3],[114.45,-15.539],[114.45,-0.877],[116.494,1.802],[116.494,28.704],[114.45,31.383],[114.45,91.749],[104.117,102.082],[7.828,102.082],[0.351,100.48],[0.25,100.424],[-2.349,100.48],[-8.539,102.082],[-106.16,102.082],[-116.494,91.748],[-116.494,-91.748],[-106.16,-102.082],[-8.754,-102.082],[-2.563,-100.48],[-2.532,-100.468],[0.221,-100.48],[6.411,-102.082],[104.116,-102.082],[114.45,-91.748],[114.45,-36.119],[116.494,-33.44],[116.494,-18.979]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,4.177],[0,0],[4.177,0],[0,0],[0,-4.177],[0,0],[-4.177,0]],"o":[[4.177,0],[0,0],[0,-4.177],[0,0],[-4.177,0],[0,0],[0,4.177],[0,0]],"v":[[104.117,99.704],[112.072,92.128],[112.072,-91.748],[104.117,-99.704],[-106.161,-99.704],[-114.116,-91.748],[-114.116,92.128],[-106.161,99.704]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.501960813999,0.525490224361,0.54509806633,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"felix","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":2916,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":".black","cl":"black","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[206,150,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-15.291,0],[0,0],[0,15.544],[0,0],[15.185,0],[0,0],[0,-15.652],[0,0]],"o":[[0,0],[15.291,0],[0,0],[0,-15.652],[0,0],[-15.291,0],[0,0],[0,15.652]],"v":[[-178.179,150],[178.179,150],[206,121.63],[206,-121.522],[178.286,-150],[-178.179,-150],[-206,-121.522],[-206,121.522]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":".white","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false,"cl":"white"}],"ip":0,"op":2916,"st":0,"ct":1,"bm":0}],"markers":[{"tm":195,"cm":"Plus .5s hold for loop","dr":30}],"props":{}}
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 10aa4cf..2db4a67 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Deïnstalleer app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apps wat in die afgelope # maand geïnstalleer is}other{Apps wat in die afgelope # maande geïnstalleer is}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apps wat meer as # maand gelede geïnstalleer is}other{Apps wat meer as # maande gelede geïnstalleer is}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Voorgestelde apps"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apps wat jy geïgnoreer het"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Appverstek"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Vingerafdruksensor"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Flitskennisgewings"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 236ab85..54bd1bf 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"መተግበሪያን አራግፍ"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{ባለፈው # ወር ውስጥ የተጫኑ መተግበሪያዎች}one{ባለፈው # ወር ውስጥ የተጫኑ መተግበሪያዎች}other{ባለፉት # ወራት ውስጥ የተጫኑ መተግበሪያዎች}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{ከ# ወር በላይ በፊት የተጫኑ መተግበሪያዎች}one{ከ# ወር በላይ በፊት የተጫኑ መተግበሪያዎች}other{ከ# ወራት በላይ በፊት የተጫኑ መተግበሪያዎች}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"በአስተያየት የተጠቆሙ መተግበሪያዎች"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"የሻሯቸው መተግበሪያዎች"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"የመተግበሪያ ነባሪ"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"የጣት አሻራ ዳሳሽ"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"የብልጭታ ማሳወቂያዎች"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 47a83bd..9746acf 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -3491,7 +3491,7 @@
<string name="screen_pinning_unlock_password" msgid="4957969621904790573">"طلب إدخال كلمة المرور قبل إزالة التثبيت"</string>
<string name="screen_pinning_unlock_none" msgid="2474959642431856316">"إقفال الجهاز عند إزالة التثبيت"</string>
<string name="confirm_sim_deletion_title" msgid="9199369003530237871">"تأكيد حذف بيانات شريحة SIM"</string>
- <string name="confirm_sim_deletion_description" msgid="4439657901673639063">"يجب إثبات هويتك قبل محو بيانات شريحة eSIM."</string>
+ <string name="confirm_sim_deletion_description" msgid="4439657901673639063">"يجب إثبات هويتك قبل محو بيانات شريحة eSIM"</string>
<string name="memtag_title" msgid="5096176296797727201">"الحماية المتقدمة للذاكرة (تجريبية)"</string>
<string name="memtag_toggle" msgid="8695028758462939212">"الحماية المتقدمة للذاكرة"</string>
<string name="memtag_intro" msgid="579408691329568953">"تساعدك هذه الميزة التجريبية على حماية جهازك من الأخطاء التي قد تُعرّض أمانك للخطر."</string>
@@ -4701,23 +4701,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"إلغاء تثبيت التطبيق"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{التطبيقات التي تم تثبيتها خلال آخر شهر}zero{التطبيقات التي تم تثبيتها خلال آخر # شهر}two{التطبيقات التي تم تثبيتها خلال آخر شهرَين}few{التطبيقات التي تم تثبيتها خلال آخر # شهور}many{التطبيقات التي تم تثبيتها خلال آخر # شهرًا}other{التطبيقات التي تم تثبيتها خلال آخر # شهر}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{التطبيقات التي تم تثبيتها قبل أكثر من شهر واحد}zero{التطبيقات التي تم تثبيتها قبل أكثر من # شهر}two{التطبيقات التي تم تثبيتها قبل أكثر من شهرَين}few{التطبيقات التي تم تثبيتها قبل أكثر من # شهور}many{التطبيقات التي تم تثبيتها قبل أكثر من # شهرًا}other{التطبيقات التي تم تثبيتها قبل أكثر من # شهر}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"التطبيقات المقترَحة"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"التطبيقات التي تم فيها إلغاء نسبة العرض إلى الارتفاع"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"نسبة العرض إلى الارتفاع التلقائية في التطبيق"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"أداة استشعار بصمة الإصبع"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"الإشعارات المصحوبة بوميض"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index dca2cd9..67d5ebc 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"এপ্ আনইনষ্টল কৰক"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{যোৱা # মাহত ইনষ্টল কৰা এপ্}one{যোৱা # মাহত ইনষ্টল কৰা এপ্}other{যোৱা # মাহত ইনষ্টল কৰা এপ্}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# মাহতকৈ আগত ইনষ্টল কৰা এপ্}one{# মাহতকৈ আগত ইনষ্টল কৰা এপ্}other{# মাহতকৈ আগত ইনষ্টল কৰা এপ্}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"আকাৰৰ অনুপাত"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"এই এপ্টো চাবলৈ এটা আকাৰৰ অনুপাত বাছনি কৰক যদি এইটো আপোনাৰ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ৰ সৈতে মিলাকৈ ডিজাইন কৰা হোৱা নাই"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"পৰামৰ্শিত এপ্সমূহ"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"আপুনি অভাৰৰাইড কৰা এপ্সমূহ"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"এপৰ ডিফ’ল্ট"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"সম্পূৰ্ণ স্ক্ৰীন"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"অৰ্ধ-স্ক্ৰীন"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"ডিভাইচৰ আকাৰৰ অনুপাত"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"১৬:৯"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"৩:২"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"৪:৩"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"আপুনি আকাৰৰ অনুপাত সলনি কৰিলে এপ্টো পুনৰ আৰম্ভ হ’ব। আপুনি ছেভ নকৰা সালসলনিসমূহ হেৰুৱাব পাৰে।"</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"ফিংগাৰপ্ৰিণ্ট ছেন্সৰ"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"ফ্লেশ্ব জাননী"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"ফ্লেশ্ব জাননীৰ বিষয়ে"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 47d5c6a..8b19001 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Tətbiqi sistemdən silin"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Son # ay ərzində quraşdırılmış tətbiqlər}other{Son # ay ərzində quraşdırılmış tətbiqlər}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Minimum # ay əvvəl quraşdırılmış tətbiqlər}other{Minimum # ay əvvəl quraşdırılmış tətbiqlər}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Təklif edilən tətbiqlər"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Əvəzlədiyiniz tətbiqlər"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Tətbiq defoltu"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Barmaq izi sensoru"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"İşıqlı bildirişlər"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 3c16fbe..5ceb5f9 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -4698,24 +4698,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Deinstaliraj aplikaciju"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Aplikacije instalirane u poslednjih mesec dana}one{Aplikacije instalirane u poslednjih # meseci}few{Aplikacije instalirane u poslednja # meseca}other{Aplikacije instalirane u poslednjih # meseci}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Aplikacije koje su instalirane pre više od # meseca}one{Aplikacije koje su instalirane pre više od # meseca}few{Aplikacije koje su instalirane pre više od # meseca}other{Aplikacije koje su instalirane pre više od # meseci}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Razmera"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Odaberite razmeru da biste pregledali sadržaj ove aplikacije ako nije dizajnirana da staje na uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Predložene aplikacije"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aplikacije koje ste zamenili"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Podrazumevana za aplikacije"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Ceo ekran"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Na pola ekrana"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Razmera uređaja"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"Aplikacija će se restartovati kada promenite razmeru. Možda ćete izgubiti nesačuvane promene."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Senzor za otisak prsta"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Treperuća obaveštenja"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"O treperućim obaveštenjima"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 3d6e0cc..8aacfbd 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -4699,23 +4699,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Выдаліць праграму"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Праграмы, усталяваныя за апошні # месяц}one{Праграмы, усталяваныя за апошні # месяц}few{Праграмы, усталяваныя за апошнія # месяцы}many{Праграмы, усталяваныя за апошнія # месяцаў}other{Праграмы, усталяваныя за апошнія # месяца}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Праграмы, усталяваныя больш як # месяц назад}one{Праграмы, усталяваныя больш як # месяц назад}few{Праграмы, усталяваныя больш як # месяцы назад}many{Праграмы, усталяваныя больш як # месяцаў назад}other{Праграмы, усталяваныя больш як # месяца назад}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Прапанаваныя праграмы"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Праграмы з перавызначаным вамі значэннем"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Стандартнае значэнне для праграмы"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Сканер адбіткаў пальцаў"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Флэш-апавяшчэнні"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 755134a..44e14e6 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Деинсталиране на приложението"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Приложения, инсталирани през последния # месец}other{Приложения, инсталирани през последните # месеца}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Приложения, инсталирани преди повече от # месец}other{Приложения, инсталирани преди повече от # месеца}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Предложени приложения"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Приложения, които сте заменили"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Стандартно за приложението"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Сензор за отпечатъци"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Известия с премигване"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index d25f699..eee3399 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"অ্যাপ আনইনস্টল করুন"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{শেষ # মাসের মধ্যে ইনস্টল করা অ্যাপ}one{শেষ # মাসের মধ্যে ইনস্টল করা অ্যাপ}other{শেষ # মাসের মধ্যে ইনস্টল করা অ্যাপ}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# মাসেরও বেশি সময় আগে অ্যাপ ইনস্টল করা হয়েছে}one{# মাসেরও বেশি সময় আগে অ্যাপ ইনস্টল করা হয়েছে}other{# মাসেরও বেশি সময় আগে অ্যাপ ইনস্টল করা হয়েছে}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"সাজেস্ট করা অ্যাপ"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"আপনার ওভাররাইড করা অ্যাপ"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"অ্যাপ ডিফল্ট"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"১৬:৯"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"৩:২"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"৪:৩"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"ফিঙ্গারপ্রিন্ট সেন্সর"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"ফ্ল্যাশ নোটিফিকেশন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index e48843c..60e6b84 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -4698,23 +4698,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Deinstaliraj aplikaciju"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Aplikacije instalirane u proteklom mjesecu}one{Aplikacije instalirane u proteklom # mjesecu}few{Aplikacije instalirane u protekla # mjeseca}other{Aplikacije instalirane u proteklih # mjeseci}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Aplikacije instalirane prije # mjesec}one{Aplikacije instalirane prije # mjesec}few{Aplikacije instalirane prije # mjeseca}other{Aplikacije instalirane prije # mjeseci}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Predložene aplikacije"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aplikacije koje ste zaobišli"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Zadano za aplikaciju"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Senzor za otisak prsta"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Obavještenja blicanjem"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5caa78e..4614758 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Desinstal·la l\'aplicació"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Aplicacions instal·lades en el # darrer mes}other{Aplicacions instal·lades en els # darrers mesos}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Aplicacions instal·lades fa més d’# mes}other{Aplicacions instal·lades fa més de # mesos}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Aplicacions suggerides"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aplicacions que has anul·lat"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Configuració predeterminada de l\'aplicació"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sensor d\'empremtes digitals"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Notificacions amb flaix"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 04fcde8..46efd0f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -4699,23 +4699,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Odinstalovat aplikaci"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Aplikace nainstalované během posledního # měsíce}few{Aplikace nainstalované během posledních # měsíců}many{Aplikace nainstalované během posledního # měsíce}other{Aplikace nainstalované během posledních # měsíců}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Aplikace nainstalované před více než # měsícem}few{Aplikace nainstalované před více než # měsíci}many{Aplikace nainstalované před více než # měsíce}other{Aplikace nainstalované před více než # měsíci}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Navrhované aplikace"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aplikace, které jste přepsali"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Výchozí možnost aplikace"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16 : 9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4 : 3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Snímač otisků prstů"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Světelná oznámení"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ed4dd3b..c675188 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -122,7 +122,7 @@
<string name="stylus_default_notes_app" msgid="4165657465911764628">"Ved tryk på knappen til styluspennen"</string>
<string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (arbejdsprofil)"</string>
<string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Skriv i tekstfelter"</string>
- <string name="stylus_ignore_button" msgid="7734540973145241391">"Ignorer alle trykker på knapper med styluspen"</string>
+ <string name="stylus_ignore_button" msgid="7734540973145241391">"Ignorer alle tryk på styluspen-knappen"</string>
<string name="stylus_connected_devices_title" msgid="2823967577941359812">"Styluspen"</string>
<string name="date_and_time" msgid="1788358029823431692">"Dato og klokkeslæt"</string>
<string name="proxy_settings_title" msgid="4201866858226087066">"Proxy"</string>
@@ -1942,7 +1942,7 @@
<string name="accessibility_control_timeout_preference_title" msgid="1443940538597464758">"Handlingstid"</string>
<string name="accessibility_control_timeout_preference_summary" msgid="4037051091059316310">"Denne tidsbaserede præference understøttes ikke af alle apps"</string>
<string name="accessibility_control_timeout_preference_intro_text" msgid="1398116710556762245">"Vælg, hvor længe der skal vises midlertidige meddelelser, som beder dig om at foretage en handling"</string>
- <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"Forsinkelse for hold finger på"</string>
+ <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"Forsinkelse for Tryk og hold"</string>
<string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"Ombytning af farver"</string>
<string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Brug ombytning af farver"</string>
<string name="accessibility_display_inversion_shortcut_title" msgid="6889624526691513462">"Genvej til ombytning af farver"</string>
@@ -2051,8 +2051,8 @@
<string name="daltonizer_mode_protanomaly_title" msgid="6392456967103014723">"Rød-grøn"</string>
<string name="daltonizer_mode_tritanomaly_title" msgid="2278786218762602022">"Blå-gul"</string>
<string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Gråtoner"</string>
- <string name="daltonizer_mode_deuteranomaly_summary" msgid="2117727423019598455">"Grøn svag, deuteranomali"</string>
- <string name="daltonizer_mode_protanomaly_summary" msgid="4617032854982040748">"Rød svag, protanomali"</string>
+ <string name="daltonizer_mode_deuteranomaly_summary" msgid="2117727423019598455">"Farvesvaghed for grøn, deuteranomali"</string>
+ <string name="daltonizer_mode_protanomaly_summary" msgid="4617032854982040748">"Farvesvaghed for rød, protanomali"</string>
<string name="daltonizer_mode_tritanomaly_summary" msgid="2428218320118180070">"Tritanomali"</string>
<string name="reduce_bright_colors_preference_title" msgid="2249314004651574997">"Ekstra dæmpet belysning"</string>
<string name="reduce_bright_colors_switch_title" msgid="1751678397884065312">"Ekstra dæmpet belysning af skærm"</string>
@@ -2723,7 +2723,7 @@
<string name="user_enable_calling_and_sms_confirm_message" msgid="367792286597449922">"Opkalds- og sms-historikken vil blive delt med denne bruger."</string>
<string name="user_revoke_admin_confirm_title" msgid="3057842401861731863">"Vil du fjerne administratorrettighederne?"</string>
<string name="user_revoke_admin_confirm_message" msgid="9207187319308572958">"Hvis du fjerner administratorrettigheder for denne bruger, kan du eller en anden administrator tildele dem igen senere."</string>
- <string name="emergency_info_title" msgid="8233682750953695582">"Info til nødsituationer"</string>
+ <string name="emergency_info_title" msgid="8233682750953695582">"Nødoplysninger"</string>
<string name="emergency_info_summary" msgid="8463622253016757697">"Oplysninger og kontakter for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="open_app_button" msgid="5025229765547191710">"Åbn <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="application_restrictions" msgid="276179173572729205">"Tillad apps og indhold"</string>
@@ -4430,7 +4430,7 @@
<string name="system_default_app_subtext" msgid="5212055189703164839">"Systemstandard"</string>
<string name="default_app_none" msgid="5420632042222036264">"Ingen"</string>
<string name="select_invalid_bug_report_handler_toast_text" msgid="8857326334015386692">"Dette valg er ikke længere gyldigt. Prøv igen."</string>
- <string name="power_menu_setting_name" msgid="2394440932633137229">"Hold afbryderU+00ADknappen nede"</string>
+ <string name="power_menu_setting_name" msgid="2394440932633137229">"Hold afbryderknappen nede"</string>
<string name="power_menu_long_press_category_title" msgid="1051146091093775002">"Hold afbryderknappen nede for at tilgå"</string>
<string name="power_menu_long_press_for_power_menu_title" msgid="477584639843663599">"Menu for afbryderknappen"</string>
<string name="power_menu_long_press_for_assistant_title" msgid="6557738348262616455">"Digital assistent"</string>
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Afinstaller app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apps installeret i den seneste måned}one{Apps installeret i de seneste}other{Apps installeret i de seneste # måneder}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apps, som er installeret for mere end # måned siden}one{Apps, som er installeret for mere end # måned siden}other{Apps, som er installeret for mere end # måneder siden}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Foreslåede apps"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apps, du har tilsidesat"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Standardindstilling for appen"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Fingeraftrykssensor"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Lysnotifikationer"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5d8451f..1f3a0f5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2725,7 +2725,7 @@
<string name="user_revoke_admin_confirm_message" msgid="9207187319308572958">"Wenn du die Administratorberechtigungen für diesen Nutzer entfernst, können sie von dir oder einem anderen Administrator später wiederhergestellt werden."</string>
<string name="emergency_info_title" msgid="8233682750953695582">"Notfallinformationen"</string>
<string name="emergency_info_summary" msgid="8463622253016757697">"Informationen und Kontaktdaten für <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
- <string name="open_app_button" msgid="5025229765547191710">"<xliff:g id="APP_NAME">%1$s</xliff:g> öffnen"</string>
+ <string name="open_app_button" msgid="5025229765547191710">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ öffnen"</string>
<string name="application_restrictions" msgid="276179173572729205">"Apps und Inhalte zulassen"</string>
<string name="apps_with_restrictions_header" msgid="5277698582872267931">"Apps mit Einschränkungen"</string>
<string name="apps_with_restrictions_settings_button" msgid="2648355133416902221">"App-Einstellungen erweitern"</string>
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"App deinstallieren"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apps, die innerhalb des letzten Monats installiert wurden}other{Apps, die innerhalb der letzten # Monate installiert wurden}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apps, die vor mehr als # Monat installiert wurden}other{Apps, die vor mehr als # Monaten installiert wurden}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Vorgeschlagene Apps"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apps mit Überschreibung"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"App-Standard"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Fingerabdrucksensor"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Aufleuchten bei Benachrichtigungen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 23b9308..0d9b0f3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -4579,7 +4579,7 @@
<string name="show_clip_access_notification_summary" msgid="474090757777203207">"Να εμφανίζεται ένα μήνυμα όταν οι εφαρμογές αποκτούν πρόσβαση σε κείμενο, εικόνες ή άλλο περιεχόμενο που έχετε αντιγράψει"</string>
<string name="all_apps" msgid="3054120149509114789">"Όλες οι εφαρμογές"</string>
<string name="request_manage_bluetooth_permission_dont_allow" msgid="8798061333407581300">"Να μην επιτρέπεται"</string>
- <string name="uwb_settings_title" msgid="8578498712312002231">"Ultra-Wideband (UWB)"</string>
+ <string name="uwb_settings_title" msgid="8578498712312002231">"Υπερευρεία ζώνη (UWB)"</string>
<string name="uwb_settings_summary" msgid="3074271396764672268">"Συμβάλλει στον προσδιορισμό της σχετικής θέσης των κοντινών συσκευών με UWB"</string>
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Απενεργοποιήστε τη λειτουργία πτήσης για να χρησιμοποιήσετε το UWB"</string>
<string name="uwb_settings_summary_no_uwb_regulatory" msgid="3465456428217979428">"Το UWB δεν είναι διαθέσιμο στην τρέχουσα τοποθεσία"</string>
@@ -4697,15 +4697,24 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Απεγκατάσταση εφαρμογής"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Εφαρμογές που εγκαταστάθηκαν τον τελευταίο # μήνα}other{Εφαρμογές που εγκαταστάθηκαν τους τελευταίους # μήνες}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Εφαρμογές που εγκαταστάθηκαν περισσότερο από # μήνα πριν}other{Εφαρμογές που εγκαταστάθηκαν περισσότερο από # μήνες πριν}}"</string>
- <string name="screen_size_title" msgid="2152383810632443047">"Μέγεθος οθόνης"</string>
- <string name="screen_size_summary" msgid="2037727675540344412">"Επιλέξτε έναν λόγο διαστάσεων για τις εφαρμογές σε περίπτωση που δεν έχουν βελτιστοποιηθεί για τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
+ <skip />
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
+ <skip />
<string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Προτεινόμενες εφαρμογές"</string>
<string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Εφαρμογές που έχετε παρακάμψει"</string>
<string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Προεπιλογή εφαρμογής"</string>
- <string name="user_aspect_ratio_half_screen" msgid="2154061661380605966">"Μισή οθόνη"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
+ <skip />
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
+ <skip />
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
+ <skip />
<string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
<string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
<string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
+ <skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Αισθητήρας δακτυλικών αποτυπωμάτων"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Ειδοποιήσεις με λάμψη"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Σχετικά με τις ειδοποιήσεις με λάμψη"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 7774c3c..635a22e 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -1455,7 +1455,7 @@
<string name="lockpassword_confirm_your_pattern_header_frp" msgid="5641858015891896427">"Verify pattern"</string>
<string name="lockpassword_confirm_your_pin_header_frp" msgid="8285647793164729982">"Verify PIN"</string>
<string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"Verify password"</string>
- <string name="lockpassword_remote_validation_header" msgid="4992647285784962073">"Verify it\'s you"</string>
+ <string name="lockpassword_remote_validation_header" msgid="4992647285784962073">"Verify that it\'s you"</string>
<string name="lockpassword_remote_validation_pattern_details" msgid="4655537780358707983">"To transfer Google Accounts, settings and more, enter your other device\'s pattern. Your pattern is encrypted."</string>
<string name="lockpassword_remote_validation_pin_details" msgid="2373654227583206297">"To transfer Google Accounts, settings and more, enter your other device\'s PIN. Your PIN is encrypted."</string>
<string name="lockpassword_remote_validation_password_details" msgid="3482328925925888340">"To transfer Google Accounts, settings and more, enter your other device\'s password. Your password is encrypted."</string>
@@ -4271,7 +4271,7 @@
<string name="mobile_network_use_sim_off" msgid="6303281166199670639">"Off"</string>
<string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"To disable this SIM, remove the SIM card"</string>
<string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"Tap to activate <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
- <string name="mobile_network_erase_sim" msgid="4629071168032714930">"Delete SIM"</string>
+ <string name="mobile_network_erase_sim" msgid="4629071168032714930">"Erase SIM"</string>
<string name="preferred_network_mode_title" msgid="3083431168988535628">"Preferred network type"</string>
<string name="preferred_network_mode_summary" msgid="537577807865497546">"Change the network operating mode"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferred network type"</string>
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Uninstall app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apps installed in the last # month}other{Apps installed in the last # months}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apps installed more than # month ago}other{Apps installed more than # months ago}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Aspect ratio"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Choose an aspect ratio to view this app if it hasn\'t been designed to fit your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Suggested apps"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apps you have overridden"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"App default"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Full-screen"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Half-screen"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Device aspect ratio"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"The app will restart when you change the aspect ratio. You may lose unsaved changes."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Fingerprint sensor"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Flash notifications"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"About flash notifications"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 8ac39f8..c2c53b7 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -4697,15 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Uninstall app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apps installed in the last # month}other{Apps installed in the last # months}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apps installed more than # month ago}other{Apps installed more than # months ago}}"</string>
- <string name="screen_size_title" msgid="2152383810632443047">"Screen size"</string>
- <string name="screen_size_summary" msgid="2037727675540344412">"Choose an aspect ratio for apps if they haven’t been optimized for your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Aspect ratio"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Choose an aspect ratio to view this app if it hasn\'t been designed to fit your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Suggested apps"</string>
<string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apps you have overridden"</string>
<string name="user_aspect_ratio_app_default" msgid="270065763307617837">"App default"</string>
- <string name="user_aspect_ratio_half_screen" msgid="2154061661380605966">"Half-screen"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Full screen"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Half screen"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Device aspect ratio"</string>
<string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
<string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
<string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"The app will restart when you change aspect ratio. You may lose unsaved changes."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Fingerprint sensor"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Flash notifications"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"About flash notifications"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 5547404..9485394 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1455,7 +1455,7 @@
<string name="lockpassword_confirm_your_pattern_header_frp" msgid="5641858015891896427">"Verify pattern"</string>
<string name="lockpassword_confirm_your_pin_header_frp" msgid="8285647793164729982">"Verify PIN"</string>
<string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"Verify password"</string>
- <string name="lockpassword_remote_validation_header" msgid="4992647285784962073">"Verify it\'s you"</string>
+ <string name="lockpassword_remote_validation_header" msgid="4992647285784962073">"Verify that it\'s you"</string>
<string name="lockpassword_remote_validation_pattern_details" msgid="4655537780358707983">"To transfer Google Accounts, settings and more, enter your other device\'s pattern. Your pattern is encrypted."</string>
<string name="lockpassword_remote_validation_pin_details" msgid="2373654227583206297">"To transfer Google Accounts, settings and more, enter your other device\'s PIN. Your PIN is encrypted."</string>
<string name="lockpassword_remote_validation_password_details" msgid="3482328925925888340">"To transfer Google Accounts, settings and more, enter your other device\'s password. Your password is encrypted."</string>
@@ -4271,7 +4271,7 @@
<string name="mobile_network_use_sim_off" msgid="6303281166199670639">"Off"</string>
<string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"To disable this SIM, remove the SIM card"</string>
<string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"Tap to activate <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
- <string name="mobile_network_erase_sim" msgid="4629071168032714930">"Delete SIM"</string>
+ <string name="mobile_network_erase_sim" msgid="4629071168032714930">"Erase SIM"</string>
<string name="preferred_network_mode_title" msgid="3083431168988535628">"Preferred network type"</string>
<string name="preferred_network_mode_summary" msgid="537577807865497546">"Change the network operating mode"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferred network type"</string>
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Uninstall app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apps installed in the last # month}other{Apps installed in the last # months}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apps installed more than # month ago}other{Apps installed more than # months ago}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Aspect ratio"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Choose an aspect ratio to view this app if it hasn\'t been designed to fit your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Suggested apps"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apps you have overridden"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"App default"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Full-screen"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Half-screen"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Device aspect ratio"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"The app will restart when you change the aspect ratio. You may lose unsaved changes."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Fingerprint sensor"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Flash notifications"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"About flash notifications"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index e22c9c6..231edb6 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1455,7 +1455,7 @@
<string name="lockpassword_confirm_your_pattern_header_frp" msgid="5641858015891896427">"Verify pattern"</string>
<string name="lockpassword_confirm_your_pin_header_frp" msgid="8285647793164729982">"Verify PIN"</string>
<string name="lockpassword_confirm_your_password_header_frp" msgid="7932240547542564033">"Verify password"</string>
- <string name="lockpassword_remote_validation_header" msgid="4992647285784962073">"Verify it\'s you"</string>
+ <string name="lockpassword_remote_validation_header" msgid="4992647285784962073">"Verify that it\'s you"</string>
<string name="lockpassword_remote_validation_pattern_details" msgid="4655537780358707983">"To transfer Google Accounts, settings and more, enter your other device\'s pattern. Your pattern is encrypted."</string>
<string name="lockpassword_remote_validation_pin_details" msgid="2373654227583206297">"To transfer Google Accounts, settings and more, enter your other device\'s PIN. Your PIN is encrypted."</string>
<string name="lockpassword_remote_validation_password_details" msgid="3482328925925888340">"To transfer Google Accounts, settings and more, enter your other device\'s password. Your password is encrypted."</string>
@@ -4271,7 +4271,7 @@
<string name="mobile_network_use_sim_off" msgid="6303281166199670639">"Off"</string>
<string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"To disable this SIM, remove the SIM card"</string>
<string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"Tap to activate <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
- <string name="mobile_network_erase_sim" msgid="4629071168032714930">"Delete SIM"</string>
+ <string name="mobile_network_erase_sim" msgid="4629071168032714930">"Erase SIM"</string>
<string name="preferred_network_mode_title" msgid="3083431168988535628">"Preferred network type"</string>
<string name="preferred_network_mode_summary" msgid="537577807865497546">"Change the network operating mode"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferred network type"</string>
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Uninstall app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apps installed in the last # month}other{Apps installed in the last # months}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apps installed more than # month ago}other{Apps installed more than # months ago}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Aspect ratio"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Choose an aspect ratio to view this app if it hasn\'t been designed to fit your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Suggested apps"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apps you have overridden"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"App default"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Full-screen"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Half-screen"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Device aspect ratio"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"The app will restart when you change the aspect ratio. You may lose unsaved changes."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Fingerprint sensor"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Flash notifications"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"About flash notifications"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index ef6dee5..c05f3a5 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -4697,15 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Uninstall app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apps installed in the last # month}other{Apps installed in the last # months}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apps installed more than # month ago}other{Apps installed more than # months ago}}"</string>
- <string name="screen_size_title" msgid="2152383810632443047">"Screen size"</string>
- <string name="screen_size_summary" msgid="2037727675540344412">"Choose an aspect ratio for apps if they haven’t been optimized for your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Aspect ratio"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Choose an aspect ratio to view this app if it hasn\'t been designed to fit your <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Suggested apps"</string>
<string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apps you have overridden"</string>
<string name="user_aspect_ratio_app_default" msgid="270065763307617837">"App default"</string>
- <string name="user_aspect_ratio_half_screen" msgid="2154061661380605966">"Half-screen"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Full screen"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Half screen"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Device aspect ratio"</string>
<string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
<string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
<string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"The app will restart when you change aspect ratio. You may lose unsaved changes."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Fingerprint sensor"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Flash notifications"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"About flash notifications"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7c55daf..f2f8b4f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Desinstalar app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apps instaladas en el último # mes}other{Apps instaladas en los últimos # meses}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apps instaladas hace más de # mes}other{Apps instaladas hace más de # meses}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Relación de aspecto"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Elige una relación de aspecto para ver esta app si no se diseñó para adaptarse a tu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Apps sugeridas"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apps que anulaste"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Predeterminada de la app"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Pantalla completa"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Media pantalla"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Relación de aspecto del dispositivo"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"La app se reiniciará cuando cambies la relación de aspecto. Es posible que pierdas cambios sin guardar."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sensor de huellas dactilares"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Notificaciones con flash"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Info. sobre notificaciones con flash"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c6286e8..26f99d6 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Desinstalar aplicación"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Aplicaciones instaladas desde hace # mes}other{Aplicaciones instaladas desde hace # meses}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Aplicaciones instaladas hace más de # mes}other{Aplicaciones instaladas hace más de # meses}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Relación de aspecto"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Elige una relación de aspecto para ver esta aplicación si no se ha diseñado para adaptarse a tu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Aplicaciones sugeridas"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aplicaciones donde se ha anulado"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Predeterminado de la aplicación"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Pantalla completa"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Media pantalla"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Relación de aspecto del dispositivo"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"La aplicación se reiniciará cuando cambies la relación de aspecto. Puede que pierdas los cambios sin guardar."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sensor de huellas digitales"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Notificaciones con flash"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Acerca de las notificaciones con flash"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 0a177f9..192221e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Desinstalli rakendus"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Rakendused, mis installiti viimase # kuu jooksul}other{Rakendused, mis installiti viimase # kuu jooksul}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Rakendused, mis installiti rohkem kui # kuu tagasi}other{Rakendused, mis installiti rohkem kui # kuud tagasi}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Soovitatud rakendused"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Rakendused, mille olete alistanud"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Rakenduse vaikeseade"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sõrmejäljeandur"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Vilkuvad märguanded"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index fbef81d..186d889 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Desinstalatu aplikazioa"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Azken # hilabetean instalatutako aplikazioak}other{Azken # hilabeteetan instalatutako aplikazioak}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Duela # hilabete baino gehiago instalatutako aplikazioak}other{Duela # hilabete baino gehiago instalatutako aplikazioak}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Iradokitako aplikazioak"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aspektu-erlazioa ordeztu zaien aplikazioak"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Aplikazioen balio lehenetsia"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Hatz-marken sentsorea"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Argi-jakinarazpenak"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 824c707..90674ea 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"حذف نصب برنامه"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{برنامههایی که طی # ماه گذشته نصب شده است}one{برنامههایی که طی # ماه گذشته نصب شده است}other{برنامههایی که طی # ماه گذشته نصب شده است}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{برنامههایی که بیشاز # ماه از نصب آنها میگذرد}one{برنامههایی که بیشاز # ماه از نصب آنها میگذرد}other{برنامههایی که بیشاز # ماه از نصب آنها میگذرد}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"نسبت ابعادی"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"اگر این برنامه متناسب با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> شما طراحی نشده است، نسبت ابعادی را برای مشاهده آن انتخاب کنید"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"برنامههای پیشنهادی"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"برنامههایی که ملغی کردهاید"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"پیشفرض برنامه"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"تمامصفحه"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"نیمصفحه"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"نسبت ابعادی دستگاه"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"۱۶:۹"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"۳:۲"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"۴:۳"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"هنگام تغییر نسبت ابعادی، برنامه بازراهاندازی میشود. ممکن است تغییرات ذخیرهنشده را ازدست بدهید."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"حسگر اثر انگشت"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"اعلانهای چشمکزن"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"درباره اعلانهای چشمکزن"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 846201c..c52e796 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Poista sovellus"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Viimeisen # kuukauden aikana asennetut sovellukset}other{Viimeisten # kuukauden aikana asennetut sovellukset}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Yli # kuukausi sitten asennetut sovellukset}other{Yli # kuukautta sitten asennetut sovellukset}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Ehdotetut sovellukset"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Ohitetut sovellukset"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Sovelluksen oletus"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sormenjälkitunnistin"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Valoilmoitukset"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 6fc4fb0..7d941e8 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1964,15 +1964,15 @@
<string name="accessibility_autoclick_shorter_desc" msgid="7631013255724544348">"Plus court"</string>
<string name="accessibility_autoclick_longer_desc" msgid="2566025502981487443">"Plus long"</string>
<string name="accessibility_autoclick_seekbar_desc" msgid="8363959277814621118">"Durée du clic automatique"</string>
- <string name="accessibility_vibration_settings_title" msgid="936301142478631993">"Vibrations et rétroactions haptiques"</string>
+ <string name="accessibility_vibration_settings_title" msgid="936301142478631993">"Vibrations et effets tactils"</string>
<string name="accessibility_vibration_settings_summary" msgid="3690308537483465527">"Contrôler la force des vibrations pour différentes utilisations"</string>
<string name="accessibility_vibration_settings_state_on" msgid="5566026932372832502">"Activées"</string>
<string name="accessibility_vibration_settings_state_off" msgid="7946588741954981703">"Désactivées"</string>
<string name="accessibility_vibration_setting_disabled_for_silent_mode_summary" msgid="3982701772953323190">"Le paramètre est désactivé parce que l\'appareil est en mode silencieux"</string>
<string name="accessibility_call_vibration_category_title" msgid="2545607568768192318">"Appels"</string>
<string name="accessibility_notification_alarm_vibration_category_title" msgid="2683635252414849417">"Notifications et alarmes"</string>
- <string name="accessibility_interactive_haptics_category_title" msgid="3162855291184592021">"Rétroactions haptiques interactives"</string>
- <string name="accessibility_vibration_primary_switch_title" msgid="6162579254864450592">"Utiliser les vibrations et les rétroactions haptiques"</string>
+ <string name="accessibility_interactive_haptics_category_title" msgid="3162855291184592021">"Effets tactils interactifs"</string>
+ <string name="accessibility_vibration_primary_switch_title" msgid="6162579254864450592">"Utiliser les vibrations et les effets tactils"</string>
<string name="accessibility_alarm_vibration_title" msgid="4661294337828522745">"Vibration pour les alarmes"</string>
<string name="accessibility_media_vibration_title" msgid="1372073715403945428">"Vibration multimédia"</string>
<string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibration pour la sonnerie"</string>
@@ -2305,7 +2305,7 @@
<string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"Jamais"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"à <xliff:g id="PERCENT">%1$s</xliff:g> d\'autonomie restante"</string>
<string name="battery_percentage" msgid="1779934245963043490">"Pourcentage de charge de la pile"</string>
- <string name="battery_percentage_description" msgid="2321465139126125541">"Afficher le pourcentage de charge de la pile dans la barre d\'état"</string>
+ <string name="battery_percentage_description" msgid="2321465139126125541">"Le pourcentage de charge de la pile s\'affiche dans la barre d\'état"</string>
<string name="battery_usage_chart_graph_hint_last_full_charge" msgid="6570336408060566877">"Niveau de la pile depuis la dernière recharge complète"</string>
<string name="battery_usage_chart_graph_hint" msgid="9182079098173323005">"Niveau de la pile, dernières 24 h"</string>
<string name="battery_app_usage" msgid="8976453608783133770">"Utilisation des applications depuis la dernière charge complète"</string>
@@ -2966,14 +2966,14 @@
<string name="keywords_default_payment_app" msgid="5162298193637362104">"paiement, par défaut"</string>
<string name="keywords_ambient_display" msgid="3149287105145443697">"notification entrante"</string>
<string name="keywords_hotspot_tethering" msgid="3688439689671232627">"partage de connexion usb, partage de connexion bluetooth, partage de connexion wi-fi, fonction modem"</string>
- <string name="keywords_accessibility_vibration_primary_switch" msgid="730692154347231253">"rétroactions haptiques, vibrer, vibration"</string>
+ <string name="keywords_accessibility_vibration_primary_switch" msgid="730692154347231253">"effets tactils, vibrer, vibration"</string>
<string name="keywords_touch_vibration" msgid="1125291201902251273">"haptique, vibrer, écran, sensibilité"</string>
<string name="keywords_ring_vibration" msgid="1736301626537417541">"haptique, vibration, téléphone, appel, sensibilité, sonnerie"</string>
<string name="keywords_ramping_ringer_vibration" msgid="3678966746742257366">"haptique, vibration, téléphone, appel, sonnerie, graduellement"</string>
<string name="keywords_notification_vibration" msgid="2620799301276142183">"haptique, vibration, sensibilité, notification"</string>
<string name="keywords_alarm_vibration" msgid="4833220371621521817">"haptique, vibration, sensibilité, alarme"</string>
<string name="keywords_media_vibration" msgid="723896490102792327">"haptique, vibration, sensibilité, multimédia"</string>
- <string name="keywords_vibration" msgid="670455132028025952">"rétroactions haptiques, vibrer, vibration"</string>
+ <string name="keywords_vibration" msgid="670455132028025952">"effets tactils, vibrer, vibration"</string>
<string name="keywords_battery_saver_sticky" msgid="1646191718840975110">"économiseur de pile, fixe, persistant, économie d\'énergie, pile"</string>
<string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, horaire, économiseur de pile, économie d\'énergie, pile, automatique, pour cent"</string>
<string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, appels avancés, appels 4g"</string>
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Désinstaller l\'application"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Applications installées au cours du dernier mois}one{Applications installées au cours du dernier (#) mois}other{Applications installées au cours des # derniers mois}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Applications installées il y a plus de # mois}one{Applications installées il y a plus de # mois}other{Applications installées il y a plus de # mois}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Applications suggérées"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Applications que vous avez remplacées"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Application par défaut"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Capteur d\'empreintes digitales"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Notifications lumineuses"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2a015e9..508906b5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Désinstaller l\'appli"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Applis installées depuis # mois}one{Applis installées depuis # mois}other{Applis installées depuis # mois}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Applis installées il y a plus de # mois}one{Applis installées il y a plus de # mois}other{Applis installées il y a plus de # mois}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Applis suggérées"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Applis que vous avez ignorées"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Paramètre par défaut de l\'appli"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Lecteur d\'empreinte digitale"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Notifications avec flash"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 7357d5f..5801d1d 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Desinstalar aplicación"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Aplicacións instaladas no último mes}other{Aplicacións instaladas nos últimos # meses}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Aplicacións instaladas hai máis de # mes}other{Aplicacións instaladas hai máis de # meses}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Aplicacións recomendadas"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aplicacións que ignoraches"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Opción predeterminada da aplicación"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sensor de impresión dixital"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Notificacións con luz"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 6d8da19..aca8cc9 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"ઍપ અનઇન્સ્ટૉલ કરો"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{છેલ્લા # મહિનામાં ઇન્સ્ટૉલ કરેલી ઍપ}one{છેલ્લા # મહિનામાં ઇન્સ્ટૉલ કરેલી ઍપ}other{છેલ્લા # મહિનામાં ઇન્સ્ટૉલ કરેલી ઍપ}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# મહિના કરતાં વધુ સમય પહેલાં ઇન્સ્ટૉલ કરેલી ઍપ}one{# મહિના કરતાં વધુ સમય પહેલાં ઇન્સ્ટૉલ કરેલી ઍપ}other{# મહિના કરતાં વધુ સમય પહેલાં ઇન્સ્ટૉલ કરેલી ઍપ}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"સાપેક્ષ ગુણોત્તર"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"જો આ ઍપ તમારા <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ને અનુરૂપ ડિઝાઇન કરેલી ન હોય, તો તેને જોવા માટે કોઈ સાપેક્ષ ગુણોત્તર પસંદ કરો"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"સૂચવેલી ઍપ"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"તમે ઓવરરાઇડ કરેલી ઍપ"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"ઍપ ડિફૉલ્ટ"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"પૂર્ણ સ્ક્રીન"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"અડધી સ્ક્રીન"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"ડિવાઇસનો સાપેક્ષ ગુણોત્તર"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"જ્યારે તમે સાપેક્ષ ગુણોત્તરમાં ફેરફાર કરશો ત્યારે ઍપ ફરી શરૂ થશે. તમે સાચવ્યા ન હોય એવા ફેરફારો ગુમાવો એમ બને."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"ફિંગરપ્રિન્ટ સેન્સર"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"ફ્લૅશ નોટિફિકેશન"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"ફ્લૅશ નોટિફિકેશન વિશે"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 024f187..c24caa8 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"ऐप्लिकेशन अनइंस्टॉल करें"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{पिछले # महीने में इंस्टॉल किए गए ऐप्लिकेशन}one{पिछले # महीने में इंस्टॉल किए गए ऐप्लिकेशन}other{पिछले # महीनों में इंस्टॉल किए गए ऐप्लिकेशन}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{ऐप्लिकेशन, # महीने से भी पहले इंस्टॉल किए गए}one{ऐप्लिकेशन, # महीने से भी पहले इंस्टॉल किए गए}other{ऐप्लिकेशन, # महीने से भी पहले इंस्टॉल किए गए}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"सुझाए गए ऐप्लिकेशन"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"वे ऐप्लिकेशन जिन्हें आपने ओवरराइड किया है"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"ऐप्लिकेशन का डिफ़ॉल्ट आसपेक्ट रेशियो"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"फ़िंगरप्रिंट सेंसर"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"फ़्लैश के साथ मिलने वाली सूचनाएं"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b83923f..47f2d38 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -4698,23 +4698,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Deinstaliraj aplikaciju"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Aplikacije instalirane u posljednji # mjesec}one{Aplikacije instalirane u posljednji # mjesec}few{Aplikacije instalirane u posljednja # mjeseca}other{Aplikacije instalirane u posljednjih # mjeseci}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Aplikacije instalirane prije više od # mjeseca}one{Aplikacije instalirane prije više od # mjeseca}few{Aplikacije instalirane prije više od # mjeseca}other{Aplikacije instalirane prije više od # mjeseci}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Predložene aplikacije"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aplikacije koje ste nadjačali"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Zadano za aplikaciju"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Senzor otiska prsta"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Bljeskajuće obavijesti"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c1d344d..968d3ba 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Alkalmazás eltávolítása"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Az elmúlt # hónapban telepített alkalmazások}other{Az elmúlt # hónapban telepített alkalmazások}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Az alkalmazások # hónapnál régebben lettek telepítve}other{Az alkalmazások # hónapnál régebben lettek telepítve}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Javasolt alkalmazások"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Ön által felülírt alkalmazások"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Alkalmazás alapértelmezett értéke"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Ujjlenyomat-érzékelő"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Villogó értesítések"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 4e03b00..64dd30d 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Ապատեղադրել հավելվածը"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Հավելվածներ, որոնք տեղադրվել են վերջին # ամսվա ընթացքում}one{Հավելվածներ, որոնք տեղադրվել են վերջին # ամսվա ընթացքում}other{Հավելվածներ, որոնք տեղադրվել են վերջին # ամսվա ընթացքում}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Հավելվածներ, որոնք տեղադրվել են ավելի քան # ամիս առաջ}one{Հավելվածներ, որոնք տեղադրվել են ավելի քան # ամիս առաջ}other{Հավելվածներ, որոնք տեղադրվել են ավելի քան # ամիս առաջ}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Առաջարկվող հավելվածներ"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Հավելվածներ, որոնց կողմերի հարաբերակցությունը փոխարինել եք"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Հավելվածի կանխադրված տարբերակ"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Մատնահետքերի սկաներ"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Թարթող ծանուցումներ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a0a7346..7488c57 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Uninstal aplikasi"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Aplikasi yang diinstal dalam # bulan terakhir}other{Aplikasi yang diinstal dalam # bulan terakhir}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Aplikasi diinstal lebih dari # bulan lalu}other{Aplikasi diinstal lebih dari # bulan lalu}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Aplikasi yang disarankan"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aplikasi yang rasio aspeknya diganti"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Default aplikasi"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sensor sidik jari"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Notifikasi flash"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 7072387..f865217 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Fjarlægja forrit"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Forrit sem voru sett upp á síðasta # mánuði}one{Forrit sem voru sett upp á síðasta # mánuði}other{Forrit sem voru sett upp á síðustu # mánuðum}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Forrit sem voru sett upp fyrir # mánuði}one{Forrit sem voru sett upp fyrir # mánuði}other{Forrit sem voru sett upp fyrir # mánuðum}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Tillögur að forritum"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Forrit sem þú hefur hnekkt"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Sjálfgefið í forriti"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Fingrafaralesari"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Flasstilkynningar"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4ee6c3c..37ef738 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2723,7 +2723,7 @@
<string name="user_enable_calling_and_sms_confirm_message" msgid="367792286597449922">"La cronologia chiamate e SMS verrà condivisa con questo utente."</string>
<string name="user_revoke_admin_confirm_title" msgid="3057842401861731863">"Vuoi rimuovere i privilegi amministrativi?"</string>
<string name="user_revoke_admin_confirm_message" msgid="9207187319308572958">"Se rimuovi i privilegi amministrativi per questo utente, tu o un altro amministratore potrete concederglieli di nuovo in un secondo momento."</string>
- <string name="emergency_info_title" msgid="8233682750953695582">"Informazioni per le emergenze"</string>
+ <string name="emergency_info_title" msgid="8233682750953695582">"Informazioni d\'emergenza"</string>
<string name="emergency_info_summary" msgid="8463622253016757697">"Dati e contatti di <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="open_app_button" msgid="5025229765547191710">"Apri <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="application_restrictions" msgid="276179173572729205">"Consenti app e contenuti"</string>
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Disinstalla app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{App installate nell\'ultimo mese}other{App installate negli ultimi # mesi}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{App installate più di # mese fa}other{App installate più di # mesi fa}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"App consigliate"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"App sottoposte a override"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Valore predefinito dell\'app"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sensore di impronte digitali"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Flash di notifica"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 74d6b24..8f78e68 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -4698,15 +4698,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"הסרת האפליקציה"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{אפליקציות שהותקנו במהלך החודש האחרון}one{אפליקציות שהותקנו במהלך # החודשים האחרונים}two{האפליקציות הותקנו במהלך החודשיים האחרונים}other{אפליקציות שהותקנו במהלך # החודשים האחרונים}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{האפליקציות הותקנו לפני יותר מחודש אחד (#)}one{האפליקציות הותקנו לפני יותר מ-# חודשים}two{האפליקציות הותקנו לפני יותר מחודשיים (#)}other{האפליקציות הותקנו לפני יותר מ-# חודשים}}"</string>
- <string name="screen_size_title" msgid="2152383810632443047">"גודל המסך"</string>
- <string name="screen_size_summary" msgid="2037727675540344412">"יש לבחור את יחס הגובה-רוחב לאפליקציות שלא הותאמו למכשיר <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"יחס גובה-רוחב"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"צריך לבחור יחס גובה-רוחב להצגת האפליקציה הזו אם היא לא תוכננה להתאים למכשיר <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"הצעות לאפליקציות"</string>
<string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"אפליקציות ששינית מברירת המחדל"</string>
<string name="user_aspect_ratio_app_default" msgid="270065763307617837">"ברירת המחדל של האפליקציה"</string>
- <string name="user_aspect_ratio_half_screen" msgid="2154061661380605966">"חצי מסך"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"מסך מלא"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"חצי מסך"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"יחס גובה-רוחב של המכשיר"</string>
<string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
<string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
<string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"האפליקציה תופעל מחדש לאחר שינוי יחס הגובה-רוחב. ייתכן ששינויים שלא נשמרו יאבדו."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"חיישן טביעות אצבע"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"התראות הבהוב"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"מידע על התראות הבהוב"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a7ea2cd..b9b5c83 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -241,10 +241,10 @@
<string name="zone_time_type_standard" msgid="6865420715430680352">"標準時間"</string>
<string name="zone_menu_by_region" msgid="2963565278710225652">"地域で選択"</string>
<string name="zone_menu_by_offset" msgid="1257702747474426745">"UTC オフセットで選択"</string>
- <string name="lock_after_timeout" msgid="8682769000437403444">"画面消灯後からロックまでの時間"</string>
+ <string name="lock_after_timeout" msgid="8682769000437403444">"画面が自動的に消灯してからロックまでの時間"</string>
<string name="lock_after_timeout_summary" msgid="4869265514658147304">"タイムアウトから <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
<string name="lock_immediately_summary_with_exception" msgid="40819611828339044">"画面消灯の直後にロック（<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> がロック解除を管理している場合を除く）"</string>
- <string name="lock_after_timeout_summary_with_exception" msgid="3441806647509073124">"画面消灯後から<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>後にロック（<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> がロック解除を管理している場合を除く）"</string>
+ <string name="lock_after_timeout_summary_with_exception" msgid="3441806647509073124">"画面が自動的に消灯してから<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>後にロック（<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> がロック解除を管理している場合を除く）"</string>
<string name="owner_info_settings_title" msgid="3555626140700093017">"ロック画面にテキストを追加"</string>
<string name="owner_info_settings_summary" msgid="347238313388083297">"なし"</string>
<string name="owner_info_settings_edit_text_hint" msgid="841926875876050274">"例: 佐藤のAndroid"</string>
@@ -2300,7 +2300,7 @@
<!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
<skip />
<string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ON にする"</string>
- <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"バッテリー セーバーを使用する"</string>
+ <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"バッテリー セーバーを使用"</string>
<string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"自動的にON"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"使用しない"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"バッテリー残量が <xliff:g id="PERCENT">%1$s</xliff:g> になったとき"</string>
@@ -2715,7 +2715,7 @@
<string name="remove_guest_on_exit_dialog_message" msgid="8112409834021851883">"今回のゲスト セッションのアプリとデータが今すぐ削除され、今後のゲストのアクティビティはすべて、ゲストモードを終了するたびに削除されます"</string>
<string name="remove_guest_on_exit_keywords" msgid="4961310523576166193">"削除, ゲスト, アクティビティ, 消す, データ, ビジター, 消去"</string>
<string name="enable_guest_calling" msgid="4620657197834392094">"ゲストに通話を許可する"</string>
- <string name="enable_guest_calling_summary" msgid="4748224917641204782">"発信履歴がゲストユーザーと共有されます。"</string>
+ <string name="enable_guest_calling_summary" msgid="4748224917641204782">"通話履歴がゲストユーザーと共有されます。"</string>
<string name="user_enable_calling_sms" msgid="8546430559552381324">"通話と SMS を ON"</string>
<string name="user_grant_admin" msgid="5942118263054572074">"このユーザーを管理者にする"</string>
<string name="user_remove_user" msgid="8468203789739693845">"ユーザーの削除"</string>
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"アプリをアンインストール"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{過去 # か月間にインストールされたアプリ}other{過去 # か月間にインストールされたアプリ}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# か月以上前にインストールされたアプリ}other{# か月以上前にインストールされたアプリ}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"アスペクト比"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"お使いの <xliff:g id="DEVICE_NAME">%1$s</xliff:g> にあわせた設計になっていないアプリの場合は、表示のアスペクト比を変更してください"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"推奨アプリ"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"オーバーライドを指定したアプリ"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"アプリのデフォルト"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"全画面表示"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"画面半分のみ表示"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"デバイスのアスペクト比"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"アスペクト比を変更すると、アプリが再起動します。保存されていない変更は失われる可能性があります。"</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"指紋認証センサー"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"点滅による通知"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"点滅による通知について"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 50704ec..d1bb73f 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"აპის დეინსტალაცია"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{ბოლო # თვეში დაყენებული აპები}other{ბოლო # თვეში დაყენებული აპები}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{აპის ინსტალაციიდან გასულია # თვეზე მეტი}other{აპის ინსტალაციიდან გასულია # თვეზე მეტი}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"თანაფარდობა"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"აირჩიეთ თანაფარდობა ამ აპის სანახავად, თუ ის არ არის შემუშავებული თქვენი <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ის შესაფერისად"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"შემოთავაზებული აპები"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"აპები, რომლებიც უგულებელყავით"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"აპი ნაგულისხმევად"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"სრული ეკრანი"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"ნახევარი ეკრანი"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"მოწყობილობის თანაფარდობა"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"აპი გადაიტვირთება, როდესაც შეცვლით თანაფარდობას. შეიძლება დაკარგოთ შეუნახავი ცვლილებები."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"თითის ანაბეჭდის სენსორი"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"ბლიც გაფრთხილებები"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"ბლიც გაფრთხილებების შესახებ"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 36a1e0e..0977881 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Қолданбаны жою"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Соңғы # айда орнатылған қолданбалар}other{Соңғы # айда орнатылған қолданбалар}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# айдан бұрын орнатылған қолданбалар}other{# айдан бұрын орнатылған қолданбалар}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Ұсынылған қолданбалар"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Қайта анықталған қолданбалар"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Әдепкі қолданба"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Саусақ ізін оқу сканері"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Жарқылды хабарландырулар"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index e206fde..c449e7e 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"លុបកម្មវិធី"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{កម្មវិធីដែលបានដំឡើង # ខែចុងក្រោយ}other{កម្មវិធីដែលបានដំឡើង # ខែចុងក្រោយ}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{កម្មវិធីដែលបានដំឡើងលើសពី # ខែមុន}other{កម្មវិធីដែលបានដំឡើងលើសពី # ខែមុន}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"សមាមាត្រ"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"ជ្រើសរើសសមាមាត្រដើម្បីមើលកម្មវិធីនេះ ប្រសិនបើសមាមាត្រនេះមិនត្រូវបានកំណត់ឱ្យស័ក្តិសមនឹង <xliff:g id="DEVICE_NAME">%1$s</xliff:g> របស់អ្នក"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"កម្មវិធីដែលបានណែនាំ"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"កម្មវិធីដែលអ្នកបានលុបពីលើ"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"លំនាំដើមនៃកម្មវិធី"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"ពេញអេក្រង់"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"ពាក់កណ្ដាលអេក្រង់"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"សមាមាត្រឧបករណ៍"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"កម្មវិធីនេះនឹងចាប់ផ្ដើមឡើងវិញ នៅពេលអ្នកប្ដូរសមាមាត្រ។ អ្នកអាចបាត់បង់ការផ្លាស់ប្ដូរដែលមិនបានរក្សាទុក។"</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"សេនស័រចាប់ស្នាមម្រាមដៃ"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"ការជូនដំណឹងបាញ់ពន្លឺ"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"អំពីការជូនដំណឹងបាញ់ពន្លឺ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 228dfea..90bd0c8 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -4697,15 +4697,24 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"ಆ್ಯಪ್ ಅನ್ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{ಕಳೆದ # ತಿಂಗಳಲ್ಲಿ ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿದ ಆ್ಯಪ್ಗಳು}one{ಕಳೆದ # ತಿಂಗಳಲ್ಲಿ ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿದ ಆ್ಯಪ್ಗಳು}other{ಕಳೆದ # ತಿಂಗಳಲ್ಲಿ ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿದ ಆ್ಯಪ್ಗಳು}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# ತಿಂಗಳ ಹಿಂದೆ ಆ್ಯಪ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ}one{# ತಿಂಗಳುಗಳ ಹಿಂದೆ ಆ್ಯಪ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ}other{# ತಿಂಗಳುಗಳ ಹಿಂದೆ ಆ್ಯಪ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ}}"</string>
- <string name="screen_size_title" msgid="2152383810632443047">"ಸ್ಕ್ರೀನ್ ಗಾತ್ರ"</string>
- <string name="screen_size_summary" msgid="2037727675540344412">"ಆ್ಯಪ್ಗಳನ್ನು ನಿಮ್ಮ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಾಧನಕ್ಕಾಗಿ ಆಪ್ಟಿಮೈಸ್ ಮಾಡದೇ ಇದ್ದರೆ ಅವುಗಳಿಗೆ ದೃಶ್ಯಾನುಪಾತವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
+ <skip />
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
+ <skip />
<string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"ಸೂಚಿಸಿರುವ ಆ್ಯಪ್ಗಳು"</string>
<string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"ನೀವು ಅತಿಕ್ರಮಿಸಿರುವ ಆ್ಯಪ್ಗಳು"</string>
<string name="user_aspect_ratio_app_default" msgid="270065763307617837">"ಆ್ಯಪ್ ಡೀಫಾಲ್ಟ್"</string>
- <string name="user_aspect_ratio_half_screen" msgid="2154061661380605966">"ಅರ್ಧ-ಸ್ಕ್ರೀನ್"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
+ <skip />
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
+ <skip />
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
+ <skip />
<string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
<string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
<string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
+ <skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"ಫ್ಲಾಶ್ ನೋಟಿಫಿಕೇಶನ್ಗಳು"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"ಫ್ಲ್ಯಾಶ್ ನೋಟಿಫಿಕೇಶನ್ಗಳ ಕುರಿತು"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 38d3497..ac86578 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"앱 제거"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{지난 #개월 내에 설치된 앱}other{지난 #개월 내에 설치된 앱}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{앱이 설치된 지 #개월 이상 지남}other{앱이 설치된 지 #개월 이상 지남}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"추천 앱"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"재정의한 앱"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"앱 기본값"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"지문 센서"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"플래시 알림"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 29dcd8c..3c8a1ef 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Колдонмону чыгарып салуу"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Акыркы # айдын ичинде орнотулган колдонмолор}other{Акыркы # айдын ичинде орнотулган колдонмолор}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# айдан ашуун убакыт мурун орнотулган колдонмолор}other{# айдан ашуун убакыт мурун орнотулган колдонмолор}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Сунушталган колдонмолор"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Сиз өзгөртүп койгон колдонмолор"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Колдонмодогу демейки маани"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Манжа изинин сенсору"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Жарык менен коштолгон билдирмелер"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 4340999..72761b5 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -4697,15 +4697,24 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"ຖອນການຕິດຕັ້ງແອັບ"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{ແອັບທີ່ຕິດຕັ້ງໃນ # ເດືອນທີ່ຜ່ານມາ}other{ແອັບທີ່ຕິດຕັ້ງໃນ # ເດືອນທີ່ຜ່ານມາ}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{ແອັບທີ່ຕິດຕັ້ງຫຼາຍກວ່າ # ເດືອນທີ່ຜ່ານມາ}other{ແອັບທີ່ຕິດຕັ້ງຫຼາຍກວ່າ # ເດືອນທີ່ຜ່ານມາ}}"</string>
- <string name="screen_size_title" msgid="2152383810632443047">"ຂະໜາດໜ້າຈໍ"</string>
- <string name="screen_size_summary" msgid="2037727675540344412">"ເລືອກອັດຕາສ່ວນຮູບສຳລັບແອັບຫາກຍັງບໍ່ໄດ້ປັບໃຫ້ເໝາະສົມກັບ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຂອງທ່ານ"</string>
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
+ <skip />
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
+ <skip />
<string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"ແອັບແນະນຳ"</string>
<string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"ແອັບທີ່ທ່ານໄດ້ຍົກເລີກການຕັ້ງຄ່າ"</string>
<string name="user_aspect_ratio_app_default" msgid="270065763307617837">"ຄ່າເລີ່ມຕົ້ນຂອງແອັບ"</string>
- <string name="user_aspect_ratio_half_screen" msgid="2154061661380605966">"ເຄິ່ງໜ້າຈໍ"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
+ <skip />
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
+ <skip />
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
+ <skip />
<string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
<string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
<string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
+ <skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"ເຊັນເຊີລາຍນິ້ວມື"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"ການແຈ້ງເຕືອນດ້ວຍແຟລດ"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"ກ່ຽວກັບການແຈ້ງເຕືອນດ້ວຍແຟລດ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 36e4097..6d0fc30 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -4699,24 +4699,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Pašalinti programą"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Programos įdiegtos per pastarąjį # mėnesį}one{Programos įdiegtos per pastaruosius # mėnesį}few{Programos įdiegtos per pastaruosius # mėnesius}many{Programos įdiegtos per pastaruosius # mėnesio}other{Programos įdiegtos per pastaruosius # mėnesių}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Programos įdiegtos daugiau nei prieš # mėnesį}one{Programos įdiegtos daugiau nei prieš # mėnesį}few{Programos įdiegtos daugiau nei prieš # mėnesius}many{Programos įdiegtos daugiau nei prieš # mėnesio}other{Programos įdiegtos daugiau nei prieš # mėnesių}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Kraštinių santykis"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Pasirinkite kraštinių santykių ir peržiūrėkite, kaip atrodytų ši programa, jei nebūtų sukurta jūsų „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Siūlomos programos"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Nepaisomos programos"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Numatytasis programos nustatymas"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Viso ekrano režimas"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Pusė ekrano"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Įrenginio kraštinių santykis"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"Programa bus paleista iš naujo, kai pakeisite kraštinių santykį. Neišsaugoti pakeitimai gali būti prarasti."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Piršto atspaudo jutiklis"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Mirksėjimo pranešimai"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Apie mirksėjimo pranešimus"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index a5c1333..a185a27 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -4698,23 +4698,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Atinstalēt lietotni"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Pēdējā # mēneša laikā instalētās lietotnes}zero{Pēdējo # mēnešu laikā instalētās lietotnes}one{Pēdējā # mēneša laikā instalētās lietotnes}other{Pēdējo # mēnešu laikā instalētās lietotnes}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Pirms vairāk nekā # mēneša instalētās lietotnes}zero{Pirms vairāk nekā # mēnešiem instalētās lietotnes}one{Pirms vairāk nekā # mēneša instalētās lietotnes}other{Pirms vairāk nekā # mēnešiem instalētās lietotnes}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Ieteiktās lietotnes"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Jūsu ignorētās lietotnes"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Lietotnes noklusējums"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Pirksta nospieduma sensors"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Zibpaziņojumi"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 2661a10..fcc50c2 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Деинсталирај ја апликацијата"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Апликации инсталирани во минатиот # месец}one{Апликации инсталирани во минатите # месец}other{Апликации инсталирани во минатите # месеци}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Апликации инсталирани пред повеќе од # месец}one{Апликации инсталирани пред повеќе од # месец}other{Апликации инсталирани пред повеќе од # месеци}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Предложени апликации"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Апликации што сте ги отфрлиле"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Стандардно за апликацијата"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Сензор за отпечатоци"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Известувања со блиц"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index a57a9ce..0120e90 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -4697,15 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"ആപ്പ് അൺഇൻസ്റ്റാൾ ചെയ്യുക"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{കഴിഞ്ഞ # മാസത്തിനിടെ ഇൻസ്റ്റാൾ ചെയ്ത ആപ്പുകൾ}other{കഴിഞ്ഞ # മാസത്തിനിടെ ഇൻസ്റ്റാൾ ചെയ്ത ആപ്പുകൾ}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# മാസത്തിന് മുമ്പ് ഇൻസ്റ്റാൾ ചെയ്ത ആപ്പുകൾ}other{# മാസത്തിന് മുമ്പ് ഇൻസ്റ്റാൾ ചെയ്ത ആപ്പുകൾ}}"</string>
- <string name="screen_size_title" msgid="2152383810632443047">"സ്ക്രീനിന്റെ വലുപ്പം"</string>
- <string name="screen_size_summary" msgid="2037727675540344412">"നിങ്ങളുടെ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്നതിനായി ഒപ്റ്റിമൈസ് ചെയ്യാത്ത ആപ്പുകൾക്കുള്ള വീക്ഷണ അനുപാതം തിരഞ്ഞെടുക്കുക"</string>
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"വീക്ഷണ അനുപാതം"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്ന ഉപകരണത്തിന് അനുയോജ്യമായ രീതിയിലല്ല ഈ ആപ്പ് രൂപകൽപ്പന ചെയ്തിരിക്കുന്നതെങ്കിൽ, അത് കാണുന്നതിന് ഒരു വീക്ഷണ അനുപാതം തിരഞ്ഞെടുക്കുക"</string>
<string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"നിർദ്ദേശിക്കുന്ന ആപ്പുകൾ"</string>
<string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"നിങ്ങൾ അസാധുവാക്കിയ ആപ്പുകൾ"</string>
<string name="user_aspect_ratio_app_default" msgid="270065763307617837">"ആപ്പ് ഡിഫോൾട്ട്"</string>
- <string name="user_aspect_ratio_half_screen" msgid="2154061661380605966">"പകുതി സ്ക്രീൻ"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"പൂർണ്ണ സ്ക്രീൻ"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"പകുതി സ്ക്രീൻ"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"ഉപകരണ വീക്ഷണ അനുപാതം"</string>
<string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
<string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
<string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"നിങ്ങൾ വീക്ഷണ അനുപാതം മാറ്റുമ്പോൾ ആപ്പ് റീസ്റ്റാർട്ട് ചെയ്യും. സംരക്ഷിക്കാത്ത മാറ്റങ്ങൾ നിങ്ങൾക്ക് നഷ്ടമായേക്കാം."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"ഫിംഗർപ്രിന്റ് സെൻസർ"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"ഫ്ലാഷ് അറിയിപ്പുകൾ"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"ഫ്ലാഷ് അറിയിപ്പുകളെ കുറിച്ച്"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 863029f..88d8641 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Аппыг устгах"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Сүүлийн # сард суулгасан аппууд}other{Сүүлийн # сард суулгасан аппууд}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# сар гаруйн өмнө суулгасан аппууд}other{# сар гаруйн өмнө суулгасан аппууд}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Санал болгосон аппууд"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Таны дарсан аппууд"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Аппын өгөгдмөл"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Хурууны хээ мэдрэгч"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Гэрэл анивчдаг мэдэгдэл"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 9ef9541..34f2870 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"अॅप अनइंस्टॉल करा"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{मागच्या # महिन्यामध्ये इंस्टॉल केलेली अॅप्स}other{मागच्या # महिन्यांमध्ये इंस्टॉल केलेली अॅप्स}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{किमान # महिन्यापूर्वी अॅप इंस्टॉल केले}other{किमान # ममहिन्यांपूर्वी अॅप इंस्टॉल केले}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"सुचवलेली अॅप्स"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"तुम्ही ओव्हरराइड केलेली अॅप्स"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"अॅप डीफॉल्ट"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"४:३"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"फिंगरप्रिंट सेन्सर"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"फ्लॅश सूचना"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 63880fc..4f0785d 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Nyahpasang apl"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apl dipasang dalam tempoh # bulan yang lalu}other{Apl dipasang dalam tempoh # bulan yang lalu}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apl dipasang lebih dari # bulan yang lalu}other{Apl dipasang lebih dari # bulan yang lalu}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Nisbah bidang"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Pilih nisbah bidang untuk melihat apl ini jika apl belum direka bentuk untuk disesuaikan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> anda"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Apl yang dicadangkan"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Nisbah bidang apl yang telah digantikan"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Lalai apl"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Skrin penuh"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Skrin separuh"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Nisbah bidang peranti"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"Apl akan dimulakan semula apabila anda mengubah nisbah bidang. Anda mungkin kehilangan perubahan yang belum disimpan."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Penderia cap jari"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Pemberitahuan denyar"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Perihal pemberitahuan denyar"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 059f838..160de9e 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"အက်ပ်ကို ဖယ်ရှားရန်"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{ပြီးခဲ့သော # လအတွင်း ထည့်သွင်းထားသည့် အက်ပ်များ}other{ပြီးခဲ့သော # လအတွင်း ထည့်သွင်းထားသည့် အက်ပ်များ}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{ပြီးခဲ့သော # လကျော်က ထည့်သွင်းထားသည့် အက်ပ်များ}other{ပြီးခဲ့သော # လကျော်က ထည့်သွင်းထားသည့် အက်ပ်များ}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"အကြံပြုထားသော အက်ပ်များ"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"အစားထိုးထားသော အက်ပ်များ"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"အက်ပ် မူရင်း"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"လက်ဗွေ အာရုံခံကိရိယာ"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"အလင်းရောင်ဖြင့် အကြောင်းကြားချက်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1a43a5b..6b65c28 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Avinstaller app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apper installert den siste måneden}other{Apper installert de siste # månedene}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apper installert for mer enn # måned siden}other{Apper installert for mer enn # måneder siden}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Foreslåtte apper"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apper du har overstyrt"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Appstandard"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Fingeravtrykkssensor"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Blitsvarsler"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 7078cd8..b008b8a 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -4697,15 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"एप अनइन्स्टल गर्नुहोस्"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{विगत # महिनामा इन्स्टल गरिएका एपहरू}other{विगत # महिनामा इन्स्टल गरिएका एपहरू}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# महिनाभन्दा पहिले इन्स्टल गरिएका एपहरू}other{# महिनाभन्दा पहिले इन्स्टल गरिएका एपहरू}}"</string>
- <string name="screen_size_title" msgid="2152383810632443047">"स्क्रिनको आकार"</string>
- <string name="screen_size_summary" msgid="2037727675540344412">"तपाईंको <xliff:g id="DEVICE_NAME">%1$s</xliff:g> मा एस्पेक्ट रेसियो अप्टिमाइज गरिएको छैन भने एपहरूका हकमा एस्पेक्ट रेसियो छनौट गर्नुहोस्"</string>
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"एस्पेक्ट रेसियो"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"यो एप तपाईंको <xliff:g id="DEVICE_NAME">%1$s</xliff:g> मा प्रयोग गर्न मिल्ने गरी डिजाइन गरिएको छ वा छैन भन्ने कुरा हेर्न एस्पेक्ट रेसियो छनौट गर्नुहोस्"</string>
<string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"सिफारिस गरिएका एपहरू"</string>
<string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"तपाईंले ओभरराइड गरेका एपहरू"</string>
<string name="user_aspect_ratio_app_default" msgid="270065763307617837">"एपको डिफल्ट एस्पेक्ट रेसियो"</string>
- <string name="user_aspect_ratio_half_screen" msgid="2154061661380605966">"हाफ-स्क्रिन"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"फुल स्क्रिन"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"हाफ स्क्रिन"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"डिभाइसको एस्पेक्ट रेसियो"</string>
<string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"१६:९"</string>
<string name="user_aspect_ratio_3_2" msgid="199262962518318932">"३:२"</string>
<string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"४:३"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"तपाईंले एस्पेक्ट रेसियो बदल्नुभयो भने एप रिस्टार्ट हुने छ। तपाईंले सेभ नगरिएका परिवर्तनहरू गुमाउन सक्नुहुन्छ।"</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"फिंगरप्रिन्ट सेन्सर"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"सूचनाहरू आउँदा फ्ल्यास हुने सुविधा"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"सूचनाहरू आउँदा फ्ल्यास हुने सुविधाका बारेमा"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e98ddff..aa42237 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"App verwijderen"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apps in de afgelopen # maand geïnstalleerd}other{Apps in de afgelopen # maanden geïnstalleerd}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apps meer dan # maand geleden geïnstalleerd}other{Apps meer dan # maanden geleden geïnstalleerd}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Beeldverhouding"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Kies een beeldverhouding om deze app te bekijken als die niet is ontworpen om op je <xliff:g id="DEVICE_NAME">%1$s</xliff:g> te passen"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Voorgestelde apps"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apps die je hebt overschreven"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"App-standaard"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Volledig scherm"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Half scherm"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Beeldverhouding van apparaat"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"De app wordt opnieuw opgestart als je de beeldverhouding wijzigt. Je kunt niet-opgeslagen wijzigingen verliezen."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Vingerafdruksensor"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Meldingen met flits"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Over meldingen met flits"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index ca95474..4a104cd 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"ଆପ ଅନଇନଷ୍ଟଲ କରନ୍ତୁ"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{ଗତ # ମାସରେ ଇନଷ୍ଟଲ କରାଯାଇଥିବା ଆପ୍ସ}other{ଗତ # ମାସରେ ଇନଷ୍ଟଲ କରାଯାଇଥିବା ଆପ୍ସ}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# ମାସରୁ ଅଧିକ ସମୟ ପୂର୍ବେ ଇନଷ୍ଟଲ କରାଯାଇଥିବା ଆପ୍ସ}other{# ମାସରୁ ଅଧିକ ସମୟ ପୂର୍ବେ ଇନଷ୍ଟଲ କରାଯାଇଥିବା ଆପ୍ସ}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"ପ୍ରସ୍ତାବିତ ଆପ୍ସ"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"ଆପଣ ଓଭରରାଇଡ କରିଥିବା ଆପ୍ସ"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"ଆପ ଡିଫଲ୍ଟ"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"ଟିପଚିହ୍ନ ସେନ୍ସର"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"ଫ୍ଲାସ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 3f3af80..9a01586 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"ਐਪ ਅਣਸਥਾਪਤ ਕਰੋ"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{ਪਿਛਲੇ # ਮਹੀਨੇ ਵਿੱਚ ਸਥਾਪਤ ਕੀਤੀਆਂ ਗਈਆਂ ਐਪਾਂ}one{ਪਿਛਲੇ # ਮਹੀਨੇ ਵਿੱਚ ਸਥਾਪਤ ਕੀਤੀਆਂ ਗਈਆਂ ਐਪਾਂ}other{ਪਿਛਲੇ # ਮਹੀਨਿਆਂ ਵਿੱਚ ਸਥਾਪਤ ਕੀਤੀਆਂ ਗਈਆਂ ਐਪਾਂ}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{ਐਪਾਂ # ਮਹੀਨੇ ਤੋਂ ਵੱਧ ਪਹਿਲਾਂ ਸਥਾਪਤ ਕੀਤੀਆਂ ਗਈਆਂ}one{ਐਪਾਂ # ਮਹੀਨੇ ਤੋਂ ਵੱਧ ਪਹਿਲਾਂ ਸਥਾਪਤ ਕੀਤੀਆਂ ਗਈਆਂ}other{ਐਪਾਂ # ਮਹੀਨਿਆਂ ਤੋਂ ਵੱਧ ਪਹਿਲਾਂ ਸਥਾਪਤ ਕੀਤੀਆਂ ਗਈਆਂ}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"ਸੁਝਾਈਆਂ ਗਈਆਂ ਐਪਾਂ"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"ਐਪਾਂ ਜੋ ਤੁਸੀਂ ਓਵਰਰਾਈਡ ਕੀਤੀਆਂ ਹਨ"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"ਐਪ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"ਫਲੈਸ਼ ਸੂਚਨਾਵਾਂ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a46c38c..a80e5bc 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -4699,23 +4699,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Odinstaluj aplikację"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Aplikacje zainstalowane w ostatnim miesiącu}few{Aplikacje zainstalowane w ciągu ostatnich # miesięcy}many{Aplikacje zainstalowane w ciągu ostatnich # miesięcy}other{Aplikacje zainstalowane w ciągu ostatniego # miesiąca}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Aplikacja zainstalowana ponad miesiąc temu}few{Aplikacja zainstalowana ponad # miesiące temu}many{Aplikacja zainstalowana ponad # miesięcy temu}other{Aplikacja zainstalowana ponad # miesiąca temu}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Sugerowane aplikacje"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aplikacje z zastąpionymi ustawieniami"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Ustawienie domyślne aplikacji"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Czytnik linii papilarnych"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Powiadomienia świetlne"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 0846bcd..5bd8835 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -3195,7 +3195,7 @@
<string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Mostrar conversas, padrão e silenciosas"</string>
<string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"Ocultar notificações e conversas silenciosas"</string>
<string name="lock_screen_notifs_show_none" msgid="1941044980403067101">"Não mostrar notificações"</string>
- <string name="lock_screen_notifs_redact" msgid="9024158855454642296">"Notificações confidenciais"</string>
+ <string name="lock_screen_notifs_redact" msgid="9024158855454642296">"Notificações sensíveis"</string>
<string name="lock_screen_notifs_redact_summary" msgid="1395483766035470612">"Mostrar conteúdo confidencial quando bloqueado"</string>
<string name="lock_screen_notifs_redact_work" msgid="3833920196569208430">"Notificações confidenciais do perfil de trabalho"</string>
<string name="lock_screen_notifs_redact_work_summary" msgid="3238238380405430156">"Mostrar conteúdo confidencial do perfil de trabalho quando estiver bloqueado"</string>
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Desinstalar app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apps instalados no último # mês}one{Apps instalados no último # mês}other{Apps instalados nos últimos # meses}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apps instalados há mais de # mês}one{Apps instalados há mais de # mês}other{Apps instalados há mais de # meses}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Proporção"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Escolha uma proporção para visualizar este app caso ele não tenha sido criado para caber no seu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Apps sugeridos"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apps que você substituiu"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Padrão do app"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Tela cheia"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Meia tela"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Proporção do dispositivo"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"O app vai reiniciar quando você mudar a proporção. É possível que você perca mudanças não salvas."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sensor de impressão digital"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Notificações com flash"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Sobre as notificação com flash"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3871981..2d72bb6 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Desinstalar app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apps instaladas há # mês}other{Apps instaladas nos últimos # meses}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apps instaladas há mais de # mês}other{Apps instaladas há mais de # meses}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Formato"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Escolha um formato para ver esta app se esta não tiver sido criada de forma a ajustar-se ao seu dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Apps sugeridas"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apps que substituiu"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Predefinição da app"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Ecrã inteiro"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Meio ecrã"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Formato do dispositivo"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"A app vai reiniciar quando alterar o formato. Pode perder alterações não guardadas."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sensor de impressões digitais"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Notificações com flash"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Acerca das notificações com flash"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0846bcd..5bd8835 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -3195,7 +3195,7 @@
<string name="lock_screen_notifs_show_all" msgid="1300418674456749664">"Mostrar conversas, padrão e silenciosas"</string>
<string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"Ocultar notificações e conversas silenciosas"</string>
<string name="lock_screen_notifs_show_none" msgid="1941044980403067101">"Não mostrar notificações"</string>
- <string name="lock_screen_notifs_redact" msgid="9024158855454642296">"Notificações confidenciais"</string>
+ <string name="lock_screen_notifs_redact" msgid="9024158855454642296">"Notificações sensíveis"</string>
<string name="lock_screen_notifs_redact_summary" msgid="1395483766035470612">"Mostrar conteúdo confidencial quando bloqueado"</string>
<string name="lock_screen_notifs_redact_work" msgid="3833920196569208430">"Notificações confidenciais do perfil de trabalho"</string>
<string name="lock_screen_notifs_redact_work_summary" msgid="3238238380405430156">"Mostrar conteúdo confidencial do perfil de trabalho quando estiver bloqueado"</string>
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Desinstalar app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Apps instalados no último # mês}one{Apps instalados no último # mês}other{Apps instalados nos últimos # meses}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Apps instalados há mais de # mês}one{Apps instalados há mais de # mês}other{Apps instalados há mais de # meses}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Proporção"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Escolha uma proporção para visualizar este app caso ele não tenha sido criado para caber no seu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Apps sugeridos"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Apps que você substituiu"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Padrão do app"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Tela cheia"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Meia tela"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Proporção do dispositivo"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"O app vai reiniciar quando você mudar a proporção. É possível que você perca mudanças não salvas."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sensor de impressão digital"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Notificações com flash"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Sobre as notificação com flash"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index fdf9521..83f74a5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -4698,24 +4698,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Dezinstalează aplicația"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Aplicații instalate în ultima lună}few{Aplicații instalate în ultimele # luni}other{Aplicații instalate în ultimele # de luni}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Aplicații instalate cu peste # lună în urmă}few{Aplicații instalate cu peste # luni în urmă}other{Aplicații instalate cu peste # de luni în urmă}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Raport de dimensiuni"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Alege un raport de dimensiuni ca să vezi aplicația dacă nu a fost creată pentru a se potrivi cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Aplicații sugerate"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aplicații pe care le-ai modificat"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Prestabilit pentru aplicație"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Ecran complet"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Jumătate de ecran"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Raportul de dimensiuni al dispozitivului"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"Aplicația va reporni când schimbi raportul de dimensiuni. Este posibil să pierzi modificările nesalvate."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Senzor de amprentă"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Notificări flash"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Despre notificările flash"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8299f6f..8579e6d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -4148,7 +4148,7 @@
<!-- no translation found for graphics_driver_app_preference_values:1 (485288770206606512) -->
<!-- no translation found for graphics_driver_app_preference_values:2 (5391218026495225599) -->
<!-- no translation found for graphics_driver_app_preference_values:3 (2586045835780389650) -->
- <string name="enable_angle_as_system_driver" msgid="3985105681812713612">"Включить ANGLE"</string>
+ <string name="enable_angle_as_system_driver" msgid="3985105681812713612">"Использовать ANGLE"</string>
<string name="enable_angle_as_system_driver_summary" msgid="6413038127558166972">"Использовать ANGLE в качестве системного драйвера OpenGL ES. Если сделать это на несовместимом устройстве, некоторые приложения могут перестать работать."</string>
<string name="reboot_dialog_enable_angle_as_system_driver" msgid="2619263039763150810">"Для изменения системного драйвера OpenGL ES требуется перезагрузка."</string>
<string name="platform_compat_dashboard_title" msgid="1323980546791790236">"Изменение настроек совместимости приложений"</string>
@@ -4699,23 +4699,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Удалить приложение"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Приложения, установленные в течение # последнего месяца}one{Приложения, установленные в течение # последнего месяца}few{Приложения, установленные в течение # последних месяцев}many{Приложения, установленные в течение # последних месяцев}other{Приложения, установленные в течение # последнего месяца}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Приложения, установленные более # месяца назад}one{Приложения, установленные более # месяца назад}few{Приложения, установленные более # месяцев назад}many{Приложения, установленные более # месяцев назад}other{Приложения, установленные более # месяца назад}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Подходящие приложения"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Приложения с переопределенным вами значением"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Значение по умолчанию в приложении"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Сканер отпечатков пальцев"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Уведомления со вспышкой"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index cb4b9bc..8111a9a 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"යෙදුම අස්ථාපනය කරන්න"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{පසුගිය මාස # තුළ ස්ථාපනය කරන ලද යෙදුම්}one{පසුගිය මාස # තුළ ස්ථාපනය කරන ලද යෙදුම්}other{පසුගිය මාස # තුළ ස්ථාපනය කරන ලද යෙදුම්}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{මාස #කට පෙර ස්ථාපනය කර ඇති යෙදුම්}one{මාස #කට පෙර ස්ථාපනය කර ඇති යෙදුම්}other{මාස #කට පෙර ස්ථාපනය කර ඇති යෙදුම්}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"යෝජිත යෙදුම්"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"ඔබ ප්රතික්ෂේප කර ඇති යෙදුම්"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"පෙරනිමි යෙදුම"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"ඇඟිලි සලකුණු සංවේදකය"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"ෆ්ලෑෂ් දැනුම්දීම්"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 971847f..b2c8c7f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1709,7 +1709,7 @@
<string name="gesture_button_done" msgid="6387900351203032188">"Hotovo"</string>
<string name="trackpad_go_back_title" msgid="5312164160947491440">"Prejdenie späť"</string>
<string name="trackpad_go_back_summary" msgid="4201901101085902768">"Potiahnite troma prstami doľava alebo doprava"</string>
- <string name="trackpad_go_home_title" msgid="2146525662148291552">"Prejdenie na plochu"</string>
+ <string name="trackpad_go_home_title" msgid="2146525662148291552">"Prechod na plochu"</string>
<string name="trackpad_go_home_summary" msgid="2222744701528360887">"Potiahnite troma prstami"</string>
<string name="trackpad_recent_apps_title" msgid="8195970908411585445">"Nedávne aplikácie"</string>
<string name="trackpad_recent_apps_summary" msgid="2685092851677573794">"Potiahnite troma prstami a pridržte ich"</string>
@@ -4699,15 +4699,24 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Odinštalovať aplikáciu"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Aplikácie nainštalované za posledný # mesiac}few{Aplikácie nainštalované za posledné # mesiace}many{Aplikácie nainštalované za posledného # mesiaca}other{Aplikácie nainštalované za posledných # mesiacov}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Aplikácie nainštalované pred viac než # mesiacom}few{Aplikácie nainštalované pred viac než # mesiacmi}many{Aplikácie nainštalované pred viac než # mesiaca}other{Aplikácie nainštalované pred viac než # mesiacmi}}"</string>
- <string name="screen_size_title" msgid="2152383810632443047">"Veľkosť obrazovky"</string>
- <string name="screen_size_summary" msgid="2037727675540344412">"Vyberte pomer strán aplikácií, ktoré neboli optimalizované pre vaše zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
+ <skip />
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
+ <skip />
<string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Navrhované aplikácie"</string>
<string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aplikácie, ktoré ste prepísali"</string>
<string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Predvolené nastavenie aplikácie"</string>
- <string name="user_aspect_ratio_half_screen" msgid="2154061661380605966">"Polovica obrazovky"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
+ <skip />
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
+ <skip />
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
+ <skip />
<string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
<string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
<string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
+ <skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Senzor odtlačkov prstov"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Svetelné upozornenia"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Svetelné upozornenia"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 22cc413..0cd14f7 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -4699,23 +4699,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Odmestitev aplikacije"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Aplikacije, nameščene v zadnjem # mesecu}one{Aplikacije, nameščene v zadnjem # mesecu}two{Aplikacije, nameščene v zadnjih # mesecih}few{Aplikacije, nameščene v zadnjih # mesecih}other{Aplikacije, nameščene v zadnjih # mesecih}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Aplikacije, nameščene pred več kot # mesecem}one{Aplikacije, nameščene pred več kot # mesecem}two{Aplikacije, nameščene pred več kot # mesecema}few{Aplikacije, nameščene pred več kot # meseci}other{Aplikacije, nameščene pred več kot # meseci}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Predlagane aplikacije"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aplikacije, za katere ste uveljavili preglasitev"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Privzeto za aplikacijo"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16 : 9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3 : 2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4 : 3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Tipalo prstnih odtisov"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Obveščanje z utripanjem"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 5a837be..e77cf71 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Çinstalo aplikacionin"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Aplikacionet e instaluara në # muajin e fundit}other{Aplikacionet e instaluara në # muajt e fundit}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Aplikacionet e instaluara më shumë se # muaj më parë}other{Aplikacionet e instaluara më shumë se # muaj më parë}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Aplikacionet e sugjeruara"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Aplikacionet që ke anuluar"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Parazgjedhja e aplikacionit"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sensori i gjurmës së gishtit"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Njoftimet me blic"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 6b23df9..198e85b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -4698,24 +4698,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Деинсталирај апликацију"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Апликације инсталиране у последњих месец дана}one{Апликације инсталиране у последњих # месеци}few{Апликације инсталиране у последња # месеца}other{Апликације инсталиране у последњих # месеци}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Апликације које су инсталиране пре више од # месеца}one{Апликације које су инсталиране пре више од # месеца}few{Апликације које су инсталиране пре више од # месеца}other{Апликације које су инсталиране пре више од # месеци}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Размера"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Одаберите размеру да бисте прегледали садржај ове апликације ако није дизајнирана да стаје на уређај <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Предложене апликације"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Апликације које сте заменили"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Подразумевана за апликације"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Цео екран"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"На пола екрана"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Размера уређаја"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"Апликација ће се рестартовати када промените размеру. Можда ћете изгубити несачуване промене."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Сензор за отисак прста"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Треперућа обавештења"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"О треперућим обавештењима"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5f05628..ba05cda 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Avinstallera appen"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Appar som installerades den senaste månaden (# månad)}other{Appar som installerades de senaste # månaderna}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Appar som installerades för över # månad sedan}other{Appar som installerades för över # månader sedan}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Föreslagna appar"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Appar som du har åsidosatt"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Standard för appen"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Fingeravtryckssensor"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Blinkande aviseringar"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 34e7a73..4fa7c7a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Ondoa programu"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Programu zilizosakinishwa mwezi # uliopita}other{Programu zilizosakinishwa miezi # iliyopita}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Programu zilizosakinishwa zaidi ya mwezi # uliopita}other{Programu zilizosakinishwa zaidi ya miezi # iliyopita}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Programu unazopendekezewa"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Programu ambazo umebatilisha"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Chaguomsingi wa programu"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Kitambua alama ya kidole"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Arifa za mweko"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 44183e8..b0228c8 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"ஆப்ஸை நிறுவல் நீக்கு"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{கடந்த # மாதத்தில் நிறுவப்பட்ட ஆப்ஸ்}other{கடந்த # மாதங்களில் நிறுவப்பட்ட ஆப்ஸ்}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# மாதத்திற்கு முன்பு நிறுவப்பட்ட ஆப்ஸ்}other{# மாதங்களுக்கு முன்பு நிறுவப்பட்ட ஆப்ஸ்}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"பரிந்துரைக்கப்படும் ஆப்ஸ்"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"மீறிச் செயல்படுதல் அமைக்கப்பட்ட ஆப்ஸ்"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"ஆப்ஸ் இயல்புநிலை"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"கைரேகை சென்சார்"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"ஃபிளாஷ் அறிவிப்புகள்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index dd0f8aa..ea028ca 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"యాప్ను అన్ఇన్స్టాల్ చేయండి"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{గత # నెలలో ఇన్స్టాల్ చేసిన యాప్లు}other{గత # నెలలలో ఇన్స్టాల్ చేసిన యాప్లు}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{ఇన్స్టాల్ చేసి # నెలకు పైగా అయిన యాప్లు}other{ఇన్స్టాల్ చేసి # నెలలకు పైగా అయిన యాప్లు}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"ఆకార నిష్పత్తి"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"ఈ యాప్ మీ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>కు సరిపోయేలా డిజైన్ చేయకుంటే చూడటానికి ఆకార నిష్పత్తిని ఎంచుకోండి"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"సూచించిన యాప్లు"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"మీరు ఓవర్రైడ్ చేసిన యాప్లు"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"యాప్ ఆటోమేటిక్ సెట్టింగ్"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"ఫుల్ స్క్రీన్"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"సగం స్క్రీన్"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"పరికరం ఆకార నిష్పత్తి"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"మీరు ఆకార నిష్పత్తిని మార్చినప్పుడు యాప్ రీస్టార్ట్ అవుతుంది. మీరు సేవ్ చేయని మార్పులను కోల్పోవచ్చు."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"వేలిముద్ర సెన్సార్"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"ఫ్లాష్ నోటిఫికేషన్లు"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"ఫ్లాష్ నోటిఫికేషన్ల గురించి పరిచయం"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 3dbaa40..e0bfcb8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"ถอนการติดตั้งแอป"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{แอปที่ติดตั้งใน # เดือนที่ผ่านมา}other{แอปที่ติดตั้งใน # เดือนที่ผ่านมา}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{แอปที่ติดตั้งนานกว่า # เดือนที่ผ่านมา}other{แอปที่ติดตั้งนานกว่า # เดือนที่ผ่านมา}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"แอปที่แนะนำ"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"แอปที่คุณลบล้าง"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"ค่าเริ่มต้นของแอป"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"เซ็นเซอร์ลายนิ้วมือ"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"การแจ้งเตือนด้วยแฟลช"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 1bc606c..2c16897 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"I-uninstall ang app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Mga app na na-install sa nakalipas na # buwan}one{Mga app na na-install sa nakalipas na # buwan}other{Mga app na na-install sa nakalipas na # na buwan}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Mga app na na-install nang higit sa # buwan na ang nakalipas}one{Mga app na na-install nang higit sa # buwan na ang nakalipas}other{Mga app na na-install nang higit sa # na buwan na ang nakalipas}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Mga iminumungkahing app"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Mga app na na-override mo"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Default ng app"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sensor para sa fingerprint"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Mga flash notification"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e4d876d..8df83da 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Uygulamanın yüklemesini kaldır"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Son # ay içinde yüklenen uygulamalar}other{Son # ay içinde yüklenen uygulamalar}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# aydan daha uzun süre önce yüklenen uygulamalar}other{# aydan daha uzun süre önce yüklenen uygulamalar}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"En boy oranı"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Bu uygulama <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazınıza uyacak şekilde tasarlanmadıysa uygulamayı görüntülemek için bir en boy oranı seçin."</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Önerilen uygulamalar"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Geçersiz kıldığınız uygulamalar"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Uygulama varsayılanı"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Tam ekran"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Yarım ekran"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Cihaz en boy oranı"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"En boy oranını değiştirdiğinizde uygulama yeniden başlatılır. Kaydedilmemiş değişiklikleri kaybedebilirsiniz."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Parmak izi sensörü"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Işıklı Bildirim"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Işıklı bildirimler hakkında"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 40afcb2..1d8ecab 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -4699,23 +4699,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Видалити додаток"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Додатки, установлені протягом останнього # місяця}one{Додатки, установлені протягом останнього # місяця}few{Додатки, установлені протягом останніх # місяців}many{Додатки, установлені протягом останніх # місяців}other{Додатки, установлені протягом останнього # місяця}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Додатки, установлені понад # місяць тому}one{Додатки, установлені понад # місяць тому}few{Додатки, установлені понад # місяці тому}many{Додатки, установлені понад # місяців тому}other{Додатки, установлені понад # місяця тому}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Рекомендовані додатки"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Додатки з перевизначеним форматом"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Формат додатка за умовчанням"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Сканер відбитків пальців"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Сповіщення зі спалахом"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 43f94b7..48332b0 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"ایپ کو اَن انسٹال کریں"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{ایپس گزشتہ # ماہ میں انسٹال کی گئیں}other{ایپس گزشتہ # ماہ میں انسٹال کی گئیں}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{ایپس # ماہ سے زیادہ پہلے انسٹال کی گئیں}other{ایپس # ماہ سے زیادہ پہلے انسٹال کی گئیں}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"تناسبی شرح"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"اگر یہ آپ کے <xliff:g id="DEVICE_NAME">%1$s</xliff:g> کے مطابق نہیں بنائی گئی ہے تو اس ایپ کو دیکھنے کے لیے تناسبی شرح کا انتخاب کریں"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"تجویز کردہ ایپس"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"وہ ایپس جنہیں آپ نے اوور رائیڈ کیا ہے"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"ایپ کا ڈیفالٹ"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"فُل اسکرین"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"آدھی اسکرین"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"آلہ کی تناسبی شرح"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"جب آپ تناسبی شرح تبدیل کریں گے تو ایپ دوبارہ شروع ہو جائے گی۔ آپ غیر محفوظ شدہ تبدیلیوں سے محروم ہو سکتے ہیں۔"</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"فنگر پرنٹ سینسر"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"فلیش کرنے والی اطلاعات"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"فلیش کرنے والی اطلاعات کے بارے میں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 684cdba..ac8f9eb 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Ilovani oʻchirish"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Oxirgi # oy ichida oʻrnatilgan ilovalar}other{Oxirgi # oy ichida oʻrnatilgan ilovalar}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# oy oldin oʻrnatilgan ilovalar}other{# oy oldin oʻrnatilgan ilovalar}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Tomonlar nisbati"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Bu ilova <xliff:g id="DEVICE_NAME">%1$s</xliff:g> uchun moslanmagan, shu sababli qulay tomonlar nisbatini tanlang"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Tavsiya etilgan ilovalar"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Siz almashtirgan ilovalar"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Ilova standart tomonlar nisbati"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Butun ekran"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Yarim ekran"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Qurilmadagi tomonlar nisbati"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"Tomonlar nisbati oʻzgarishi bilan ilova qaytadan ishga tushadi. Oʻzgarishlar saqlanmasligi mumkin."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Barmoq izi skaneri"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Yoritkichli bildirishnomalar"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Yoritkichli bildirishnomalar haqida"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 87f0b81..b251c77 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -4697,23 +4697,23 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Gỡ cài đặt ứng dụng"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Ứng dụng được cài đặt trong vòng # tháng gần đây}other{Ứng dụng được cài đặt trong vòng # tháng gần đây}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Ứng dụng được cài đặt từ hơn # tháng trước}other{Ứng dụng được cài đặt từ hơn # tháng trước}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
+ <!-- no translation found for aspect_ratio_title (2451826875939676101) -->
<skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
+ <!-- no translation found for aspect_ratio_summary (5944347596728740547) -->
<skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Các ứng dụng được đề xuất"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Các ứng dụng bạn đã ghi đè"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Mặc định của ứng dụng"</string>
+ <!-- no translation found for user_aspect_ratio_fullscreen (1843427242540081996) -->
<skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
+ <!-- no translation found for user_aspect_ratio_half_screen (1015852057094310209) -->
<skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
+ <!-- no translation found for user_aspect_ratio_device_size (2339820985120881199) -->
<skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <!-- no translation found for app_aspect_ratio_footer (8661813386126142251) -->
<skip />
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Cảm biến vân tay"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Thông báo bằng đèn flash"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index de6ada8..c790d10 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"卸载应用"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{过去 # 个月内安装的应用}other{过去 # 个月内安装的应用}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{# 个多月前安装的应用}other{# 个多月前安装的应用}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"宽高比"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"如果应用的设计不适配您的<xliff:g id="DEVICE_NAME">%1$s</xliff:g>，请选择一个宽高比进行查看"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"有推荐宽高比的应用"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"已覆盖宽高比的应用"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"应用默认设置"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"全屏"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"半屏"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"设备宽高比"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"更改宽高比后，应用将重启。未保存的更改可能会丢失。"</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"指纹传感器"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"闪烁通知"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"闪烁通知简介"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 2e83f6f..3ae42dc 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"解除安裝應用程式"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{過去 # 個月安裝的應用程式}other{過去 # 個月安裝的應用程式}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{超過 # 個月前安裝的應用程式}other{超過 # 個月前安裝的應用程式}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"顯示比例"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"如果這個應用程式並未提供適合 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的設計，請選擇要查看的顯示比例。"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"有建議顯示長寬比的應用程式"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"已覆寫顯示長寬比的應用程式"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"應用程式預設"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"全螢幕"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"半螢幕"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"裝置顯示比例"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"變更顯示比例後，應用程式會重新啟動。你可能會遺失未儲存的變更內容。"</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"指紋感應器"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"閃光燈通知"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"關於閃光燈通知"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 51d8321..dee8669 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -4697,24 +4697,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"解除安裝應用程式"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{過去 # 個月內安裝的應用程式}other{過去 # 個月內安裝的應用程式}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{超過 # 個月前安裝的應用程式}other{超過 # 個月前安裝的應用程式}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"顯示比例"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"如果這個應用程式並未提供適合 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的設計，請選擇要查看的顯示比例。"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"有建議顯示比例的應用程式"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"已覆寫顯示比例的應用程式"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"應用程式預設"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"全螢幕"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"半螢幕"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"裝置顯示比例"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"變更顯示比例後，應用程式會重新啟動。你可能會遺失未儲存的變更內容。"</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"指紋感應器"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"閃光燈通知"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"關於閃光燈通知"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index cabf769..5f99b38 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -4698,24 +4698,18 @@
<string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Khipha i-app"</string>
<string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Ama-app afakwe enyangeni e-# edlule}one{Ama-app afakwe ezinyangeni ezingu-# ezedlule}other{Ama-app afakwe ezinyangeni ezingu-# ezedlule}}"</string>
<string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Ama-app afakwe ngaphezu kwenyanga e-# edlule}one{Ama-app afakwe ngaphezu kwezinyanga ezingu-# ezidlule}other{Ama-app afakwe ngaphezu kwezinyanga ezingu-# ezidlule}}"</string>
- <!-- no translation found for screen_size_title (2152383810632443047) -->
- <skip />
- <!-- no translation found for screen_size_summary (2037727675540344412) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_suggested_apps_label (8085934042329632039) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_overridden_apps_label (1564914138276629704) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_app_default (270065763307617837) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_half_screen (2154061661380605966) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_16_9 (2286644872775170164) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_3_2 (199262962518318932) -->
- <skip />
- <!-- no translation found for user_aspect_ratio_4_3 (5196232982878982220) -->
- <skip />
+ <string name="aspect_ratio_title" msgid="2451826875939676101">"Ukubukeka kwesilinganiselo"</string>
+ <string name="aspect_ratio_summary" msgid="5944347596728740547">"Khetha i-aspect ratio ukuze ubuke le-app uma ingakaklanywa ukuba ilingane ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> yakho"</string>
+ <string name="user_aspect_ratio_suggested_apps_label" msgid="8085934042329632039">"Ama-app aphakanyisiwe"</string>
+ <string name="user_aspect_ratio_overridden_apps_label" msgid="1564914138276629704">"Ama-app owakhiphile"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Okuzenzakalelayo kwe-app"</string>
+ <string name="user_aspect_ratio_fullscreen" msgid="1843427242540081996">"Iskrini esigcwele"</string>
+ <string name="user_aspect_ratio_half_screen" msgid="1015852057094310209">"Isikrini esiwuhhafu"</string>
+ <string name="user_aspect_ratio_device_size" msgid="2339820985120881199">"Ukubukeka kwedivayisi"</string>
+ <string name="user_aspect_ratio_16_9" msgid="2286644872775170164">"16:9"</string>
+ <string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
+ <string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
+ <string name="app_aspect_ratio_footer" msgid="8661813386126142251">"I-app izoqala kabusha uma ushintsha ukubukeka kwesilinganiselo. Ungase ulahlekelwe yizinguquko ezingalondoloziwe."</string>
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Inzwa yesigxivizo somunwe"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Izaziso zokukhanya"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Mayelana nezaziso ze-flash"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 787163e..906d4ee 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1409,4 +1409,25 @@
<integer-array name="network_mode_3g_deprecated_carrier_id" translatable="false">
</integer-array>
+ <!-- The following 4 arrays are for power anomaly tips card. Please keep them the same size. -->
+ <string-array name="power_anomaly_keys" translatable="false">
+ <item>adaptive_brightness</item>
+ <item>screen_timeout</item>
+ </string-array>
+
+ <string-array name="power_anomaly_titles">
+ <item>Turn on adaptive brightness to extend battery life</item>
+ <item>Reduce screen timeout to extend battery life</item>
+ </string-array>
+
+ <string-array name="power_anomaly_main_btn_strings">
+ <item>@string/battery_tips_card_action_button</item>
+ <item>@string/battery_tips_card_action_button</item>
+ </string-array>
+
+ <string-array name="power_anomaly_dismiss_btn_strings">
+ <item>@string/battery_tips_card_dismiss_button</item>
+ <item>@string/battery_tips_card_dismiss_button</item>
+ </string-array>
+
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e272c15..fd582de 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -410,6 +410,9 @@
<!-- Margin for SD card setup completion Image -->
<dimen name="setup_completion_margin_top">88dp</dimen>
+ <!-- QR code action button -->
+ <dimen name="action_button_icon_size">18dp</dimen>
+
<!-- Biometrics Face enroll education dimensions-->
<dimen name="face_enroll_icon_large_width">300dp</dimen>
<dimen name="face_enroll_icon_large_height">300dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8e45f9c..04901fb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1852,7 +1852,7 @@
<!-- Title for the fragment to show that the QR code is for sharing Wi-Fi hotspot network [CHAR LIMIT=50] -->
<string name="wifi_dpp_share_hotspot">Share hotspot</string>
<!-- Title for Wi-Fi DPP lockscreen title [CHAR LIMIT=50] -->
- <string name="wifi_dpp_lockscreen_title">Verify that it\u0027s you</string>
+ <string name="wifi_dpp_lockscreen_title">Verify it\u0027s you</string>
<!-- Hint for Wi-Fi password [CHAR LIMIT=50] -->
<string name="wifi_dpp_wifi_password">Wi\u2011Fi password: <xliff:g id="password" example="my password">%1$s</xliff:g></string>
<!-- Hint for Wi-Fi hotspot password [CHAR LIMIT=50] -->
@@ -3423,16 +3423,16 @@
<!-- Message to be used to explain the users that they need to enter their pattern to continue a
particular operation. [CHAR LIMIT=70]-->
- <string name="lockpassword_confirm_your_pattern_generic">Use your device pattern to continue</string>
+ <string name="lockpassword_confirm_your_pattern_generic">Draw your pattern to continue</string>
<!-- Message to be used to explain the users that they need to enter their PIN to continue a
particular operation. [CHAR LIMIT=70]-->
- <string name="lockpassword_confirm_your_pin_generic">Enter your device PIN to continue</string>
+ <string name="lockpassword_confirm_your_pin_generic">Enter your PIN to continue</string>
<!-- Message to be used to explain the users that they need to enter their password to continue a
particular operation. [CHAR LIMIT=70]-->
- <string name="lockpassword_confirm_your_password_generic">Enter your device password to continue</string>
+ <string name="lockpassword_confirm_your_password_generic">Enter your password to continue</string>
<!-- Message to be used to explain the users that they need to enter their work pattern to continue a
particular operation. [CHAR LIMIT=70]-->
- <string name="lockpassword_confirm_your_pattern_generic_profile">Use your work pattern to continue</string>
+ <string name="lockpassword_confirm_your_pattern_generic_profile">Draw your work pattern to continue</string>
<!-- Message to be used to explain the users that they need to enter their work PIN to continue a
particular operation. [CHAR LIMIT=70]-->
<string name="lockpassword_confirm_your_pin_generic_profile">Enter your work PIN to continue</string>
@@ -9651,23 +9651,14 @@
<string name="app_battery_usage_summary">Set battery usage for apps</string>
<!-- Label of action button in battery tips card [CHAR LIMIT=NONE] -->
- <string name="battery_tips_card_action_button" translatable="false">Optimize</string>
+ <string name="battery_tips_card_action_button" translatable="false">View Settings</string>
+
+ <!-- Label of dismiss button in battery tips card [CHAR LIMIT=NONE] -->
+ <string name="battery_tips_card_dismiss_button" translatable="false">Got it</string>
<!-- Feedback card message in battery tips card [CHAR LIMIT=NONE] -->
<string name="battery_tips_card_feedback_info" translatable="false">Is this message helpful?</string>
- <!-- Title of battery tips: adaptive brightness [CHAR LIMIT=NONE] -->
- <string name="battery_tips_adaptive_brightness_title" translatable="false">Turn on adaptive brightness to extend battery life</string>
-
- <!-- Summary of battery tips: adaptive brightness [CHAR LIMIT=NONE] -->
- <string name="battery_tips_adaptive_brightness_summary" translatable="false">It will help reduce your daily battery drain by 10%</string>
-
- <!-- Title of battery tips: reduce screen timeout [CHAR LIMIT=NONE] -->
- <string name="battery_tips_screen_timeout_title" translatable="false">Reduce screen timeout to extend battery life</string>
-
- <!-- Summary of battery tips: reduce screen timeout [CHAR LIMIT=NONE] -->
- <string name="battery_tips_screen_timeout_summary" translatable="false">It will help reduce your daily battery drain by 10%</string>
-
<!-- Filter title for battery unrestricted[CHAR_LIMIT=50]-->
<string name="filter_battery_unrestricted_title">Unrestricted</string>
diff --git a/res/xml/apps.xml b/res/xml/apps.xml
index 73bcbc9..651ed9b 100644
--- a/res/xml/apps.xml
+++ b/res/xml/apps.xml
@@ -88,6 +88,7 @@
android:fragment="com.android.settings.applications.manageapplications.ManageApplications">
<extra android:name="classname"
android:value="com.android.settings.Settings$UserAspectRatioAppListActivity"/>
+ <intent android:action="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS"/>
</Preference>
<Preference
diff --git a/res/xml/user_aspect_ratio_details.xml b/res/xml/user_aspect_ratio_details.xml
index fc921dd..07c8b6f 100644
--- a/res/xml/user_aspect_ratio_details.xml
+++ b/res/xml/user_aspect_ratio_details.xml
@@ -18,42 +18,49 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:title="@string/aspect_ratio_title">
<com.android.settingslib.widget.ActionButtonsPreference
android:key="header_view" />
- <com.android.settingslib.widget.SelectorWithWidgetPreference
+ <com.android.settings.applications.appcompat.RadioWithImagePreference
android:key="app_default_pref"
android:title="@string/user_aspect_ratio_app_default"/>
- <com.android.settingslib.widget.SelectorWithWidgetPreference
+ <com.android.settings.applications.appcompat.RadioWithImagePreference
android:key="fullscreen_pref"
- android:title="@string/user_aspect_ratio_fullscreen"/>
+ android:title="@string/user_aspect_ratio_fullscreen"
+ android:icon="@drawable/ic_app_aspect_ratio_fullscreen"/>
- <com.android.settingslib.widget.SelectorWithWidgetPreference
+ <com.android.settings.applications.appcompat.RadioWithImagePreference
android:key="half_screen_pref"
- android:title="@string/user_aspect_ratio_half_screen"/>
+ android:title="@string/user_aspect_ratio_half_screen"
+ android:icon="@drawable/ic_app_aspect_ratio_half_screen"/>
- <com.android.settingslib.widget.SelectorWithWidgetPreference
+ <com.android.settings.applications.appcompat.RadioWithImagePreference
android:key="display_size_pref"
- android:title="@string/user_aspect_ratio_device_size"/>
+ android:title="@string/user_aspect_ratio_device_size"
+ android:icon="@drawable/ic_app_aspect_ratio_display_size"/>
- <com.android.settingslib.widget.SelectorWithWidgetPreference
+ <com.android.settings.applications.appcompat.RadioWithImagePreference
android:key="16_9_pref"
- android:title="@string/user_aspect_ratio_16_9"/>
+ android:title="@string/user_aspect_ratio_16_9"
+ android:icon="@drawable/ic_app_aspect_ratio_16_9"/>
- <com.android.settingslib.widget.SelectorWithWidgetPreference
+ <com.android.settings.applications.appcompat.RadioWithImagePreference
android:key="4_3_pref"
- android:title="@string/user_aspect_ratio_4_3"/>
+ android:title="@string/user_aspect_ratio_4_3"
+ android:icon="@drawable/ic_app_aspect_ratio_4_3"/>
- <com.android.settingslib.widget.SelectorWithWidgetPreference
+ <com.android.settings.applications.appcompat.RadioWithImagePreference
android:key="3_2_pref"
- android:title="@string/user_aspect_ratio_3_2"/>
+ android:title="@string/user_aspect_ratio_3_2"
+ android:icon="@drawable/ic_app_aspect_ratio_3_2"/>
<com.android.settingslib.widget.FooterPreference
android:title="@string/app_aspect_ratio_footer"
android:selectable="false"
settings:searchable="false"/>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 370b17a..dda5b24 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -16,6 +16,9 @@
package com.android.settings;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PASSWORD;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PATTERN;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PIN;
import static android.content.Intent.EXTRA_USER;
import static android.content.Intent.EXTRA_USER_ID;
import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
@@ -782,6 +785,47 @@
return lpu.getCredentialTypeForUser(userId);
}
+ /**
+ * Returns the confirmation credential string of the given user id.
+ */
+ @Nullable public static String getConfirmCredentialStringForUser(@NonNull Context context,
+ int userId, @LockPatternUtils.CredentialType int credentialType) {
+ final int effectiveUserId = UserManager.get(context).getCredentialOwnerProfile(userId);
+ final boolean isEffectiveUserManagedProfile = UserManager.get(context)
+ .isManagedProfile(effectiveUserId);
+ final DevicePolicyManager devicePolicyManager = context
+ .getSystemService(DevicePolicyManager.class);
+ switch (credentialType) {
+ case LockPatternUtils.CREDENTIAL_TYPE_PIN:
+ if (isEffectiveUserManagedProfile) {
+ return devicePolicyManager.getResources().getString(WORK_PROFILE_CONFIRM_PIN,
+ () -> context.getString(
+ R.string.lockpassword_confirm_your_pin_generic_profile));
+ }
+
+ return context.getString(R.string.lockpassword_confirm_your_pin_generic);
+ case LockPatternUtils.CREDENTIAL_TYPE_PATTERN:
+ if (isEffectiveUserManagedProfile) {
+ return devicePolicyManager.getResources().getString(
+ WORK_PROFILE_CONFIRM_PATTERN,
+ () -> context.getString(
+ R.string.lockpassword_confirm_your_pattern_generic_profile));
+ }
+
+ return context.getString(R.string.lockpassword_confirm_your_pattern_generic);
+ case LockPatternUtils.CREDENTIAL_TYPE_PASSWORD:
+ if (isEffectiveUserManagedProfile) {
+ return devicePolicyManager.getResources().getString(
+ WORK_PROFILE_CONFIRM_PASSWORD,
+ () -> context.getString(
+ R.string.lockpassword_confirm_your_password_generic_profile));
+ }
+
+ return context.getString(R.string.lockpassword_confirm_your_password_generic);
+ }
+ return null;
+ }
+
private static final StringBuilder sBuilder = new StringBuilder(50);
private static final java.util.Formatter sFormatter = new java.util.Formatter(
sBuilder, Locale.getDefault());
diff --git a/src/com/android/settings/applications/appcompat/RadioWithImagePreference.java b/src/com/android/settings/applications/appcompat/RadioWithImagePreference.java
new file mode 100644
index 0000000..77cd86c
--- /dev/null
+++ b/src/com/android/settings/applications/appcompat/RadioWithImagePreference.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appcompat;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+/**
+ * Radio button preference with image at the bottom.
+ *
+ * <p>Layout should stay the same as
+ * {@link com.android.settingslib.widget.SelectorWithWidgetPreference} for consistency.
+ */
+public class RadioWithImagePreference extends CheckBoxPreference {
+
+ /**
+ * Interface definition for a callback to be invoked when the preference is clicked.
+ */
+ public interface OnClickListener {
+ /**
+ * Called when a preference has been clicked.
+ *
+ * @param emiter The clicked preference
+ */
+ void onRadioButtonClicked(RadioWithImagePreference emiter);
+ }
+
+ private OnClickListener mListener = null;
+
+ /**
+ * Performs inflation from XML and apply a class-specific base style.
+ *
+ * @param context The {@link Context} this is associated with, through which it can
+ * access the current theme, resources, {@link SharedPreferences}, etc.
+ * @param attrs The attributes of the XML tag that is inflating the preference
+ * @param defStyle An attribute in the current theme that contains a reference to a style
+ * resource that supplies default values for the view. Can be 0 to not
+ * look for defaults.
+ */
+ public RadioWithImagePreference(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ init();
+ }
+
+ /**
+ * Performs inflation from XML and apply a class-specific base style.
+ *
+ * @param context The {@link Context} this is associated with, through which it can
+ * access the current theme, resources, {@link SharedPreferences}, etc.
+ * @param attrs The attributes of the XML tag that is inflating the preference
+ */
+ public RadioWithImagePreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ init();
+ }
+
+ /**
+ * Constructor to create a preference.
+ *
+ * @param context The Context this is associated with.
+ */
+ public RadioWithImagePreference(Context context) {
+ this(context, null);
+ }
+
+ /**
+ * Sets the callback to be invoked when this preference is clicked by the user.
+ *
+ * @param listener The callback to be invoked
+ */
+ public void setOnClickListener(OnClickListener listener) {
+ mListener = listener;
+ }
+
+ /**
+ * Processes a click on the preference.
+ */
+ @Override
+ public void onClick() {
+ if (mListener != null) {
+ mListener.onRadioButtonClicked(this);
+ }
+ }
+
+ /**
+ * Binds the created View to the data for this preference.
+ *
+ * <p>This is a good place to grab references to custom Views in the layout and set
+ * properties on them.
+ *
+ * <p>Make sure to call through to the superclass's implementation.
+ *
+ * @param holder The ViewHolder that provides references to the views to fill in. These views
+ * will be recycled, so you should not hold a reference to them after this method
+ * returns.
+ */
+ @Override
+ public void onBindViewHolder(PreferenceViewHolder holder) {
+ super.onBindViewHolder(holder);
+
+ View summaryContainer = holder.findViewById(R.id.summary_container);
+ if (summaryContainer != null) {
+ summaryContainer.setVisibility(
+ TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE);
+ }
+ }
+
+ private void init() {
+ setWidgetLayoutResource(com.android.settingslib.R.layout.preference_widget_radiobutton);
+ setLayoutResource(R.layout.radio_with_image_preference);
+ setIconSpaceReserved(false);
+ }
+}
diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
index f8406f9..e01f28a 100644
--- a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
+++ b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
@@ -42,7 +42,6 @@
import com.android.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
import com.android.settingslib.widget.ActionButtonsPreference;
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
import java.util.ArrayList;
import java.util.List;
@@ -51,7 +50,7 @@
* App specific activity to show aspect ratio overrides
*/
public class UserAspectRatioDetails extends AppInfoWithHeader implements
- SelectorWithWidgetPreference.OnClickListener {
+ RadioWithImagePreference.OnClickListener {
private static final String TAG = UserAspectRatioDetails.class.getSimpleName();
private static final String KEY_HEADER_BUTTONS = "header_view";
@@ -65,7 +64,7 @@
@VisibleForTesting
static final String KEY_PREF_3_2 = "3_2_pref";
- private final List<SelectorWithWidgetPreference> mAspectRatioPreferences = new ArrayList<>();
+ private final List<RadioWithImagePreference> mAspectRatioPreferences = new ArrayList<>();
@NonNull private UserAspectRatioManager mUserAspectRatioManager;
@NonNull private String mSelectedKey = KEY_PREF_DEFAULT;
@@ -87,7 +86,7 @@
}
@Override
- public void onRadioButtonClicked(@NonNull SelectorWithWidgetPreference selected) {
+ public void onRadioButtonClicked(@NonNull RadioWithImagePreference selected) {
final String selectedKey = selected.getKey();
if (mSelectedKey.equals(selectedKey)) {
return;
@@ -198,7 +197,7 @@
private void addPreference(@NonNull String key,
@PackageManager.UserMinAspectRatio int aspectRatio) {
- final SelectorWithWidgetPreference pref = findPreference(key);
+ final RadioWithImagePreference pref = findPreference(key);
if (pref == null) {
return;
}
@@ -212,7 +211,7 @@
}
private void updateAllPreferences(@NonNull String selectedKey) {
- for (SelectorWithWidgetPreference pref : mAspectRatioPreferences) {
+ for (RadioWithImagePreference pref : mAspectRatioPreferences) {
pref.setChecked(selectedKey.equals(pref.getKey()));
}
}
diff --git a/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java b/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java
index 487e254..69ae9a7 100644
--- a/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java
+++ b/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java
@@ -21,6 +21,7 @@
import static com.android.settings.password.ChooseLockPattern.RESULT_FINISHED;
+import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.hardware.biometrics.SensorProperties;
@@ -179,6 +180,12 @@
}
mFaceManager.generateChallenge(mUserId, (sensorId, userId, challenge) -> {
+ final Activity activity = getActivity();
+ if (activity == null || activity.isFinishing()) {
+ Log.e(getLogTag(), "Stop during generating face unlock challenge"
+ + " because activity is null or finishing");
+ return;
+ }
try {
final byte[] token = requestGatekeeperHat(context, mGkPwHandle, mUserId,
challenge);
@@ -215,6 +222,12 @@
}
mFingerprintManager.generateChallenge(mUserId, (sensorId, userId, challenge) -> {
+ final Activity activity = getActivity();
+ if (activity == null || activity.isFinishing()) {
+ Log.e(getLogTag(), "Stop during generating fingerprint challenge"
+ + " because activity is null or finishing");
+ return;
+ }
try {
final byte[] token = requestGatekeeperHat(context, mGkPwHandle, mUserId,
challenge);
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
index eba6b13..1fd09a3 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
@@ -324,11 +324,16 @@
return;
}
+ LocalBluetoothProfile asha = mProfileManager.getHearingAidProfile();
+
for (CachedBluetoothDevice leAudioDevice : mProfileDeviceMap.get(profile.toString())) {
Log.d(TAG,
"device:" + leAudioDevice.getDevice().getAnonymizedAddress()
+ "disable LE profile");
profile.setEnabled(leAudioDevice.getDevice(), false);
+ if (asha != null) {
+ asha.setEnabled(leAudioDevice.getDevice(), true);
+ }
}
if (!SystemProperties.getBoolean(ENABLE_DUAL_MODE_AUDIO, false)) {
@@ -354,12 +359,16 @@
disableProfileBeforeUserEnablesLeAudio(mProfileManager.getA2dpProfile());
disableProfileBeforeUserEnablesLeAudio(mProfileManager.getHeadsetProfile());
}
+ LocalBluetoothProfile asha = mProfileManager.getHearingAidProfile();
for (CachedBluetoothDevice leAudioDevice : mProfileDeviceMap.get(profile.toString())) {
Log.d(TAG,
"device:" + leAudioDevice.getDevice().getAnonymizedAddress()
+ "enable LE profile");
profile.setEnabled(leAudioDevice.getDevice(), true);
+ if (asha != null) {
+ asha.setEnabled(leAudioDevice.getDevice(), false);
+ }
}
}
@@ -376,6 +385,12 @@
+ profile.toString() + " profile is disabled. Do nothing.");
}
}
+ } else {
+ if (profile == null) {
+ Log.w(TAG, "profile is null");
+ } else {
+ Log.w(TAG, profile.toString() + " is not in " + mProfileDeviceMap);
+ }
}
}
@@ -392,6 +407,12 @@
+ profile.toString() + " profile is enabled. Do nothing.");
}
}
+ } else {
+ if (profile == null) {
+ Log.w(TAG, "profile is null");
+ } else {
+ Log.w(TAG, profile.toString() + " is not in " + mProfileDeviceMap);
+ }
}
}
diff --git a/src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java b/src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
index 0a0e208..985c8b7 100644
--- a/src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
+++ b/src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java
@@ -45,6 +45,7 @@
import com.android.settings.R;
import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
import com.android.settings.dashboard.profileselector.UserAdapter;
+import com.android.settingslib.PrimarySwitchPreference;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -59,7 +60,8 @@
* This class adds stylus preferences.
*/
public class StylusDevicesController extends AbstractPreferenceController implements
- Preference.OnPreferenceClickListener, LifecycleObserver, OnResume {
+ Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener,
+ LifecycleObserver, OnResume {
@VisibleForTesting
static final String KEY_STYLUS = "device_stylus";
@@ -138,11 +140,15 @@
return pref;
}
- private SwitchPreference createOrUpdateHandwritingPreference(SwitchPreference preference) {
- SwitchPreference pref = preference == null ? new SwitchPreference(mContext) : preference;
+ private PrimarySwitchPreference createOrUpdateHandwritingPreference(
+ PrimarySwitchPreference preference) {
+ PrimarySwitchPreference pref = preference == null ? new PrimarySwitchPreference(mContext)
+ : preference;
pref.setKey(KEY_HANDWRITING);
pref.setTitle(mContext.getString(R.string.stylus_textfield_handwriting));
pref.setIcon(R.drawable.ic_text_fields_alt);
+ // Using a two-target preference, clicking will send an intent and change will toggle.
+ pref.setOnPreferenceChangeListener(this);
pref.setOnPreferenceClickListener(this);
pref.setChecked(Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.STYLUS_HANDWRITING_ENABLED,
@@ -165,7 +171,6 @@
@Override
public boolean onPreferenceClick(Preference preference) {
String key = preference.getKey();
-
switch (key) {
case KEY_DEFAULT_NOTES:
PackageManager pm = mContext.getPackageManager();
@@ -181,20 +186,13 @@
}
break;
case KEY_HANDWRITING:
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.STYLUS_HANDWRITING_ENABLED,
- ((SwitchPreference) preference).isChecked() ? 1 : 0);
-
- if (((SwitchPreference) preference).isChecked()) {
- InputMethodManager imm = mContext.getSystemService(InputMethodManager.class);
- InputMethodInfo inputMethod = imm.getCurrentInputMethodInfo();
- if (inputMethod == null) break;
-
- Intent handwritingIntent =
- inputMethod.createStylusHandwritingSettingsActivityIntent();
- if (handwritingIntent != null) {
- mContext.startActivity(handwritingIntent);
- }
+ InputMethodManager imm = mContext.getSystemService(InputMethodManager.class);
+ InputMethodInfo inputMethod = imm.getCurrentInputMethodInfo();
+ if (inputMethod == null) break;
+ Intent handwritingIntent =
+ inputMethod.createStylusHandwritingSettingsActivityIntent();
+ if (handwritingIntent != null) {
+ mContext.startActivity(handwritingIntent);
}
break;
case KEY_IGNORE_BUTTON:
@@ -207,6 +205,19 @@
}
@Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ String key = preference.getKey();
+ switch (key) {
+ case KEY_HANDWRITING:
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ Settings.Secure.STYLUS_HANDWRITING_ENABLED,
+ (boolean) newValue ? 1 : 0);
+ break;
+ }
+ return true;
+ }
+
+ @Override
public final void displayPreference(PreferenceScreen screen) {
mPreferencesContainer = (PreferenceCategory) screen.findPreference(getPreferenceKey());
super.displayPreference(screen);
@@ -233,7 +244,7 @@
mPreferencesContainer.addPreference(notesPref);
}
- SwitchPreference currHandwritingPref = mPreferencesContainer.findPreference(
+ PrimarySwitchPreference currHandwritingPref = mPreferencesContainer.findPreference(
KEY_HANDWRITING);
Preference handwritingPref = createOrUpdateHandwritingPreference(currHandwritingPref);
if (currHandwritingPref == null) {
@@ -328,5 +339,4 @@
return false;
}
-
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index 258ded1..30eabfa 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -22,6 +22,7 @@
import android.util.ArrayMap;
import android.util.SparseIntArray;
+import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEventList;
import com.android.settingslib.fuelgauge.Estimate;
import java.util.List;
@@ -147,7 +148,7 @@
/**
* Returns {@link Bundle} for settings anomaly detection result
*/
- Bundle detectSettingsAnomaly(Context context, double displayDrain);
+ PowerAnomalyEventList detectSettingsAnomaly(Context context, double displayDrain);
/**
* Gets an intent for one time bypass charge limited to resume charging.
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index 9b5bb5e..127178a 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -21,13 +21,13 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.os.Bundle;
import android.os.Process;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.SparseIntArray;
import com.android.internal.util.ArrayUtils;
+import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEventList;
import com.android.settingslib.fuelgauge.Estimate;
import java.util.ArrayList;
@@ -82,7 +82,7 @@
@Override
public boolean isBatteryTipsFeedbackEnabled() {
- return true;
+ return false;
}
@Override
@@ -175,7 +175,7 @@
public void insertSettingsData(Context context, double displayDrain) {}
@Override
- public Bundle detectSettingsAnomaly(Context context, double displayDrain) {
+ public PowerAnomalyEventList detectSettingsAnomaly(Context context, double displayDrain) {
return null;
}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
index b7e1885..3231e55 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
@@ -105,10 +105,9 @@
public interface OnBatteryTipsUpdatedListener {
/**
* The callback function for the battery tips card is updated.
- * @param title the title of the battery tip card
- * @param summary the summary of the battery tip card
+ * @param powerAnomalyEvent the power anomaly event with highest score
*/
- void onBatteryTipsUpdated(String title, String summary);
+ void onBatteryTipsUpdated(PowerAnomalyEvent powerAnomalyEvent);
}
@@ -365,7 +364,8 @@
slotUsageData, getSlotInformation(), isBatteryUsageMapNullOrEmpty());
if (mOnBatteryTipsUpdatedListener != null) {
- mOnBatteryTipsUpdatedListener.onBatteryTipsUpdated(null, null);
+ // TODO: replace with a selected powerAnomalyEvent with highest score
+ mOnBatteryTipsUpdatedListener.onBatteryTipsUpdated(null);
}
}
return true;
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreference.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreference.java
index 661d7c8..f59f2e2 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreference.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreference.java
@@ -17,15 +17,19 @@
package com.android.settings.fuelgauge.batteryusage;
import android.content.Context;
+import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageButton;
+import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
+import com.android.settings.core.SubSettingLauncher;
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
@@ -40,12 +44,14 @@
private final PowerUsageFeatureProvider mPowerUsageFeatureProvider;
- private MaterialButton mActionButton;
- private ImageButton mDismissButton;
- private ImageButton mThumbUpButton;
- private ImageButton mThumbDownButton;
- private CharSequence mTitle;
- private CharSequence mSummary;
+ @VisibleForTesting
+ CharSequence mMainButtonLabel;
+ @VisibleForTesting
+ CharSequence mDismissButtonLabel;
+ @VisibleForTesting
+ String mDestinationComponentName;
+ @VisibleForTesting
+ int mSourceMetricsCategory;
public BatteryTipsCardPreference(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -55,34 +61,65 @@
.getPowerUsageFeatureProvider(context);
}
- @Override
- public void setTitle(CharSequence title) {
- mTitle = title;
- notifyChanged();
+ /**
+ * Update the label of main button in tips card.
+ */
+ public void setMainButtonLabel(CharSequence label) {
+ if (!TextUtils.equals(mMainButtonLabel, label)) {
+ mMainButtonLabel = label;
+ notifyChanged();
+ }
}
- @Override
- public void setSummary(CharSequence summary) {
- mSummary = summary;
- notifyChanged();
+ /**
+ * Update the label of dismiss button in tips card.
+ */
+ public void setDismissButtonLabel(CharSequence label) {
+ if (!TextUtils.equals(mDismissButtonLabel, label)) {
+ mDismissButtonLabel = label;
+ notifyChanged();
+ }
+ }
+
+ /**
+ * Update the info of target fragment launched by main button.
+ */
+ public void setMainButtonLauncherInfo(final String destinationClassName,
+ final Integer sourceMetricsCategory) {
+ mDestinationComponentName = destinationClassName;
+ mSourceMetricsCategory = sourceMetricsCategory;
}
@Override
public void onClick(View view) {
- // TODO: replace with the settings anomaly obtained from detectSettingsAnomaly();
+ final int viewId = view.getId();
+ if (viewId == R.id.main_button || viewId == R.id.tips_card) {
+ if (TextUtils.isEmpty(mDestinationComponentName)) {
+ return;
+ }
+ new SubSettingLauncher(getContext())
+ .setDestination(mDestinationComponentName)
+ .setSourceMetricsCategory(mSourceMetricsCategory)
+ .launch();
+ } else if (viewId == R.id.dismiss_button) {
+ setVisible(false);
+ }
}
@Override
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);
- ((TextView) view.findViewById(R.id.title)).setText(mTitle);
- ((TextView) view.findViewById(R.id.summary)).setText(mSummary);
+ ((TextView) view.findViewById(R.id.title)).setText(getTitle());
- mActionButton = (MaterialButton) view.findViewById(R.id.action_button);
- mActionButton.setOnClickListener(this);
- mDismissButton = (ImageButton) view.findViewById(R.id.dismiss_button);
- mDismissButton.setOnClickListener(this);
+ LinearLayout tipsCard = (LinearLayout) view.findViewById(R.id.tips_card);
+ tipsCard.setOnClickListener(this);
+ MaterialButton mainButton = (MaterialButton) view.findViewById(R.id.main_button);
+ mainButton.setOnClickListener(this);
+ mainButton.setText(mMainButtonLabel);
+ MaterialButton dismissButton = (MaterialButton) view.findViewById(R.id.dismiss_button);
+ dismissButton.setOnClickListener(this);
+ dismissButton.setText(mDismissButtonLabel);
if (!mPowerUsageFeatureProvider.isBatteryTipsFeedbackEnabled()) {
return;
@@ -91,9 +128,9 @@
.setBackgroundResource(R.drawable.battery_tips_half_rounded_top_bg);
view.findViewById(R.id.feedback_card).setVisibility(View.VISIBLE);
- mThumbUpButton = (ImageButton) view.findViewById(R.id.thumb_up);
- mThumbUpButton.setOnClickListener(this);
- mThumbDownButton = (ImageButton) view.findViewById(R.id.thumb_down);
- mThumbDownButton.setOnClickListener(this);
+ ImageButton thumbUpButton = (ImageButton) view.findViewById(R.id.thumb_up);
+ thumbUpButton.setOnClickListener(this);
+ ImageButton thumbDownButton = (ImageButton) view.findViewById(R.id.thumb_down);
+ thumbDownButton.setOnClickListener(this);
}
}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsController.java
index bcedd4f..991a8f6 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsController.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsController.java
@@ -17,13 +17,18 @@
package com.android.settings.fuelgauge.batteryusage;
import android.content.Context;
+import android.text.TextUtils;
import androidx.preference.PreferenceScreen;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
+import java.util.function.Function;
+
/** Controls the update for battery tips card */
public class BatteryTipsController extends BasePreferenceController {
@@ -31,15 +36,23 @@
private static final String ROOT_PREFERENCE_KEY = "battery_tips_category";
private static final String CARD_PREFERENCE_KEY = "battery_tips_card";
- private final PowerUsageFeatureProvider mPowerUsageFeatureProvider;
+ private final String[] mPowerAnomalyKeys;
- private Context mPrefContext;
- private BatteryTipsCardPreference mCardPreference;
+ @VisibleForTesting
+ BatteryTipsCardPreference mCardPreference;
+ @VisibleForTesting
+ PowerUsageFeatureProvider mPowerUsageFeatureProvider;
public BatteryTipsController(Context context) {
super(context, ROOT_PREFERENCE_KEY);
mPowerUsageFeatureProvider = FeatureFactory.getFactory(context)
.getPowerUsageFeatureProvider(context);
+ mPowerAnomalyKeys = context.getResources().getStringArray(R.array.power_anomaly_keys);
+ }
+
+ private boolean isTipsCardVisible() {
+ // TODO: compared with the timestamp of last user dismiss action in sharedPreference.
+ return mPowerUsageFeatureProvider.isBatteryTipsEnabled();
}
@Override
@@ -50,28 +63,89 @@
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
- mPrefContext = screen.getContext();
mCardPreference = screen.findPreference(CARD_PREFERENCE_KEY);
}
- /**
- * Update the card visibility and contents.
- * @param title a string not extend 2 lines.
- * @param summary a string not extend 10 lines.
- */
- // TODO: replace parameters with SettingsAnomaly Data Proto
- public void handleBatteryTipsCardUpdated(String title, String summary) {
- if (!mPowerUsageFeatureProvider.isBatteryTipsEnabled()) {
- mCardPreference.setVisible(false);
- return;
+ @VisibleForTesting
+ int getPowerAnomalyEventIndex(String powerAnomalyKey) {
+ for (int index = 0; index < mPowerAnomalyKeys.length; index++) {
+ if (mPowerAnomalyKeys[index].equals(powerAnomalyKey)) {
+ return index;
+ }
}
- if (title == null || summary == null) {
- mCardPreference.setVisible(false);
- return;
- }
- mCardPreference.setTitle(title);
- mCardPreference.setSummary(summary);
- mCardPreference.setVisible(true);
+ return -1;
}
+ private <T> T getInfo(PowerAnomalyEvent powerAnomalyEvent,
+ Function<WarningBannerInfo, T> warningBannerInfoSupplier,
+ Function<WarningItemInfo, T> warningItemInfoSupplier) {
+ if (powerAnomalyEvent.hasWarningBannerInfo() && warningBannerInfoSupplier != null) {
+ return warningBannerInfoSupplier.apply(powerAnomalyEvent.getWarningBannerInfo());
+ } else if (powerAnomalyEvent.hasWarningItemInfo() && warningItemInfoSupplier != null) {
+ return warningItemInfoSupplier.apply(powerAnomalyEvent.getWarningItemInfo());
+ }
+ return null;
+ }
+
+ private String getString(PowerAnomalyEvent powerAnomalyEvent,
+ Function<WarningBannerInfo, String> warningBannerInfoSupplier,
+ Function<WarningItemInfo, String> warningItemInfoSupplier,
+ int resourceId, int resourceIndex) {
+ String string =
+ getInfo(powerAnomalyEvent, warningBannerInfoSupplier, warningItemInfoSupplier);
+
+ if (!TextUtils.isEmpty(string) || resourceId < 0) {
+ return string;
+ }
+
+ if (resourceIndex >= 0) {
+ string = mContext.getResources().getStringArray(resourceId)[resourceIndex];
+ }
+
+ return string;
+ }
+
+ @VisibleForTesting
+ void handleBatteryTipsCardUpdated(PowerAnomalyEvent powerAnomalyEvent) {
+ if (!isTipsCardVisible()) {
+ mCardPreference.setVisible(false);
+ return;
+ }
+ if (powerAnomalyEvent == null) {
+ mCardPreference.setVisible(false);
+ return;
+ }
+
+ // Get card preference strings and navigate fragment info
+ final int index = getPowerAnomalyEventIndex(powerAnomalyEvent.getKey());
+
+ String titleString = getString(powerAnomalyEvent, WarningBannerInfo::getTitleString,
+ WarningItemInfo::getTitleString, R.array.power_anomaly_titles, index);
+ if (titleString.isEmpty()) {
+ mCardPreference.setVisible(false);
+ return;
+ }
+
+ String mainBtnString = getString(powerAnomalyEvent,
+ WarningBannerInfo::getMainButtonString, WarningItemInfo::getMainButtonString,
+ R.array.power_anomaly_main_btn_strings, index);
+ String dismissBtnString = getString(powerAnomalyEvent,
+ WarningBannerInfo::getCancelButtonString, WarningItemInfo::getCancelButtonString,
+ R.array.power_anomaly_dismiss_btn_strings, index);
+
+ String destinationClassName = getString(powerAnomalyEvent,
+ WarningBannerInfo::getMainButtonDestination,
+ WarningItemInfo::getMainButtonDestination,
+ -1, -1);
+ Integer sourceMetricsCategory = getInfo(powerAnomalyEvent,
+ WarningBannerInfo::getMainButtonSourceMetricsCategory,
+ WarningItemInfo::getMainButtonSourceMetricsCategory);
+
+ // Updated card preference and main button fragment launcher
+ mCardPreference.setTitle(titleString);
+ mCardPreference.setMainButtonLabel(mainBtnString);
+ mCardPreference.setDismissButtonLabel(dismissBtnString);
+ mCardPreference.setMainButtonLauncherInfo(destinationClassName, sourceMetricsCategory);
+ mCardPreference.setVisible(true);
+ }
}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
index 3fc44cc..5fc4ad5 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
@@ -17,6 +17,7 @@
import android.annotation.IntDef;
import android.annotation.Nullable;
+import android.app.usage.IUsageStatsManager;
import android.app.usage.UsageEvents.Event;
import android.app.usage.UsageStatsManager;
import android.content.ContentValues;
@@ -185,7 +186,8 @@
/** Converts to {@link AppUsageEvent} from {@link Event} */
@Nullable
public static AppUsageEvent convertToAppUsageEvent(
- Context context, final Event event, final long userId) {
+ Context context, IUsageStatsManager usageStatsManager, final Event event,
+ final long userId) {
final String packageName = event.getPackageName();
if (packageName == null) {
// See b/190609174: Event package names should never be null, but sometimes they are.
@@ -210,7 +212,8 @@
}
final String effectivePackageName =
- getEffectivePackageName(context, packageName, taskRootPackageName);
+ getEffectivePackageName(
+ context, usageStatsManager, packageName, taskRootPackageName);
try {
final long uid = context
.getPackageManager()
@@ -326,8 +329,9 @@
*/
@VisibleForTesting
static String getEffectivePackageName(
- Context context, final String packageName, final String taskRootPackageName) {
- final int usageSource = getUsageSource(context);
+ Context context, IUsageStatsManager usageStatsManager, final String packageName,
+ final String taskRootPackageName) {
+ final int usageSource = getUsageSource(context, usageStatsManager);
switch (usageSource) {
case UsageStatsManager.USAGE_SOURCE_TASK_ROOT_ACTIVITY:
return !TextUtils.isEmpty(taskRootPackageName)
@@ -372,9 +376,9 @@
}
}
- private static int getUsageSource(Context context) {
+ private static int getUsageSource(Context context, IUsageStatsManager usageStatsManager) {
if (sUsageSource == EMPTY_USAGE_SOURCE) {
- sUsageSource = DatabaseUtils.getUsageSource(context);
+ sUsageSource = DatabaseUtils.getUsageSource(context, usageStatsManager);
}
return sUsageSource;
}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
index badc359..620ae31 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
@@ -32,6 +32,7 @@
import android.os.BatteryUsageStatsQuery;
import android.os.Process;
import android.os.RemoteException;
+import android.os.ServiceManager;
import android.os.UidBatteryConsumer;
import android.os.UserBatteryConsumer;
import android.os.UserHandle;
@@ -108,6 +109,11 @@
@VisibleForTesting
static Set<String> sTestSystemAppsPackageNames;
+ @VisibleForTesting
+ static IUsageStatsManager sUsageStatsManager =
+ IUsageStatsManager.Stub.asInterface(
+ ServiceManager.getService(Context.USAGE_STATS_SERVICE));
+
public static final String CURRENT_TIME_BATTERY_HISTORY_PLACEHOLDER =
"CURRENT_TIME_BATTERY_HISTORY_PLACEHOLDER";
@@ -338,7 +344,8 @@
break;
}
final AppUsageEvent appUsageEvent =
- ConvertUtils.convertToAppUsageEvent(context, event, userId);
+ ConvertUtils.convertToAppUsageEvent(
+ context, sUsageStatsManager, event, userId);
if (appUsageEvent != null) {
numEventsFetched++;
appUsageEventList.add(appUsageEvent);
@@ -694,6 +701,7 @@
final long eventUserId = firstEvent.getUserId();
final String packageName = getEffectivePackageName(
context,
+ sUsageStatsManager,
firstEvent.getPackageName(),
firstEvent.getTaskRootPackageName());
usageEvents.addAll(deviceEvents);
@@ -966,7 +974,7 @@
final long startTime = DatabaseUtils.getAppUsageStartTimestampOfUser(
context, userID, earliestTimestamp);
return loadAppUsageEventsForUserFromService(
- DatabaseUtils.sUsageStatsManager, startTime, now, userID, callingPackage);
+ sUsageStatsManager, startTime, now, userID, callingPackage);
}
@Nullable
diff --git a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
index ea1f3ed..b54563b 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
@@ -31,7 +31,6 @@
import android.os.Handler;
import android.os.Looper;
import android.os.RemoteException;
-import android.os.ServiceManager;
import android.os.SystemClock;
import android.os.UserManager;
import android.util.Log;
@@ -117,11 +116,6 @@
@VisibleForTesting
static Supplier<Cursor> sFakeSupplier;
- @VisibleForTesting
- static IUsageStatsManager sUsageStatsManager =
- IUsageStatsManager.Stub.asInterface(
- ServiceManager.getService(Context.USAGE_STATS_SERVICE));
-
private DatabaseUtils() {
}
@@ -488,7 +482,7 @@
*
* @see UsageStatsManager#getUsageSource()
*/
- static int getUsageSource(Context context) {
+ static int getUsageSource(Context context, IUsageStatsManager usageStatsManager) {
final SharedPreferences sharedPreferences = getSharedPreferences(context);
if (sharedPreferences != null && sharedPreferences.contains(KEY_LAST_USAGE_SOURCE)) {
return sharedPreferences
@@ -497,7 +491,7 @@
int usageSource = ConvertUtils.DEFAULT_USAGE_SOURCE;
try {
- usageSource = sUsageStatsManager.getUsageSource();
+ usageSource = usageStatsManager.getUsageSource();
} catch (RemoteException e) {
Log.e(TAG, "Failed to getUsageSource", e);
}
diff --git a/src/com/android/settings/fuelgauge/protos/power_anomaly_event.proto b/src/com/android/settings/fuelgauge/protos/power_anomaly_event.proto
index b4277c4..380c786 100644
--- a/src/com/android/settings/fuelgauge/protos/power_anomaly_event.proto
+++ b/src/com/android/settings/fuelgauge/protos/power_anomaly_event.proto
@@ -4,14 +4,19 @@
option java_package = "com.android.settings.fuelgauge.batteryusage";
option java_outer_classname = "PowerAnomalyEventProto";
+message PowerAnomalyEventList {
+ repeated PowerAnomalyEvent power_anomaly_events = 1;
+}
+
message PowerAnomalyEvent {
- optional int64 timestamp = 1;
- optional string type = 2; // e.g. settings, apps
- optional string key = 3; // e.g. brightness, significant_increase
- optional float score = 4;
+ optional string event_id = 1;
+ optional int64 timestamp = 2;
+ optional string type = 3; // e.g. settings, apps
+ optional string key = 4; // e.g. brightness, significant_increase
+ optional float score = 5;
oneof info {
- WarningBannerInfo warning_banner_info = 5;
- WarningItemInfo warning_item_info = 6;
+ WarningBannerInfo warning_banner_info = 6;
+ WarningItemInfo warning_item_info = 7;
}
}
@@ -19,9 +24,11 @@
optional string title_string = 1;
optional string description_string = 2;
optional string main_button_string = 3;
- optional string main_button_action = 4;
- optional string cancel_button_string = 5;
- optional string cancel_button_action = 6;
+ // Used in the SubSettingLauncher.setDestination().
+ optional string main_button_destination = 4;
+ // Used in the SubSettingLauncher.setSourceMetricsCategory().
+ optional int32 main_button_source_metrics_category = 5;
+ optional string cancel_button_string = 6;
}
message WarningItemInfo {
@@ -31,7 +38,9 @@
optional string title_string = 4;
optional string description_string = 5;
optional string main_button_string = 6;
- optional string main_button_action = 7;
- optional string cancel_button_string = 8;
- optional string cancel_button_action = 9;
+ // Used in the SubSettingLauncher.setDestination().
+ optional string main_button_destination = 7;
+ // Used in the SubSettingLauncher.setSourceMetricsCategory().
+ optional int32 main_button_source_metrics_category = 8;
+ optional string cancel_button_string = 9;
}
diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
index f703c83..6054c59 100644
--- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
+++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
@@ -31,6 +31,7 @@
import android.widget.CheckBox;
import android.widget.CompoundButton;
+import androidx.annotation.VisibleForTesting;
import androidx.core.view.MotionEventCompat;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
@@ -178,17 +179,33 @@
// clear listener before setChecked() in case another item already bind to
// current ViewHolder and checked event is triggered on stale listener mistakenly.
checkbox.setOnCheckedChangeListener(null);
- checkbox.setChecked(mRemoveMode ? feedItem.getChecked() : false);
+ boolean isChecked = mRemoveMode ? feedItem.getChecked() : false;
+ checkbox.setChecked(isChecked);
+ setCheckBoxDescription(dragCell, checkbox, isChecked);
+
checkbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
LocaleStore.LocaleInfo feedItem =
(LocaleStore.LocaleInfo) dragCell.getTag();
feedItem.setChecked(isChecked);
+ setCheckBoxDescription(dragCell, checkbox, isChecked);
}
});
}
+ @VisibleForTesting
+ protected void setCheckBoxDescription(LocaleDragCell dragCell, CheckBox checkbox,
+ boolean isChecked) {
+ CharSequence checkedStatus = mContext.getText(
+ isChecked ? com.android.internal.R.string.checked
+ : com.android.internal.R.string.not_checked);
+ // Talkback
+ dragCell.setStateDescription(checkedStatus);
+ // Select to Speak
+ checkbox.setContentDescription(checkedStatus);
+ }
+
@Override
public int getItemCount() {
int itemCount = (null != mFeedItemList ? mFeedItemList.size() : 0);
diff --git a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
index 106aa02..03f3be4 100644
--- a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
@@ -119,20 +119,21 @@
String summary;
if (isDisabledByCarrier) {
summary = mContext.getString(R.string.enable_2g_summary_disabled_carrier,
- getCarrierName());
+ getSimCardName());
} else {
summary = mContext.getString(R.string.enable_2g_summary);
}
preference.setSummary(summary);
}
- private String getCarrierName() {
+ private String getSimCardName() {
SubscriptionInfo subInfo = SubscriptionUtil.getSubById(mSubscriptionManager, mSubId);
if (subInfo == null) {
return "";
}
- CharSequence carrierName = subInfo.getCarrierName();
- return TextUtils.isEmpty(carrierName) ? "" : carrierName.toString();
+ // It is the sim card name, and it should be the same name as the sim page.
+ CharSequence simCardName = subInfo.getDisplayName();
+ return TextUtils.isEmpty(simCardName) ? "" : simCardName.toString();
}
/**
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index f2f6520..e4ebad7 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -20,9 +20,6 @@
import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PASSWORD_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PATTERN_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PIN_HEADER;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PASSWORD;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PATTERN;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PIN;
import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
import android.app.Activity;
@@ -211,7 +208,7 @@
}
if (mDetails == null) {
promptInfo.setDeviceCredentialSubtitle(
- getDetailsFromCredentialType(credentialType, isEffectiveUserManagedProfile));
+ Utils.getConfirmCredentialStringForUser(this, mUserId, credentialType));
}
boolean launchedBiometric = false;
@@ -342,39 +339,6 @@
return null;
}
- private String getDetailsFromCredentialType(@LockPatternUtils.CredentialType int credentialType,
- boolean isEffectiveUserManagedProfile) {
- switch (credentialType) {
- case LockPatternUtils.CREDENTIAL_TYPE_PIN:
- if (isEffectiveUserManagedProfile) {
- return mDevicePolicyManager.getResources().getString(WORK_PROFILE_CONFIRM_PIN,
- () -> getString(
- R.string.lockpassword_confirm_your_pin_generic_profile));
- }
-
- return getString(R.string.lockpassword_confirm_your_pin_generic);
- case LockPatternUtils.CREDENTIAL_TYPE_PATTERN:
- if (isEffectiveUserManagedProfile) {
- return mDevicePolicyManager.getResources().getString(
- WORK_PROFILE_CONFIRM_PATTERN,
- () -> getString(
- R.string.lockpassword_confirm_your_pattern_generic_profile));
- }
-
- return getString(R.string.lockpassword_confirm_your_pattern_generic);
- case LockPatternUtils.CREDENTIAL_TYPE_PASSWORD:
- if (isEffectiveUserManagedProfile) {
- return mDevicePolicyManager.getResources().getString(
- WORK_PROFILE_CONFIRM_PASSWORD,
- () -> getString(
- R.string.lockpassword_confirm_your_password_generic_profile));
- }
-
- return getString(R.string.lockpassword_confirm_your_password_generic);
- }
- return null;
- }
-
@Override
protected void onStart() {
super.onStart();
diff --git a/src/com/android/settings/password/ForgotPasswordActivity.java b/src/com/android/settings/password/ForgotPasswordActivity.java
index 9afda18..92dc336 100644
--- a/src/com/android/settings/password/ForgotPasswordActivity.java
+++ b/src/com/android/settings/password/ForgotPasswordActivity.java
@@ -50,6 +50,7 @@
finish();
return;
}
+ ThemeHelper.trySetDynamicColor(this);
setContentView(R.layout.forgot_password_activity);
DevicePolicyManager devicePolicyManager = getSystemService(DevicePolicyManager.class);
diff --git a/src/com/android/settings/password/SaveAndFinishWorker.java b/src/com/android/settings/password/SaveAndFinishWorker.java
index df679e5..40054b7 100644
--- a/src/com/android/settings/password/SaveAndFinishWorker.java
+++ b/src/com/android/settings/password/SaveAndFinishWorker.java
@@ -107,7 +107,12 @@
@VisibleForTesting
Pair<Boolean, Intent> saveAndVerifyInBackground() {
final int userId = mUserId;
- if (!mUtils.setLockCredential(mChosenCredential, mCurrentCredential, userId)) {
+ try {
+ if (!mUtils.setLockCredential(mChosenCredential, mCurrentCredential, userId)) {
+ return Pair.create(false, null);
+ }
+ } catch (RuntimeException e) {
+ Log.e(TAG, "Failed to set lockscreen credential", e);
return Pair.create(false, null);
}
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 39b5ab9..c5316e6 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -17,6 +17,7 @@
package com.android.settings.print;
import android.app.Activity;
+import android.app.ActivityOptions;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
@@ -547,8 +548,13 @@
@Override
public void onClick(View v) {
try {
+ Bundle options = ActivityOptions.makeBasic()
+ .setPendingIntentBackgroundActivityStartMode(
+ ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED)
+ .toBundle();
getActivity().startIntentSender(
- printer.getInfoIntent().getIntentSender(), null, 0, 0, 0);
+ printer.getInfoIntent().getIntentSender(), null, 0, 0, 0,
+ options);
} catch (SendIntentException e) {
Log.e(LOG_TAG, "Could not execute pending info intent: %s", e);
}
diff --git a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
index ff90492..72a57ed 100644
--- a/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
+++ b/src/com/android/settings/spa/app/appcompat/UserAspectRatioAppsPageProvider.kt
@@ -48,6 +48,9 @@
import com.android.settingslib.spa.framework.util.filterItem
import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel
+import com.android.settingslib.spa.widget.illustration.Illustration
+import com.android.settingslib.spa.widget.illustration.IllustrationModel
+import com.android.settingslib.spa.widget.illustration.ResourceType
import com.android.settingslib.spa.widget.ui.SettingsBody
import com.android.settingslib.spa.widget.ui.SpinnerOption
import com.android.settingslib.spaprivileged.model.app.AppListModel
@@ -109,6 +112,10 @@
Box(Modifier.padding(SettingsDimension.itemPadding)) {
SettingsBody(UserAspectRatioAppsPageProvider.getSummary())
}
+ Illustration(object : IllustrationModel {
+ override val resId = R.raw.user_aspect_ratio_education
+ override val resourceType = ResourceType.LOTTIE
+ })
}
)
}
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index a91bb6c..8cec2f4 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -61,7 +61,7 @@
import com.android.internal.net.VpnConfig;
import com.android.internal.net.VpnProfile;
import com.android.settings.R;
-import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.GearPreference;
import com.android.settings.widget.GearPreference.OnGearClickListener;
@@ -80,7 +80,7 @@
* Settings screen listing VPNs. Configured VPNs and networks managed by apps
* are shown in the same list.
*/
-public class VpnSettings extends RestrictedSettingsFragment implements
+public class VpnSettings extends RestrictedDashboardFragment implements
Handler.Callback, Preference.OnPreferenceClickListener {
private static final String LOG_TAG = "VpnSettings";
private static final boolean DEBUG = Log.isLoggable(LOG_TAG, Log.DEBUG);
@@ -135,7 +135,6 @@
mUnavailable = isUiRestricted();
setHasOptionsMenu(!mUnavailable);
- addPreferencesFromResource(R.xml.vpn_settings2);
mPreferenceScreen = getPreferenceScreen();
}
@@ -212,6 +211,16 @@
}
@Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.vpn_settings2;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return LOG_TAG;
+ }
+
+ @Override
public void onPause() {
if (mUnavailable) {
super.onPause();
diff --git a/src/com/android/settings/wifi/LongPressWifiEntryPreference.java b/src/com/android/settings/wifi/LongPressWifiEntryPreference.java
index 6343e06..ec94e74 100644
--- a/src/com/android/settings/wifi/LongPressWifiEntryPreference.java
+++ b/src/com/android/settings/wifi/LongPressWifiEntryPreference.java
@@ -22,6 +22,7 @@
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.RestrictedLockUtils;
import com.android.wifitrackerlib.WifiEntry;
/**
@@ -34,7 +35,7 @@
public LongPressWifiEntryPreference(Context context, WifiEntry wifiEntry, Fragment fragment) {
super(context, wifiEntry);
mFragment = fragment;
- checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);
+ checkRestrictionAndSetDisabled();
}
@Override
@@ -65,4 +66,22 @@
}
return enabled;
}
+
+ @VisibleForTesting
+ void checkRestrictionAndSetDisabled() {
+ if (!getWifiEntry().hasAdminRestrictions()) {
+ return;
+ }
+ RestrictedLockUtils.EnforcedAdmin admin = null;
+ Context context = getContext();
+ if (context != null) {
+ admin = RestrictedLockUtils.getProfileOrDeviceOwner(context, context.getUser());
+ }
+ if (admin == null) {
+ // Use UserManager.DISALLOW_ADD_WIFI_CONFIG as default Wi-Fi network restriction.
+ admin = RestrictedLockUtils.EnforcedAdmin.createDefaultEnforcedAdminWithRestriction(
+ UserManager.DISALLOW_ADD_WIFI_CONFIG);
+ }
+ setDisabledByAdmin(admin);
+ }
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
index d3a4be7..7af8343 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
@@ -223,11 +223,9 @@
private Button createActionButton(Drawable icon, CharSequence title, View.OnClickListener r) {
final Button b = (Button) LayoutInflater.from(getContext()).inflate(
- com.android.internal.R.layout.chooser_action_button, null);
+ R.layout.action_button, null);
if (icon != null) {
- final int size = getResources()
- .getDimensionPixelSize(
- com.android.internal.R.dimen.chooser_action_button_icon_size);
+ final int size = getResources().getDimensionPixelSize(R.dimen.action_button_icon_size);
icon.setBounds(0, 0, size, size);
b.setCompoundDrawablesRelative(icon, null, null, null);
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppUtils.java b/src/com/android/settings/wifi/dpp/WifiDppUtils.java
index 39a5431..c336c62 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppUtils.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppUtils.java
@@ -27,11 +27,13 @@
import android.os.CancellationSignal;
import android.os.Handler;
import android.os.Looper;
+import android.os.UserHandle;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.text.TextUtils;
import com.android.settings.R;
+import com.android.settings.Utils;
import com.android.settingslib.wifi.AccessPoint;
import com.android.wifitrackerlib.WifiEntry;
@@ -391,11 +393,19 @@
}
};
+ final int userId = UserHandle.myUserId();
+
final BiometricPrompt.Builder builder = new BiometricPrompt.Builder(context)
- .setTitle(context.getText(R.string.wifi_dpp_lockscreen_title));
+ .setTitle(context.getText(R.string.wifi_dpp_lockscreen_title))
+ .setUseDefaultSubtitle();
if (keyguardManager.isDeviceSecure()) {
builder.setDeviceCredentialAllowed(true);
+ builder.setTextForDeviceCredential(
+ null /* title */,
+ Utils.getConfirmCredentialStringForUser(
+ context, userId, Utils.getCredentialType(context, userId)),
+ null /* description */);
}
final BiometricPrompt bp = builder.build();
diff --git a/src/com/android/settings/wifi/dpp/WifiQrCode.java b/src/com/android/settings/wifi/dpp/WifiQrCode.java
index 2b4c3ed..70ac96c 100644
--- a/src/com/android/settings/wifi/dpp/WifiQrCode.java
+++ b/src/com/android/settings/wifi/dpp/WifiQrCode.java
@@ -160,8 +160,9 @@
private String getValueOrNull(List<String> keyValueList, String prefix) {
for (String keyValue : keyValueList) {
- if (keyValue.startsWith(prefix)) {
- return keyValue.substring(prefix.length());
+ String strippedKeyValue = keyValue.stripLeading();
+ if (strippedKeyValue.startsWith(prefix)) {
+ return strippedKeyValue.substring(prefix.length());
}
}
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
index f0a18ec..733a5e6 100644
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -16,9 +16,15 @@
package com.android.settings;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PASSWORD;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PATTERN;
+import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PIN;
+
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
@@ -31,6 +37,7 @@
import android.app.ActionBar;
import android.app.admin.DevicePolicyManager;
+import android.app.admin.DevicePolicyResourcesManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.ApplicationInfo;
@@ -60,6 +67,7 @@
import androidx.core.graphics.drawable.IconCompat;
import androidx.fragment.app.FragmentActivity;
+import com.android.internal.widget.LockPatternUtils;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
import org.junit.After;
@@ -94,6 +102,8 @@
@Mock
private DevicePolicyManager mDevicePolicyManager;
@Mock
+ private DevicePolicyResourcesManager mDevicePolicyResourcesManager;
+ @Mock
private UserManager mMockUserManager;
@Mock
private PackageManager mPackageManager;
@@ -348,4 +358,103 @@
SecurityException.class,
() -> Utils.checkUserOwnsFrpCredential(mContext, 123));
}
+
+ @Test
+ public void getConfirmCredentialStringForUser_Pin_shouldReturnCorrectString() {
+ setUpForConfirmCredentialString(false /* isEffectiveUserManagedProfile */);
+
+ when(mContext.getString(R.string.lockpassword_confirm_your_pin_generic))
+ .thenReturn("PIN");
+
+ String confirmCredentialString = Utils.getConfirmCredentialStringForUser(mContext,
+ USER_ID, LockPatternUtils.CREDENTIAL_TYPE_PIN);
+
+ assertThat(confirmCredentialString).isEqualTo("PIN");
+ }
+
+ @Test
+ public void getConfirmCredentialStringForUser_Pattern_shouldReturnCorrectString() {
+ setUpForConfirmCredentialString(false /* isEffectiveUserManagedProfile */);
+
+ when(mContext.getString(R.string.lockpassword_confirm_your_pattern_generic))
+ .thenReturn("PATTERN");
+
+ String confirmCredentialString = Utils.getConfirmCredentialStringForUser(mContext,
+ USER_ID, LockPatternUtils.CREDENTIAL_TYPE_PATTERN);
+
+ assertThat(confirmCredentialString).isEqualTo("PATTERN");
+ }
+
+ @Test
+ public void getConfirmCredentialStringForUser_Password_shouldReturnCorrectString() {
+ setUpForConfirmCredentialString(false /* isEffectiveUserManagedProfile */);
+
+ when(mContext.getString(R.string.lockpassword_confirm_your_password_generic))
+ .thenReturn("PASSWORD");
+
+ String confirmCredentialString = Utils.getConfirmCredentialStringForUser(mContext,
+ USER_ID, LockPatternUtils.CREDENTIAL_TYPE_PASSWORD);
+
+ assertThat(confirmCredentialString).isEqualTo("PASSWORD");
+ }
+
+ @Test
+ public void getConfirmCredentialStringForUser_workPin_shouldReturnCorrectString() {
+ setUpForConfirmCredentialString(true /* isEffectiveUserManagedProfile */);
+
+ when(mDevicePolicyResourcesManager
+ .getString(eq(WORK_PROFILE_CONFIRM_PIN), any()))
+ .thenReturn("WORK PIN");
+
+ String confirmCredentialString = Utils.getConfirmCredentialStringForUser(mContext,
+ USER_ID, LockPatternUtils.CREDENTIAL_TYPE_PIN);
+
+ assertThat(confirmCredentialString).isEqualTo("WORK PIN");
+ }
+
+ @Test
+ public void getConfirmCredentialStringForUser_workPattern_shouldReturnCorrectString() {
+ setUpForConfirmCredentialString(true /* isEffectiveUserManagedProfile */);
+
+ when(mDevicePolicyResourcesManager
+ .getString(eq(WORK_PROFILE_CONFIRM_PATTERN), any()))
+ .thenReturn("WORK PATTERN");
+
+ String confirmCredentialString = Utils.getConfirmCredentialStringForUser(mContext,
+ USER_ID, LockPatternUtils.CREDENTIAL_TYPE_PATTERN);
+
+ assertThat(confirmCredentialString).isEqualTo("WORK PATTERN");
+ }
+
+ @Test
+ public void getConfirmCredentialStringForUser_workPassword_shouldReturnCorrectString() {
+ setUpForConfirmCredentialString(true /* isEffectiveUserManagedProfile */);
+
+ when(mDevicePolicyResourcesManager
+ .getString(eq(WORK_PROFILE_CONFIRM_PASSWORD), any()))
+ .thenReturn("WORK PASSWORD");
+
+ String confirmCredentialString = Utils.getConfirmCredentialStringForUser(mContext,
+ USER_ID, LockPatternUtils.CREDENTIAL_TYPE_PASSWORD);
+
+ assertThat(confirmCredentialString).isEqualTo("WORK PASSWORD");
+ }
+
+ @Test
+ public void getConfirmCredentialStringForUser_credentialTypeNone_shouldReturnNull() {
+ setUpForConfirmCredentialString(false /* isEffectiveUserManagedProfile */);
+
+ String confirmCredentialString = Utils.getConfirmCredentialStringForUser(mContext,
+ USER_ID, LockPatternUtils.CREDENTIAL_TYPE_NONE);
+
+ assertNull(confirmCredentialString);
+ }
+
+ private void setUpForConfirmCredentialString(boolean isEffectiveUserManagedProfile) {
+ when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mMockUserManager);
+ when(mMockUserManager.getCredentialOwnerProfile(USER_ID)).thenReturn(USER_ID);
+ when(mMockUserManager.isManagedProfile(USER_ID)).thenReturn(isEffectiveUserManagedProfile);
+ when(mContext.getSystemService(DevicePolicyManager.class)).thenReturn(mDevicePolicyManager);
+ when(mDevicePolicyManager.getResources()).thenReturn(mDevicePolicyResourcesManager);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/applications/appcompat/UserAspectRatioDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appcompat/UserAspectRatioDetailsTest.java
index 31ff76c..d98b0e7 100644
--- a/tests/robotests/src/com/android/settings/applications/appcompat/UserAspectRatioDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appcompat/UserAspectRatioDetailsTest.java
@@ -32,7 +32,6 @@
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.testutils.shadow.ShadowActivityManager;
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
import org.junit.Before;
import org.junit.Test;
@@ -54,7 +53,7 @@
@Mock
private IActivityManager mAm;
- private SelectorWithWidgetPreference mRadioButtonPref;
+ private RadioWithImagePreference mRadioButtonPref;
private Context mContext;
private UserAspectRatioDetails mFragment;
@@ -67,7 +66,7 @@
when(mFragment.getContext()).thenReturn(mContext);
when(mFragment.getAspectRatioManager()).thenReturn(mUserAspectRatioManager);
ShadowActivityManager.setService(mAm);
- mRadioButtonPref = new SelectorWithWidgetPreference(mContext);
+ mRadioButtonPref = new RadioWithImagePreference(mContext);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java b/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java
index 2ce0757..4781f56 100644
--- a/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java
@@ -43,6 +43,7 @@
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
import android.os.Bundle;
+import android.util.AndroidRuntimeException;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -58,7 +59,10 @@
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
+import com.android.settings.biometrics.BiometricStatusPreferenceController;
import com.android.settings.biometrics.BiometricsSplitScreenDialog;
+import com.android.settings.biometrics.face.FaceStatusPreferenceController;
+import com.android.settings.biometrics.fingerprint.FingerprintStatusPreferenceController;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowFragment;
@@ -68,7 +72,6 @@
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -86,7 +89,6 @@
import java.util.List;
import java.util.Map;
-@Ignore
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowSettingsPreferenceFragment.class, ShadowUtils.class, ShadowFragment.class})
public class CombinedBiometricProfileSettingsTest {
@@ -104,6 +106,10 @@
@Mock
private BiometricSettingsAppPreferenceController mBiometricSettingsAppPreferenceController;
@Mock
+ private FingerprintStatusPreferenceController mFingerprintStatusPreferenceController;
+ @Mock
+ private FaceStatusPreferenceController mFaceStatusPreferenceController;
+ @Mock
private FaceManager mFaceManager;
@Mock
private FragmentTransaction mFragmentTransaction;
@@ -128,6 +134,29 @@
List<AbstractPreferenceController> controllerList = new ArrayList<>();
controllerList.add(mBiometricSettingsAppPreferenceController);
preferenceControllers.put(BiometricSettingsAppPreferenceController.class, controllerList);
+ controllerList.add(mFingerprintStatusPreferenceController);
+ preferenceControllers.put(FingerprintStatusPreferenceController.class, controllerList);
+ controllerList.add(mFaceStatusPreferenceController);
+ preferenceControllers.put(FaceStatusPreferenceController.class, controllerList);
+
+ doAnswer(invocation -> {
+ final Preference preference = invocation.getArgument(0);
+ return preference.getKey().equals(mFragment.getFingerprintPreferenceKey());
+ }).when(mFingerprintStatusPreferenceController)
+ .setPreferenceTreeClickLauncher(any(), any());
+ doAnswer(invocation -> {
+ final Preference preference = invocation.getArgument(0);
+ return preference.getKey().equals(mFragment.getFingerprintPreferenceKey());
+ }).when(mFingerprintStatusPreferenceController).handlePreferenceTreeClick(any());
+ doAnswer(invocation -> {
+ final Preference preference = invocation.getArgument(0);
+ return preference.getKey().equals(mFragment.getFacePreferenceKey());
+ }).when(mFaceStatusPreferenceController)
+ .setPreferenceTreeClickLauncher(any(), any());
+ doAnswer(invocation -> {
+ final Preference preference = invocation.getArgument(0);
+ return preference.getKey().equals(mFragment.getFacePreferenceKey());
+ }).when(mFaceStatusPreferenceController).handlePreferenceTreeClick(any());
doAnswer(invocation -> {
final CharSequence key = invocation.getArgument(0);
@@ -164,7 +193,7 @@
preference.setKey(mFragment.getFingerprintPreferenceKey());
mFragment.onPreferenceTreeClick(preference);
- verify(mBiometricSettingsAppPreferenceController).handlePreferenceTreeClick(
+ verify(mFingerprintStatusPreferenceController).handlePreferenceTreeClick(
mPreferenceCaptor.capture());
List<Preference> capturedPreferences = mPreferenceCaptor.getAllValues();
@@ -224,7 +253,7 @@
mFragment.onActivityResult(CONFIRM_REQUEST, RESULT_FINISHED,
new Intent().putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, 1L));
- verify(mBiometricSettingsAppPreferenceController).handlePreferenceTreeClick(
+ verify(mFingerprintStatusPreferenceController).handlePreferenceTreeClick(
mPreferenceCaptor.capture());
List<Preference> capturedPreferences = mPreferenceCaptor.getAllValues();
assertThat(capturedPreferences.size()).isEqualTo(1);
@@ -254,7 +283,7 @@
preference.setKey(mFragment.getFacePreferenceKey());
mFragment.onPreferenceTreeClick(preference);
- verify(mBiometricSettingsAppPreferenceController).handlePreferenceTreeClick(
+ verify(mFaceStatusPreferenceController).handlePreferenceTreeClick(
mPreferenceCaptor.capture());
List<Preference> capturedPreferences = mPreferenceCaptor.getAllValues();
assertThat(capturedPreferences.size()).isEqualTo(1);
@@ -313,7 +342,7 @@
preference.setKey(mFragment.getFacePreferenceKey());
mFragment.onPreferenceTreeClick(preference);
- verify(mBiometricSettingsAppPreferenceController).handlePreferenceTreeClick(
+ verify(mFaceStatusPreferenceController).handlePreferenceTreeClick(
mPreferenceCaptor.capture());
List<Preference> capturedPreferences = mPreferenceCaptor.getAllValues();
assertThat(capturedPreferences.size()).isEqualTo(1);
@@ -323,7 +352,7 @@
@Test
public void testClickFingerprintUnlock_inMultiWindow_withoutEnrolledFp_showsDialog() {
testClickFingerprintUnlock(true /* isInMultiWindow */, false /* hasEnrolledFingerprint */);
- verifyShowsDialogAfterClickingUnlock();
+ verifyShowsDialogAfterClickingUnlock(mFragment.getFingerprintPreferenceKey());
}
@Test
@@ -380,7 +409,7 @@
@Test
public void testClickFaceUnlock_inMultiWindow_withoutEnrolledFp_showsDialog() {
testClickFaceUnlock(true /* isInMultiWindow */, false /*hasEnrolledFace*/);
- verifyShowsDialogAfterClickingUnlock();
+ verifyShowsDialogAfterClickingUnlock(mFragment.getFacePreferenceKey());
}
@Test
@@ -424,8 +453,11 @@
}
private void verifyNoDialogAfterClickingUnlock(String preferenceKey) {
- verify(mBiometricSettingsAppPreferenceController).handlePreferenceTreeClick(
- mPreferenceCaptor.capture());
+ final BiometricStatusPreferenceController controller =
+ preferenceKey.equals(mFragment.getFacePreferenceKey())
+ ? mFaceStatusPreferenceController
+ : mFingerprintStatusPreferenceController;
+ verify(controller).handlePreferenceTreeClick(mPreferenceCaptor.capture());
List<Preference> capturedPreferences = mPreferenceCaptor.getAllValues();
assertThat(capturedPreferences).hasSize(1);
assertThat(capturedPreferences.get(0).getKey()).isEqualTo(preferenceKey);
@@ -433,12 +465,77 @@
eq(BiometricsSplitScreenDialog.class.getName()));
}
- private void verifyShowsDialogAfterClickingUnlock() {
- verify(mBiometricSettingsAppPreferenceController, never()).handlePreferenceTreeClick(any());
+ private void verifyShowsDialogAfterClickingUnlock(String preferenceKey) {
+ final BiometricStatusPreferenceController controller =
+ preferenceKey.equals(mFragment.getFacePreferenceKey())
+ ? mFaceStatusPreferenceController
+ : mFingerprintStatusPreferenceController;
+ verify(controller, never()).handlePreferenceTreeClick(any());
verify(mFragmentTransaction).add(any(),
eq(BiometricsSplitScreenDialog.class.getName()));
}
+ @Test
+ public void testNoCrashIfDetachActivityDuringGeneratingChallengeThroughFaceManager() {
+ doAnswer(invocation -> {
+ final FaceManager.GenerateChallengeCallback callback =
+ invocation.getArgument(1);
+ mFragment.onPause();
+ mFragment.onStop();
+ mFragment.onDestroy();
+ mFragment.onDetach();
+ doReturn(null).when(mFragment).getActivity();
+ callback.onGenerateChallengeResult(0, 0, 1L);
+ return null;
+ }).when(mFaceManager).generateChallenge(anyInt(), any());
+ doThrow(new IllegalStateException("Test")).when(mFragment).requestGatekeeperHat(
+ any(), anyLong(), anyInt(), anyLong());
+ FragmentManager fragmentManager = mock(FragmentManager.class);
+
+ // Start fragment
+ mFragment.onAttach(mContext);
+ mFragment.onCreate(null);
+ mFragment.onCreateView(LayoutInflater.from(mContext), mock(ViewGroup.class), Bundle.EMPTY);
+ mFragment.onResume();
+
+ // User clicks on "Face Unlock"
+ final Preference preference = new Preference(mContext);
+ preference.setKey(mFragment.getFacePreferenceKey());
+ mFragment.onPreferenceTreeClick(preference);
+
+ verify(mFragment, never()).launchChooseOrConfirmLock();
+ }
+
+ @Test
+ public void testNoCrashIfDetachActivityDuringGeneratingChallengeThroughFingerprintManager() {
+ doAnswer(invocation -> {
+ final FingerprintManager.GenerateChallengeCallback callback =
+ invocation.getArgument(1);
+ mFragment.onPause();
+ mFragment.onStop();
+ mFragment.onDestroy();
+ mFragment.onDetach();
+ doReturn(null).when(mFragment).getActivity();
+ callback.onChallengeGenerated(0, 0, 1L);
+ return null;
+ }).when(mFingerprintManager).generateChallenge(anyInt(), any());
+ doThrow(new IllegalStateException("Test")).when(mFragment).requestGatekeeperHat(
+ any(), anyLong(), anyInt(), anyLong());
+
+ // Start fragment
+ mFragment.onAttach(mContext);
+ mFragment.onCreate(null);
+ mFragment.onCreateView(LayoutInflater.from(mContext), mock(ViewGroup.class), Bundle.EMPTY);
+ mFragment.onResume();
+
+ // User clicks on "Fingerprint Unlock"
+ final Preference preference = new Preference(mContext);
+ preference.setKey(mFragment.getFingerprintPreferenceKey());
+ mFragment.onPreferenceTreeClick(preference);
+
+ verify(mFragment, never()).launchChooseOrConfirmLock();
+ }
+
/**
* a test fragment that initializes PreferenceScreen for testing.
*/
@@ -492,7 +589,9 @@
@Override
protected void launchChooseOrConfirmLock() {
- // do nothing
+ if (getActivity() == null) {
+ throw new AndroidRuntimeException("TestFailed");
+ }
}
}
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java
index 3c459de..9538092 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java
@@ -57,6 +57,7 @@
import com.android.settings.R;
import com.android.settings.dashboard.profileselector.UserAdapter;
+import com.android.settingslib.PrimarySwitchPreference;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -403,9 +404,10 @@
Settings.Secure.STYLUS_HANDWRITING_ENABLED, 1);
showScreen(mController);
- SwitchPreference handwritingPref = (SwitchPreference) mPreferenceContainer.getPreference(1);
+ PrimarySwitchPreference handwritingPref =
+ (PrimarySwitchPreference) mPreferenceContainer.getPreference(1);
- assertThat(handwritingPref.isChecked()).isEqualTo(true);
+ assertThat(handwritingPref.getCheckedState()).isEqualTo(true);
}
@Test
@@ -414,9 +416,10 @@
Settings.Secure.STYLUS_HANDWRITING_ENABLED, 0);
showScreen(mController);
- SwitchPreference handwritingPref = (SwitchPreference) mPreferenceContainer.getPreference(1);
+ PrimarySwitchPreference handwritingPref =
+ (PrimarySwitchPreference) mPreferenceContainer.getPreference(1);
- assertThat(handwritingPref.isChecked()).isEqualTo(false);
+ assertThat(handwritingPref.getCheckedState()).isEqualTo(false);
}
@Test
@@ -424,21 +427,20 @@
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.STYLUS_HANDWRITING_ENABLED, 0);
showScreen(mController);
- SwitchPreference handwritingPref = (SwitchPreference) mPreferenceContainer.getPreference(1);
+ PrimarySwitchPreference handwritingPref =
+ (PrimarySwitchPreference) mPreferenceContainer.getPreference(1);
- handwritingPref.performClick();
+ handwritingPref.callChangeListener(true);
- assertThat(handwritingPref.isChecked()).isEqualTo(true);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.STYLUS_HANDWRITING_ENABLED, -1)).isEqualTo(1);
}
@Test
- public void handwritingPreference_startsHandwritingSettingsOnClickIfChecked() {
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.STYLUS_HANDWRITING_ENABLED, 0);
+ public void handwritingPreference_startsHandwritingSettingsOnClick() {
showScreen(mController);
- SwitchPreference handwritingPref = (SwitchPreference) mPreferenceContainer.getPreference(1);
+ PrimarySwitchPreference handwritingPref =
+ (PrimarySwitchPreference) mPreferenceContainer.getPreference(1);
handwritingPref.performClick();
@@ -447,11 +449,23 @@
}
@Test
- public void handwritingPreference_doesNotStartHandwritingSettingsOnClickIfNotChecked() {
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.STYLUS_HANDWRITING_ENABLED, 1);
+ public void handwritingPreference_doesNotStartHandwritingSettingsOnChange() {
showScreen(mController);
- SwitchPreference handwritingPref = (SwitchPreference) mPreferenceContainer.getPreference(1);
+ PrimarySwitchPreference handwritingPref =
+ (PrimarySwitchPreference) mPreferenceContainer.getPreference(1);
+
+ handwritingPref.callChangeListener(true);
+
+ verify(mInputMethodInfo, times(0)).createStylusHandwritingSettingsActivityIntent();
+ verify(mContext, times(0)).startActivity(any());
+ }
+
+ @Test
+ public void handwritingPreference_doesNotCreateIntentIfNoInputMethod() {
+ when(mImm.getCurrentInputMethodInfo()).thenReturn(null);
+ showScreen(mController);
+ PrimarySwitchPreference handwritingPref =
+ (PrimarySwitchPreference) mPreferenceContainer.getPreference(1);
handwritingPref.performClick();
@@ -463,14 +477,12 @@
public void handwritingPreference_doesNotStartHandwritingSettingsIfNoIntent() {
when(mInputMethodInfo.createStylusHandwritingSettingsActivityIntent())
.thenReturn(null);
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.STYLUS_HANDWRITING_ENABLED, 1);
showScreen(mController);
- SwitchPreference handwritingPref = (SwitchPreference) mPreferenceContainer.getPreference(1);
+ PrimarySwitchPreference handwritingPref =
+ (PrimarySwitchPreference) mPreferenceContainer.getPreference(1);
handwritingPref.performClick();
- verify(mInputMethodInfo, times(0)).createStylusHandwritingSettingsActivityIntent();
verify(mContext, times(0)).startActivity(any());
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index c9591a5..bf4e893 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -73,8 +73,8 @@
}
@Test
- public void testIsBatteryTipsFeedbackEnabled_returnTrue() {
- assertThat(mPowerFeatureProvider.isBatteryTipsFeedbackEnabled()).isTrue();
+ public void testIsBatteryTipsFeedbackEnabled_returnFalse() {
+ assertThat(mPowerFeatureProvider.isBatteryTipsFeedbackEnabled()).isFalse();
}
@Test
public void testGetBatteryUsageListConsumePowerThreshold_return0() {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java
index 6f9a474..bc787f1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreferenceTest.java
@@ -35,11 +35,14 @@
private Context mContext;
private BatteryTipsCardPreference mBatteryTipsCardPreference;
+ private BatteryTipsController mBatteryTipsController;
@Before
public void setUp() {
mContext = spy(RuntimeEnvironment.application);
mBatteryTipsCardPreference = new BatteryTipsCardPreference(mContext, /*attrs=*/ null);
+ mBatteryTipsController = new BatteryTipsController(mContext);
+ mBatteryTipsController.mCardPreference = mBatteryTipsCardPreference;
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java
new file mode 100644
index 0000000..0c9a0b0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryTipsControllerTest.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge.batteryusage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.LocaleList;
+
+import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
+import com.android.settings.testutils.BatteryTestUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.Locale;
+import java.util.TimeZone;
+
+@RunWith(RobolectricTestRunner.class)
+public final class BatteryTipsControllerTest {
+
+ private Context mContext;
+ private BatteryTipsController mBatteryTipsController;
+
+ @Mock
+ private BatteryTipsCardPreference mBatteryTipsCardPreference;
+
+ @Mock
+ private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ Locale.setDefault(new Locale("en_US"));
+ org.robolectric.shadows.ShadowSettings.set24HourTimeFormat(false);
+ TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+ mContext = spy(RuntimeEnvironment.application);
+ final Resources resources = spy(mContext.getResources());
+ resources.getConfiguration().setLocales(new LocaleList(new Locale("en_US")));
+ doReturn(resources).when(mContext).getResources();
+ mBatteryTipsController = new BatteryTipsController(mContext);
+ mBatteryTipsController.mCardPreference = mBatteryTipsCardPreference;
+ mBatteryTipsController.mPowerUsageFeatureProvider = mPowerUsageFeatureProvider;
+ }
+
+ @Test
+ public void parsePowerAnomalyKey_preDefinedKeys_returnTrue() {
+ final String[] keys = {"adaptive_brightness", "screen_timeout"};
+ for (int index = 0; index < keys.length; index++) {
+ assertThat(mBatteryTipsController.getPowerAnomalyEventIndex(keys[index]))
+ .isEqualTo(index);
+ }
+ }
+
+ @Test
+ public void parsePowerAnomalyKey_unknownKey_returnTrue() {
+ final String key = "unknown_key_for_test";
+ assertThat(mBatteryTipsController.getPowerAnomalyEventIndex(key)).isEqualTo(-1);
+ }
+
+ @Test
+ public void handleBatteryTipsCardUpdated_null_hidePreference() {
+ mBatteryTipsController.handleBatteryTipsCardUpdated(/* powerAnomalyEvents= */ null);
+
+ verify(mBatteryTipsCardPreference).setVisible(false);
+ }
+
+ @Test
+ public void handleBatteryTipsCardUpdated_adaptiveBrightnessAnomaly_showAnomaly() {
+ PowerAnomalyEvent event = BatteryTestUtils.createAdaptiveBrightnessAnomalyEvent();
+ when(mPowerUsageFeatureProvider.isBatteryTipsEnabled()).thenReturn(true);
+
+ mBatteryTipsController.handleBatteryTipsCardUpdated(event);
+
+ // Check pre-defined string
+ verify(mBatteryTipsCardPreference).setTitle(
+ "Turn on adaptive brightness to extend battery life");
+ verify(mBatteryTipsCardPreference).setMainButtonLabel("View Settings");
+ verify(mBatteryTipsCardPreference).setDismissButtonLabel("Got it");
+ // Check proto info
+ verify(mBatteryTipsCardPreference).setMainButtonLauncherInfo(
+ "com.android.settings.display.AutoBrightnessSettings",
+ 1381);
+ verify(mBatteryTipsCardPreference).setVisible(true);
+ }
+
+ @Test
+ public void handleBatteryTipsCardUpdated_screenTimeoutAnomaly_showAnomaly() {
+ PowerAnomalyEvent event = BatteryTestUtils.createScreenTimeoutAnomalyEvent();
+ when(mPowerUsageFeatureProvider.isBatteryTipsEnabled()).thenReturn(true);
+
+ mBatteryTipsController.handleBatteryTipsCardUpdated(event);
+
+ verify(mBatteryTipsCardPreference).setTitle("Reduce screen timeout to extend battery life");
+ verify(mBatteryTipsCardPreference).setMainButtonLabel("View Settings");
+ verify(mBatteryTipsCardPreference).setDismissButtonLabel("Got it");
+ verify(mBatteryTipsCardPreference).setMainButtonLauncherInfo(
+ "com.android.settings.display.ScreenTimeoutSettings",
+ 1852);
+ verify(mBatteryTipsCardPreference).setVisible(true);
+ }
+ @Test
+ public void handleBatteryTipsCardUpdated_screenTimeoutAnomalyHasTitle_showAnomaly() {
+ PowerAnomalyEvent event = BatteryTestUtils.createScreenTimeoutAnomalyEvent();
+ String testTitle = "TestTitle";
+ event = event.toBuilder()
+ .setWarningBannerInfo(
+ event.getWarningBannerInfo().toBuilder()
+ .setTitleString(testTitle)
+ .build())
+ .build();
+ when(mPowerUsageFeatureProvider.isBatteryTipsEnabled()).thenReturn(true);
+
+ mBatteryTipsController.handleBatteryTipsCardUpdated(event);
+
+ verify(mBatteryTipsCardPreference).setTitle(testTitle);
+ verify(mBatteryTipsCardPreference).setMainButtonLabel("View Settings");
+ verify(mBatteryTipsCardPreference).setDismissButtonLabel("Got it");
+ verify(mBatteryTipsCardPreference).setMainButtonLauncherInfo(
+ "com.android.settings.display.ScreenTimeoutSettings",
+ 1852);
+ verify(mBatteryTipsCardPreference).setVisible(true);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
index 3cbe8a4..e9108bc 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
@@ -25,6 +25,7 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
+import android.app.usage.IUsageStatsManager;
import android.app.usage.UsageEvents;
import android.app.usage.UsageEvents.Event;
import android.content.ContentValues;
@@ -61,6 +62,8 @@
private BatteryUsageStats mBatteryUsageStats;
@Mock
private BatteryEntry mMockBatteryEntry;
+ @Mock
+ private IUsageStatsManager mUsageStatsManager;
@Before
public void setUp() {
@@ -68,6 +71,7 @@
mContext = spy(RuntimeEnvironment.application);
ConvertUtils.sUsageSource = ConvertUtils.EMPTY_USAGE_SOURCE;
when(mContext.getPackageManager()).thenReturn(mMockPackageManager);
+ DataProcessor.sUsageStatsManager = mUsageStatsManager;
}
@Test
@@ -299,7 +303,7 @@
final long userId = 2;
final AppUsageEvent appUsageEvent = ConvertUtils.convertToAppUsageEvent(
- mContext, event, userId);
+ mContext, mUsageStatsManager, event, userId);
assertThat(appUsageEvent.getTimestamp()).isEqualTo(101L);
assertThat(appUsageEvent.getType()).isEqualTo(AppUsageEventType.ACTIVITY_RESUMED);
assertThat(appUsageEvent.getPackageName()).isEqualTo("com.android.settings1");
@@ -320,7 +324,7 @@
final long userId = 1;
final AppUsageEvent appUsageEvent =
- ConvertUtils.convertToAppUsageEvent(mContext, event, userId);
+ ConvertUtils.convertToAppUsageEvent(mContext, mUsageStatsManager, event, userId);
assertThat(appUsageEvent.getTimestamp()).isEqualTo(101L);
assertThat(appUsageEvent.getType()).isEqualTo(AppUsageEventType.DEVICE_SHUTDOWN);
assertThat(appUsageEvent.getPackageName()).isEqualTo("com.android.settings1");
@@ -336,7 +340,8 @@
event.mPackage = null;
final AppUsageEvent appUsageEvent =
- ConvertUtils.convertToAppUsageEvent(mContext, event, /*userId=*/ 0);
+ ConvertUtils.convertToAppUsageEvent(
+ mContext, mUsageStatsManager, event, /*userId=*/ 0);
assertThat(appUsageEvent).isNull();
}
@@ -352,7 +357,7 @@
final long userId = 1;
final AppUsageEvent appUsageEvent =
- ConvertUtils.convertToAppUsageEvent(mContext, event, userId);
+ ConvertUtils.convertToAppUsageEvent(mContext, mUsageStatsManager, event, userId);
assertThat(appUsageEvent).isNull();
}
@@ -453,7 +458,7 @@
final String taskRootPackageName = "com.android.settings2";
assertThat(ConvertUtils.getEffectivePackageName(
- mContext, packageName, taskRootPackageName))
+ mContext, mUsageStatsManager, packageName, taskRootPackageName))
.isEqualTo(packageName);
}
@@ -463,7 +468,7 @@
final String taskRootPackageName = "com.android.settings2";
assertThat(ConvertUtils.getEffectivePackageName(
- mContext, packageName, taskRootPackageName))
+ mContext, mUsageStatsManager, packageName, taskRootPackageName))
.isEqualTo(packageName);
}
@@ -474,7 +479,7 @@
final String taskRootPackageName = "com.android.settings2";
assertThat(ConvertUtils.getEffectivePackageName(
- mContext, packageName, taskRootPackageName))
+ mContext, mUsageStatsManager, packageName, taskRootPackageName))
.isEqualTo(taskRootPackageName);
}
@@ -484,10 +489,10 @@
final String packageName = "com.android.settings1";
assertThat(ConvertUtils.getEffectivePackageName(
- mContext, packageName, /*taskRootPackageName=*/ null))
+ mContext, mUsageStatsManager, packageName, /*taskRootPackageName=*/ null))
.isEqualTo(packageName);
assertThat(ConvertUtils.getEffectivePackageName(
- mContext, packageName, /*taskRootPackageName=*/ ""))
+ mContext, mUsageStatsManager, packageName, /*taskRootPackageName=*/ ""))
.isEqualTo(packageName);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
index 7f7fe43..b610cfb 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
@@ -72,7 +72,7 @@
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- DatabaseUtils.sUsageStatsManager = mUsageStatsManager;
+ DataProcessor.sUsageStatsManager = mUsageStatsManager;
doReturn(mContext).when(mContext).getApplicationContext();
doReturn(mUserManager)
.when(mContext)
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
index 8bed054..c9b635e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
@@ -93,7 +93,7 @@
mPowerUsageFeatureProvider = mFeatureFactory.powerUsageFeatureProvider;
DataProcessor.sTestSystemAppsPackageNames = Set.of();
- DatabaseUtils.sUsageStatsManager = mUsageStatsManager;
+ DataProcessor.sUsageStatsManager = mUsageStatsManager;
doReturn(mIntent).when(mContext).registerReceiver(
isA(BroadcastReceiver.class), isA(IntentFilter.class));
doReturn(100).when(mIntent).getIntExtra(eq(BatteryManager.EXTRA_SCALE), anyInt());
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java
index 24be769..8a1ba13 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java
@@ -85,7 +85,7 @@
doReturn(mPackageManager).when(mMockContext).getPackageManager();
doReturn(mPackageManager).when(mContext).getPackageManager();
DatabaseUtils.getSharedPreferences(mContext).edit().clear().apply();
- DatabaseUtils.sUsageStatsManager = mUsageStatsManager;
+ DataProcessor.sUsageStatsManager = mUsageStatsManager;
}
@Test
@@ -466,7 +466,7 @@
.putInt(DatabaseUtils.KEY_LAST_USAGE_SOURCE, USAGE_SOURCE_TASK_ROOT_ACTIVITY)
.apply();
- assertThat(DatabaseUtils.getUsageSource(mContext))
+ assertThat(DatabaseUtils.getUsageSource(mContext, mUsageStatsManager))
.isEqualTo(USAGE_SOURCE_TASK_ROOT_ACTIVITY);
}
@@ -474,7 +474,7 @@
public void getUsageSource_notHasData_writeLoadedData() throws RemoteException {
when(mUsageStatsManager.getUsageSource()).thenReturn(USAGE_SOURCE_TASK_ROOT_ACTIVITY);
- assertThat(DatabaseUtils.getUsageSource(mContext))
+ assertThat(DatabaseUtils.getUsageSource(mContext, mUsageStatsManager))
.isEqualTo(USAGE_SOURCE_TASK_ROOT_ACTIVITY);
assertThat(
DatabaseUtils
@@ -487,7 +487,7 @@
public void getUsageSource_throwException_writeDefaultData() throws RemoteException {
when(mUsageStatsManager.getUsageSource()).thenThrow(new RemoteException());
- assertThat(DatabaseUtils.getUsageSource(mContext))
+ assertThat(DatabaseUtils.getUsageSource(mContext, mUsageStatsManager))
.isEqualTo(USAGE_SOURCE_CURRENT_ACTIVITY);
assertThat(
DatabaseUtils
diff --git a/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
index 5a529f8..5ff2baf 100644
--- a/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
+++ b/tests/robotests/src/com/android/settings/localepicker/LocaleListEditorTest.java
@@ -20,6 +20,7 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -34,6 +35,10 @@
import android.os.LocaleList;
import android.view.MotionEvent;
import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
@@ -46,6 +51,7 @@
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowActivityManager;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.After;
import org.junit.Before;
@@ -58,7 +64,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.util.ArrayList;
import java.util.List;
@@ -75,11 +80,12 @@
private static final int REQUEST_CONFIRM_SYSTEM_DEFAULT = 1;
private LocaleListEditor mLocaleListEditor;
-
private Context mContext;
private FragmentActivity mActivity;
- private List mLocaleList;
+ private List<LocaleStore.LocaleInfo> mLocaleList;
private Intent mIntent = new Intent();
+ private LocaleDragCell mLocaleDragCell;
+ private LocaleDragAndDropAdapter.CustomViewHolder mCustomViewHolder;
@Mock
private LocaleDragAndDropAdapter mAdapter;
@@ -95,11 +101,23 @@
private IActivityManager mActivityService;
@Mock
private MetricsFeatureProvider mMetricsFeatureProvider;
+ @Mock
+ private TextView mLabel;
+ @Mock
+ private CheckBox mCheckbox;
+ @Mock
+ private TextView mMiniLabel;
+ @Mock
+ private TextView mLocalized;
+ @Mock
+ private TextView mCurrentDefault;
+ @Mock
+ private ImageView mDragHandle;
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+ mContext = spy(RuntimeEnvironment.application);
mLocaleListEditor = spy(new LocaleListEditor());
when(mLocaleListEditor.getContext()).thenReturn(mContext);
mActivity = Robolectric.buildActivity(FragmentActivity.class).get();
@@ -300,6 +318,35 @@
verify(mAdapter).doTheUpdate();
}
+ @Test
+ public void onBindViewHolder_shouldSetCheckedBoxText() {
+ ReflectionHelpers.setField(mLocaleListEditor, "mRemoveMode", true);
+ mLocaleList = new ArrayList<>();
+ mLocaleList.add(mLocaleInfo);
+ when(mLocaleInfo.getFullNameNative()).thenReturn("English");
+ when(mLocaleInfo.getLocale()).thenReturn(LocaleList.forLanguageTags("en-US").get(0));
+
+ mAdapter = spy(new LocaleDragAndDropAdapter(mLocaleListEditor, mLocaleList));
+ ReflectionHelpers.setField(mAdapter, "mFeedItemList", mLocaleList);
+ ReflectionHelpers.setField(mAdapter, "mParent", mLocaleListEditor);
+ ReflectionHelpers.setField(mAdapter, "mCacheItemList", new ArrayList<>(mLocaleList));
+ ReflectionHelpers.setField(mAdapter, "mContext", mContext);
+ ViewGroup view = new FrameLayout(mContext);
+ mCustomViewHolder = mAdapter.onCreateViewHolder(view, 0);
+ mLocaleDragCell = new LocaleDragCell(mContext, null);
+ ReflectionHelpers.setField(mCustomViewHolder, "mLocaleDragCell", mLocaleDragCell);
+ ReflectionHelpers.setField(mLocaleDragCell, "mLabel", mLabel);
+ ReflectionHelpers.setField(mLocaleDragCell, "mLocalized", mLocalized);
+ ReflectionHelpers.setField(mLocaleDragCell, "mCurrentDefault", mCurrentDefault);
+ ReflectionHelpers.setField(mLocaleDragCell, "mMiniLabel", mMiniLabel);
+ ReflectionHelpers.setField(mLocaleDragCell, "mDragHandle", mDragHandle);
+ ReflectionHelpers.setField(mLocaleDragCell, "mCheckbox", mCheckbox);
+
+ mAdapter.onBindViewHolder(mCustomViewHolder, 0);
+
+ verify(mAdapter).setCheckBoxDescription(any(LocaleDragCell.class), any(), anyBoolean());
+ }
+
private void setUpLocaleConditions() {
ShadowActivityManager.setService(mActivityService);
mLocaleList = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
index c54b750..e99b17f 100644
--- a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
@@ -18,6 +18,7 @@
import static org.mockito.Mockito.when;
+import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.hardware.usb.UsbManager;
@@ -25,11 +26,17 @@
import android.hardware.usb.UsbPortStatus;
import android.os.BatteryManager;
import android.os.UserManager;
+
import androidx.room.Room;
+import com.android.settings.display.AutoBrightnessSettings;
+import com.android.settings.display.ScreenTimeoutSettings;
import com.android.settings.fuelgauge.batteryusage.BatteryInformation;
import com.android.settings.fuelgauge.batteryusage.ConvertUtils;
import com.android.settings.fuelgauge.batteryusage.DeviceBatteryState;
+import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEvent;
+import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEventList;
+import com.android.settings.fuelgauge.batteryusage.WarningBannerInfo;
import com.android.settings.fuelgauge.batteryusage.db.AppUsageEventDao;
import com.android.settings.fuelgauge.batteryusage.db.AppUsageEventEntity;
import com.android.settings.fuelgauge.batteryusage.db.BatteryState;
@@ -193,4 +200,33 @@
when(mockUsbPortStatus.getComplianceWarnings())
.thenReturn(new int[]{UsbPortStatus.COMPLIANCE_WARNING_OTHER});
}
+
+ /** Create an empty power anomaly event list proto. */
+ public static PowerAnomalyEventList createEmptyPowerAnomalyEventList() {
+ return PowerAnomalyEventList.getDefaultInstance();
+ }
+
+ /** Create a power anomaly event proto of adaptive brightness. */
+ public static PowerAnomalyEvent createAdaptiveBrightnessAnomalyEvent() {
+ return PowerAnomalyEvent.newBuilder()
+ .setType("settings banner")
+ .setKey("adaptive_brightness")
+ .setWarningBannerInfo(WarningBannerInfo.newBuilder()
+ .setMainButtonDestination(AutoBrightnessSettings.class.getName())
+ .setMainButtonSourceMetricsCategory(SettingsEnums.SETTINGS_AUTO_BRIGHTNESS)
+ .build())
+ .build();
+ }
+
+ /** Create a power anomaly event proto of screen timeout. */
+ public static PowerAnomalyEvent createScreenTimeoutAnomalyEvent() {
+ return PowerAnomalyEvent.newBuilder()
+ .setType("settings banner")
+ .setKey("screen_timeout")
+ .setWarningBannerInfo(WarningBannerInfo.newBuilder()
+ .setMainButtonDestination(ScreenTimeoutSettings.class.getName())
+ .setMainButtonSourceMetricsCategory(SettingsEnums.SCREEN_TIMEOUT)
+ .build())
+ .build();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/wifi/LongPressWifiEntryPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LongPressWifiEntryPreferenceTest.java
index efc2018..457d9ab 100644
--- a/tests/robotests/src/com/android/settings/wifi/LongPressWifiEntryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/LongPressWifiEntryPreferenceTest.java
@@ -18,6 +18,10 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+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.content.Context;
@@ -60,7 +64,7 @@
when(mWifiEntry.canDisconnect()).thenReturn(false);
when(mWifiEntry.isSaved()).thenReturn(false);
- mPreference = new LongPressWifiEntryPreference(mContext, mWifiEntry, mFragment);
+ mPreference = spy(new LongPressWifiEntryPreference(mContext, mWifiEntry, mFragment));
}
@Test
@@ -106,4 +110,23 @@
assertThat(mPreference.shouldEnabled()).isTrue();
}
+
+ @Test
+ public void checkRestrictionAndSetDisabled_hasAdminRestrictions_doSetDisabledByAdmin() {
+ when(mContext.getUser()).thenReturn(null);
+ when(mWifiEntry.hasAdminRestrictions()).thenReturn(true);
+
+ mPreference.checkRestrictionAndSetDisabled();
+
+ verify(mPreference).setDisabledByAdmin(any());
+ }
+
+ @Test
+ public void checkRestrictionAndSetDisabled_noAdminRestrictions_doNotSetDisabledByAdmin() {
+ when(mWifiEntry.hasAdminRestrictions()).thenReturn(false);
+
+ mPreference.checkRestrictionAndSetDisabled();
+
+ verify(mPreference, never()).setDisabledByAdmin(any());
+ }
}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiQrCodeTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiQrCodeTest.java
new file mode 100644
index 0000000..e3a8ca5
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/dpp/WifiQrCodeTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.dpp;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class WifiQrCodeTest {
+ @Test
+ public void testZxParsing_validCode() {
+ WifiNetworkConfig config = new WifiQrCode("WIFI:S:testAbC;T:nopass").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("testAbC");
+ assertThat(config.getSecurity()).isEqualTo("nopass");
+
+ config = new WifiQrCode(
+ "WIFI:S:reallyLONGone;T:WEP;P:somepasswo#%^**123rd").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("reallyLONGone");
+ assertThat(config.getSecurity()).isEqualTo("WEP");
+ assertThat(config.getPreSharedKey()).isEqualTo("somepasswo#%^**123rd");
+
+ config = new WifiQrCode("WIFI:S:anotherone;T:WPA;P:3#=3j9asicla").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("anotherone");
+ assertThat(config.getSecurity()).isEqualTo("WPA");
+ assertThat(config.getPreSharedKey()).isEqualTo("3#=3j9asicla");
+
+ config = new WifiQrCode("WIFI:S:xx;T:SAE;P:a").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("xx");
+ assertThat(config.getSecurity()).isEqualTo("SAE");
+ assertThat(config.getPreSharedKey()).isEqualTo("a");
+ }
+
+ @Test
+ public void testZxParsing_invalidCodeButShouldWork() {
+ WifiNetworkConfig config = new WifiQrCode(
+ "WIFI:S:testAbC; T:nopass").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("testAbC");
+ assertThat(config.getSecurity()).isEqualTo("nopass");
+
+ config = new WifiQrCode(
+ "WIFI:S:reallyLONGone;T:WEP; P:somepassword").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("reallyLONGone");
+ assertThat(config.getSecurity()).isEqualTo("WEP");
+ assertThat(config.getPreSharedKey()).isEqualTo("somepassword");
+
+ config = new WifiQrCode("WIFI: S:anotherone;T:WPA;P:abcdefghihklmn").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("anotherone");
+ assertThat(config.getSecurity()).isEqualTo("WPA");
+ assertThat(config.getPreSharedKey()).isEqualTo("abcdefghihklmn");
+
+ config = new WifiQrCode("WIFI: S:xx; T:SAE; P:a").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("xx");
+ assertThat(config.getSecurity()).isEqualTo("SAE");
+ assertThat(config.getPreSharedKey()).isEqualTo("a");
+ }
+}