diff options
589 files changed, 16306 insertions, 8158 deletions
diff --git a/PermissionController/Android.bp b/PermissionController/Android.bp index 397870c20..c1a54619b 100644 --- a/PermissionController/Android.bp +++ b/PermissionController/Android.bp @@ -131,6 +131,7 @@ android_library { "SettingsLibSearchWidget", "SettingsLibLayoutPreference", "SettingsLibBarChartPreference", + "SettingsLibBannerMessagePreference", "SettingsLibActionBarShadow", "SettingsLibProgressBar", "SettingsLibCollapsingToolbarBaseActivity", @@ -153,15 +154,16 @@ android_library { "safety-label", "role-controller", "android.permission.flags-aconfig-java-export", + "android.xr.flags-aconfig-java-export", "com.android.permission.flags-aconfig-java-export", "androidx.compose.foundation_foundation", "androidx.compose.runtime_runtime", "androidx.compose.runtime_runtime-livedata", "androidx.compose.ui_ui", - "androidx.wear.compose_compose-material", "androidx.wear.compose_compose-material3", "android.content.pm.flags-aconfig-java-export", "android.os.flags-aconfig-java-export", + "wear-permission-components", ], lint: { diff --git a/PermissionController/TEST_MAPPING b/PermissionController/TEST_MAPPING index a34a16034..508105c46 100644 --- a/PermissionController/TEST_MAPPING +++ b/PermissionController/TEST_MAPPING @@ -13,6 +13,9 @@ "file_patterns": ["res/xml/roles\\.xml"] }, { + "name": "CtsRoleMultiUserTestCases" + }, + { "name": "PermissionUiTestCases", "options": [ { @@ -49,6 +52,9 @@ "file_patterns": ["res/xml/roles\\.xml"] }, { + "name": "CtsRoleMultiUserTestCases[com.google.android.permission.apex]" + }, + { "name": "PermissionControllerMockingTests[com.google.android.permission.apex]", "options": [ { @@ -111,6 +117,9 @@ "file_patterns": ["res/xml/roles\\.xml"] }, { + "name": "CtsRoleMultiUserTestCases" + }, + { "name": "PermissionControllerMockingTests", "options": [ { @@ -215,6 +224,24 @@ "name": "CtsPermissionUiTestCases[com.google.android.permission.apex]" } ], + "wear-presubmit": [ + { + "name": "CtsPermissionUiTestCases", + "options": [ + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + } + ] + }, + { + "name": "CtsRoleTestCases", + "options": [ + { + "exclude-annotation": "androidx.test.filters.FlakyTest" + } + ] + } + ], "imports": [ { "path": "vendor/xts/gts-tests/hostsidetests/permissioncontroller" diff --git a/PermissionController/jarjar-rules.txt b/PermissionController/jarjar-rules.txt index 74303a439..ceac6c3a7 100644 --- a/PermissionController/jarjar-rules.txt +++ b/PermissionController/jarjar-rules.txt @@ -26,8 +26,16 @@ rule android.os.*FeatureFlags* com.android.permissioncontroller.jarjar.@0 rule android.os.FeatureFlags* com.android.permissioncontroller.jarjar.@0 rule android.os.FeatureFlags com.android.permissioncontroller.jarjar.@0 rule android.os.Flags com.android.permissioncontroller.jarjar.@0 +rule android.xr.*FeatureFlags* com.android.permissioncontroller.jarjar.@0 +rule android.xr.FeatureFlags* com.android.permissioncontroller.jarjar.@0 +rule android.xr.FeatureFlags com.android.permissioncontroller.jarjar.@0 +rule android.xr.Flags com.android.permissioncontroller.jarjar.@0 rule com.android.permission.flags.*FeatureFlags* com.android.permissioncontroller.jarjar.@0 rule com.android.permission.flags.FeatureFlags* com.android.permissioncontroller.jarjar.@0 rule com.android.permission.flags.FeatureFlags com.android.permissioncontroller.jarjar.@0 rule com.android.permission.flags.Flags com.android.permissioncontroller.jarjar.@0 +rule com.android.settingslib.flags.*FeatureFlags* com.android.permissioncontroller.jarjar.@0 +rule com.android.settingslib.flags.FeatureFlags* com.android.permissioncontroller.jarjar.@0 +rule com.android.settingslib.flags.FeatureFlags com.android.permissioncontroller.jarjar.@0 +rule com.android.settingslib.flags.Flags com.android.permissioncontroller.jarjar.@0 # LINT.ThenChange(PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java:applyJarjarTransform) diff --git a/PermissionController/lint-baseline.xml b/PermissionController/lint-baseline.xml index be77a0d18..b1570d0b7 100644 --- a/PermissionController/lint-baseline.xml +++ b/PermissionController/lint-baseline.xml @@ -1,16 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01"> - - <issue - id="NewApi" - message="Class requires API level 34 (current min is 31): `android.app.AppOpsManager.OnOpNotedListener`" - errorLine1=" AppOpsManager.OnOpNotedListener," - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/data/v31/AllLightHistoricalPackageOpsLiveData.kt" - line="46" - column="5"/> - </issue> +<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" + variant="all" version="8.4.0-alpha01"> <issue id="NewApi" @@ -20,7 +10,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java" line="504" - column="31"/> + column="31" /> </issue> <issue @@ -31,7 +21,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java" line="505" - column="34"/> + column="34" /> </issue> <issue @@ -42,7 +32,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java" line="509" - column="41"/> + column="41" /> </issue> <issue @@ -53,7 +43,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java" line="513" - column="41"/> + column="41" /> </issue> <issue @@ -64,7 +54,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java" line="515" - column="59"/> + column="59" /> </issue> <issue @@ -75,7 +65,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java" line="518" - column="42"/> + column="42" /> </issue> <issue @@ -86,7 +76,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java" line="519" - column="42"/> + column="42" /> </issue> <issue @@ -97,7 +87,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java" line="521" - column="18"/> + column="18" /> </issue> <issue @@ -108,7 +98,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java" line="522" - column="29"/> + column="29" /> </issue> <issue @@ -119,7 +109,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java" line="709" - column="31"/> + column="31" /> </issue> <issue @@ -130,7 +120,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java" line="710" - column="34"/> + column="34" /> </issue> <issue @@ -141,7 +131,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java" line="714" - column="41"/> + column="41" /> </issue> <issue @@ -152,7 +142,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java" line="718" - column="41"/> + column="41" /> </issue> <issue @@ -163,7 +153,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java" line="720" - column="59"/> + column="59" /> </issue> <issue @@ -174,7 +164,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java" line="722" - column="67"/> + column="67" /> </issue> <issue @@ -185,7 +175,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java" line="722" - column="42"/> + column="42" /> </issue> <issue @@ -196,7 +186,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java" line="724" - column="18"/> + column="18" /> </issue> <issue @@ -207,7 +197,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java" line="725" - column="29"/> + column="29" /> </issue> <issue @@ -218,7 +208,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionsFragment.java" line="159" - column="35"/> + column="35" /> </issue> <issue @@ -229,7 +219,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionsFragment.java" line="367" - column="35"/> + column="35" /> </issue> <issue @@ -240,7 +230,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java" line="463" - column="31"/> + column="31" /> </issue> <issue @@ -251,7 +241,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java" line="464" - column="34"/> + column="34" /> </issue> <issue @@ -262,7 +252,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java" line="468" - column="41"/> + column="41" /> </issue> <issue @@ -273,7 +263,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java" line="472" - column="41"/> + column="41" /> </issue> <issue @@ -284,7 +274,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java" line="474" - column="59"/> + column="59" /> </issue> <issue @@ -295,7 +285,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java" line="476" - column="67"/> + column="67" /> </issue> <issue @@ -306,7 +296,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java" line="476" - column="42"/> + column="42" /> </issue> <issue @@ -317,7 +307,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java" line="478" - column="18"/> + column="18" /> </issue> <issue @@ -328,7 +318,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java" line="479" - column="29"/> + column="29" /> </issue> <issue @@ -339,7 +329,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/model/GrantPermissionsViewModel.kt" line="1059" - column="45"/> + column="45" /> </issue> <issue @@ -350,7 +340,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/data/HibernatedPackagesLiveData.kt" line="48" - column="74"/> + column="74" /> </issue> <issue @@ -361,7 +351,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/data/HibernatedPackagesLiveData.kt" line="51" - column="44"/> + column="44" /> </issue> <issue @@ -372,7 +362,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/IssueCardAnimator.kt" line="47" - column="37"/> + column="37" /> </issue> <issue @@ -383,7 +373,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt" line="653" - column="29"/> + column="29" /> </issue> <issue @@ -394,7 +384,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt" line="662" - column="18"/> + column="18" /> </issue> <issue @@ -405,7 +395,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt" line="1689" - column="48"/> + column="48" /> </issue> <issue @@ -416,7 +406,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/LightPackageInfo.kt" line="140" - column="72"/> + column="72" /> </issue> <issue @@ -427,7 +417,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/LightPackageInfo.kt" line="140" - column="62"/> + column="62" /> </issue> <issue @@ -438,7 +428,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt" line="288" - column="19"/> + column="19" /> </issue> <issue @@ -449,7 +439,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt" line="291" - column="48"/> + column="48" /> </issue> <issue @@ -460,7 +450,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt" line="291" - column="30"/> + column="30" /> </issue> <issue @@ -471,7 +461,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt" line="292" - column="30"/> + column="30" /> </issue> <issue @@ -482,7 +472,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt" line="292" - column="39"/> + column="39" /> </issue> <issue @@ -493,7 +483,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt" line="298" - column="5"/> + column="5" /> </issue> <issue @@ -504,7 +494,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt" line="298" - column="12"/> + column="12" /> </issue> <issue @@ -515,7 +505,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt" line="301" - column="34"/> + column="34" /> </issue> <issue @@ -526,7 +516,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt" line="308" - column="13"/> + column="13" /> </issue> <issue @@ -537,7 +527,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/MoreIssuesCardAnimator.kt" line="110" - column="21"/> + column="21" /> </issue> <issue @@ -548,7 +538,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/MoreIssuesCardAnimator.kt" line="110" - column="46"/> + column="46" /> </issue> <issue @@ -559,7 +549,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/PermissionAppsFragment.java" line="114" - column="35"/> + column="35" /> </issue> <issue @@ -570,7 +560,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/television/PermissionAppsFragment.java" line="365" - column="35"/> + column="35" /> </issue> <issue @@ -581,7 +571,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/ui/model/PermissionAppsViewModel.kt" line="100" - column="43"/> + column="43" /> </issue> <issue @@ -592,7 +582,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java" line="521" - column="43"/> + column="43" /> </issue> <issue @@ -603,7 +593,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java" line="521" - column="75"/> + column="75" /> </issue> <issue @@ -614,7 +604,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java" line="522" - column="48"/> + column="48" /> </issue> <issue @@ -625,7 +615,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java" line="522" - column="24"/> + column="24" /> </issue> <issue @@ -636,7 +626,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java" line="85" - column="42"/> + column="42" /> </issue> <issue @@ -647,7 +637,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java" line="97" - column="34"/> + column="34" /> </issue> <issue @@ -658,7 +648,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java" line="141" - column="73"/> + column="73" /> </issue> <issue @@ -669,7 +659,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java" line="146" - column="34"/> + column="34" /> </issue> <issue @@ -680,7 +670,7 @@ <location file="packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterBackgroundRefreshJobService.java" line="152" - column="29"/> + column="29" /> </issue> </issues>
\ No newline at end of file diff --git a/PermissionController/res/anim/text_switcher_fade_in.xml b/PermissionController/res/anim/text_switcher_fade_in.xml new file mode 100644 index 000000000..b9e2812aa --- /dev/null +++ b/PermissionController/res/anim/text_switcher_fade_in.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2024 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. + --> + +<alpha xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:anim/linear_interpolator" + android:fromAlpha="0.0" android:toAlpha="1.0" + android:startOffset="@android:integer/config_shortAnimTime" + android:duration="@android:integer/config_shortAnimTime" />
\ No newline at end of file diff --git a/tests/cts/rolemultiuser/CtsRoleMultiUserTestApp/AndroidManifest.xml b/PermissionController/res/anim/text_switcher_fade_out.xml index eea3be741..4b7274707 100644 --- a/tests/cts/rolemultiuser/CtsRoleMultiUserTestApp/AndroidManifest.xml +++ b/PermissionController/res/anim/text_switcher_fade_out.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> - <!-- ~ Copyright (C) 2024 The Android Open Source Project ~ @@ -16,9 +15,7 @@ ~ limitations under the License. --> -<manifest - xmlns:android="http://schemas.android.com/apk/res/android" - package="android.app.rolemultiuser.cts.app"> - - <application android:label="CtsRoleMultiUserTestApp" /> -</manifest> +<alpha xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@android:anim/linear_interpolator" + android:fromAlpha="1.0" android:toAlpha="0.0" + android:duration="@android:integer/config_shortAnimTime" />
\ No newline at end of file diff --git a/PermissionController/res/layout-v33/safety_center_toggle_button.xml b/PermissionController/res/layout-v33/safety_center_toggle_button.xml index f790e734e..52d62a7ed 100644 --- a/PermissionController/res/layout-v33/safety_center_toggle_button.xml +++ b/PermissionController/res/layout-v33/safety_center_toggle_button.xml @@ -35,8 +35,10 @@ android:text="@string/available"/> </LinearLayout> + <!-- The X scale controls the direction of the arrow, based on the language direction --> <ImageView android:id="@+id/arrow_icon" style="@style/SafetyCenterQsToggleArrow" + android:scaleX="@integer/mirror_x_scale" android:visibility="gone"/> </LinearLayout> diff --git a/PermissionController/res/layout-v33/view_status_card.xml b/PermissionController/res/layout-v33/view_status_card.xml index 4915347be..d8ca8b7ea 100644 --- a/PermissionController/res/layout-v33/view_status_card.xml +++ b/PermissionController/res/layout-v33/view_status_card.xml @@ -30,15 +30,34 @@ android:id="@+id/status_title_and_summary" style="?attr/scStatusTitleAndSummaryContainerStyle"> - <TextView + <TextSwitcher android:id="@+id/status_title" - android:text="@string/summary_placeholder" - style="@style/SafetyCenterStatusTitle" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:inAnimation="@anim/text_switcher_fade_in" + android:outAnimation="@anim/text_switcher_fade_out"> + <TextView + android:text="@string/summary_placeholder" + style="@style/SafetyCenterStatusTitle" /> + <TextView + android:text="@string/summary_placeholder" + style="@style/SafetyCenterStatusTitle" /> + </TextSwitcher> - <TextView + + <TextSwitcher android:id="@+id/status_summary" - android:text="@string/summary_placeholder" - style="@style/SafetyCenterStatusSummary" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:inAnimation="@anim/text_switcher_fade_in" + android:outAnimation="@anim/text_switcher_fade_out"> + <TextView + android:text="@string/summary_placeholder" + style="@style/SafetyCenterStatusSummary" /> + <TextView + android:text="@string/summary_placeholder" + style="@style/SafetyCenterStatusSummary" /> + </TextSwitcher> </LinearLayout> <androidx.constraintlayout.widget.Barrier diff --git a/PermissionController/res/layout-v35/nav_host_fragment.xml b/PermissionController/res/layout-v35/nav_host_fragment.xml new file mode 100644 index 000000000..5c2850b7a --- /dev/null +++ b/PermissionController/res/layout-v35/nav_host_fragment.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<androidx.constraintlayout.widget.ConstraintLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true"> + + <fragment + android:id="@+id/nav_host_fragment" + android:name="androidx.navigation.fragment.NavHostFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:defaultNavHost="true" /> + +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/PermissionController/res/layout/permission_history_widget.xml b/PermissionController/res/layout/permission_history_widget.xml index 9bdef7200..f98a1c14b 100644 --- a/PermissionController/res/layout/permission_history_widget.xml +++ b/PermissionController/res/layout/permission_history_widget.xml @@ -28,6 +28,8 @@ android:layout_height="wrap_content" android:minWidth="60dp" android:layout_marginTop="19dp" + android:textAppearance="?android:attr/textAppearanceListItemSecondary" + android:textColor="?android:attr/textColorSecondary" /> <LinearLayout diff --git a/PermissionController/res/values-af-v33/strings.xml b/PermissionController/res/values-af-v33/strings.xml index 8bfc6821d..3ad0e7cb4 100644 --- a/PermissionController/res/values-af-v33/strings.xml +++ b/PermissionController/res/values-af-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Meer waarskuwings"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Waarskuwings wat toegemaak is"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Vou uit om nog een waarskuwing te sien}other{Vou uit om nog # waarskuwings te sien}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Vou in"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Waarskuwing. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Handeling is voltooi"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Gaan instellings na wat jou toestel kan beskerm"</string> diff --git a/PermissionController/res/values-af/strings.xml b/PermissionController/res/values-af/strings.xml index 44b10ebe6..39a8df9d5 100644 --- a/PermissionController/res/values-af/strings.xml +++ b/PermissionController/res/values-af/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g>toegang vir hierdie app op <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Sien al <xliff:g id="APP">%1$s</xliff:g> se toestemmings"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Sien alle apps met hierdie toestemming"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Inligting"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Instellings"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Wys Assistent-mikrofoongebruik"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Instellings vir ongebruikte apps"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Verwyder toestemmings as app nie gebruik word nie"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Oopmaak van skakels"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Verstek vir werk"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Verstek vir privaat ruimte"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Geoptimeer vir toestel"</string> + <string name="default_app_others" msgid="7793029848126079876">"Ander"</string> <string name="default_app_none" msgid="9084592086808194457">"Geen"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Stelselverstek)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Geen apps nie"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil graag ontfoutingsinligting oplaai."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Deel ontfoutingsdata?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Die stelsel het \'n probleem bespeur."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> versoek tans om \'n foutverslag wat op <xliff:g id="DATE">%2$s</xliff:g> om <xliff:g id="TIME">%3$s</xliff:g> op hierdie toestel gegenereer is, op te laai. Foutverslae sluit persoonlike inligting oor jou toestel of wat deur programme aangemeld is in, byvoorbeeld gebruikername, liggingdata, toestelidentifiseerders en netwerkinligting. Deel foutverslae net met mense en programme wat jy met hierdie inligting vertrou. Laat <xliff:g id="APP_NAME_1">%4$s</xliff:g> toe om \'n foutverslag op te laai?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> versoek tans om \'n foutverslag wat op <xliff:g id="DATE">%2$s</xliff:g> om <xliff:g id="TIME">%3$s</xliff:g> op hierdie toestel gegenereer is, op te laai. Foutverslae sluit in: Persoonlike inligting oor jou toestel of inligting wat deur apps aangeteken is, byvoorbeeld gebruikername, liggingdata, toestelidentifiseerders en netwerkinligting. Deel foutverslae net met mense en apps wat jy met hierdie inligting vertrou.\n\nLaat <xliff:g id="APP_NAME_1">%4$s</xliff:g> toe om ’n foutverslag op te laai?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Kon nie die foutverslag vir <xliff:g id="APP_NAME">%1$s</xliff:g> verwerk nie. Die deel van die gedetailleerde ontfoutingdata is geweier. Jammer oor die onderbreking."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Laat toe"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Weier"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Laat beperkte instellings toe"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Beperkte instelling"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Hierdie instelling is vir jou veiligheid tans onbeskikbaar."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Handeling nie beskikbaar tydens ’n foonoproep nie"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Dit word nie toegelaat om tydens ’n foonoproep apps toe te laat om ander apps te installeer nie.\n\n Swendelaars versoek dikwels hierdie soort handeling tydens foonoproepgesprekke en dis dus geblokkeer om jou te beskerm. As jy aangesê word om hierdie handeling te doen deur iemand wat jy nie ken nie, kan dit ’n swendelary wees."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Kan nie handeling tydens oproep voltooi nie"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Hierdie instelling is geblokkeer om jou toestel en data te beskerm.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Swendelaars kan probeer om skadelike apps te installeer deur jou te vra om onbekende apps van ’n nuwe bron af te installeer."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Swendelaars kan probeer om beheer oor jou toestel te neem deur jou te vra om toeganklikheidtoegang vir ’n app toe te laat."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Toegang tot <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> is geweier vir die app"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Die app het toegang tot toestemming vir sensitiewe inligting versoek wat jou persoonlike en finansiële inligting in gevaar kan stel.<xliff:g id="ID_1"><br><br></xliff:g>Dit is moontlik dat die app nie reg sal werk sonder hierdie beperkte toestemming nie. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Kry meer inligting oor hoe om toegang toe te laat</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Toegang is geweier vir app om die verstek <xliff:g id="ROLE_NAME">%1$s</xliff:g> te wees"</string> diff --git a/PermissionController/res/values-am-v33/strings.xml b/PermissionController/res/values-am-v33/strings.xml index e2a599a3c..edd6dac3f 100644 --- a/PermissionController/res/values-am-v33/strings.xml +++ b/PermissionController/res/values-am-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"ተጨማሪ ማንቂያዎች"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"የተሰናበቱ ማንቂያዎች"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{ይዘርጉ እና አንድ ተጨማሪ ማንቂያ ይመልከቱ}one{ይዘርጉ እና # ተጨማሪ ማንቂያ ይመልከቱ}other{ይዘርጉ እና # ተጨማሪ ማንቂያዎችን ይመልከቱ}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"ሰብስብ"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"ማንቂያ። <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"እርምጃ ተጠናቅቋል"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"የእርስዎ መሣሪያ ላይ ጥበቃ ማከል የሚችሉ ቅንብሮችን ይፈትሹ"</string> diff --git a/PermissionController/res/values-am/strings.xml b/PermissionController/res/values-am/strings.xml index e1f87b92c..a683c6bb0 100644 --- a/PermissionController/res/values-am/strings.xml +++ b/PermissionController/res/values-am/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> ላይ ለዚህ መተግበሪያ የ<xliff:g id="PERM">%1$s</xliff:g> መዳረሻ"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"ሁሉንም <xliff:g id="APP">%1$s</xliff:g> ፈቃዶች ይመልከቱ"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"ከዚህ መተግበሪያ ጋር ሁሉንም መተግበሪያዎች ይመልከቱ"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"መረጃ"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"ቅንብሮች"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"የረዳት ማይክሮፎን አጠቃቀምን አሳይ"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"ሥራ ላይ ያልዋሉ የመተግበሪያ ቅንብሮች"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"መተግበሪያ ጥቅም ላይ ካልዋለ ፈቃዶችን አስወግድ"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"አገናኞችን በመክፈት ላይ"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"ለሥራ ነባሪ"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"ለግል ቦታ ነባሪ"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"ለመሣሪያ የተባ"</string> + <string name="default_app_others" msgid="7793029848126079876">"ሌሎች"</string> <string name="default_app_none" msgid="9084592086808194457">"ምንም"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(የሥርዓት ነባሪ)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"መተግበሪያዎች የሉም"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> የሳንካ ማረሚያ መረጃን መስቀል ይፈልጋል።"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"የሳንካ ማረሚያ ውሂብ ይጋራ?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"ስርዓቱ አንድ ችግር አግኝቷል።"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> የሳንካ ሪፖርት ከዚህ መሣሪያ በ<xliff:g id="DATE">%2$s</xliff:g> ላይ በ<xliff:g id="TIME">%3$s</xliff:g> የተወሰደ የሳንካ ሪፖርትን ለመስቀል እየጠየቀ ነው። የሳንካ ሪፖርቶች ስለ የእርስዎ መሣሪያ ወይም በመተግበሪያዎች የተመዘገበ ለምሳሌ እንደ የተጠቃሚ ስሞች፣ የመገኛ አካባቢ ውሂብ፣ የመሣሪያ ለይቶ ማወቂያዎች እና የአውታረ መረብ መረጃን ያካትታል። ይህን መረጃ ከሚያምኗቸው ሰዎች እና መተግበሪያዎች ጋር ብቻ የሳንካ ሪፖርቶችን ያጋሩ። የሳንካ ሪፖርትን <xliff:g id="APP_NAME_1">%4$s</xliff:g> እንዲሰቅል ይፈቀድ?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> የሳንካ ሪፖርት ከዚህ መሣሪያ <xliff:g id="DATE">%2$s</xliff:g> <xliff:g id="TIME">%3$s</xliff:g> ላይ የተወሰደ የሳንካ ሪፖርትን ለመስቀል እየጠየቀ ነው። የሳንካ ሪፖርቶች ስለ የእርስዎ መሣሪያ ወይም በመተግበሪያዎች የተመዘገበ ለምሳሌ እንደ የተጠቃሚ ስሞች፣ የቦታ ውሂብ፣ የመሣሪያ ለዪዎች እና የአውታረ መረብ መረጃን ያካትታል። የሳንካ ሪፖርቶችን በዚህ መረጃ ከሚያምኗቸው ሰዎች እና መተግበሪያዎች ጋር ብቻ ያጋሩ። \n\n <xliff:g id="APP_NAME_1">%4$s</xliff:g> የሳንካ ሪፖርትን እንዲሰቅል ይፈቀድ?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"የ<xliff:g id="APP_NAME">%1$s</xliff:g> የሳንካ ሪፖርትን ማስሄድ ላይ አንድ ስህተት ነበር። ስለዚህ ዝርዝር የማረሚያ ውሂቡን ማጋራት ተከልክሏል። ለመቋረጡ ይቅርታ እንጠይቃለን።"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"ፍቀድ"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"ከልክል"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"የተገደቡ ቅንብሮችን ፍቀድ"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"የተገደበ ቅንብር"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"ለእርስዎ ደህንነት ሲባል ይህ ቅንብር በአሁኑ ጊዜ አይገኝም።"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"በስልክ ጥሪ ላይ ሳለ እርምጃ አይገኝም"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"መተግበሪያዎች በስልክ ጥሪ ወቅት ሌሎች መተግበሪያዎችን እንዲጭኑ መፍቀድ አይፈቀድም።\n\n አጭበርባሪዎች ብዙ ጊዜ እንደዚህ ዓይነት እርምጃ በስልክ ጥሪ ውይይቶች ወቅት ይጠይቃሉ፣ ስለዚህ እርስዎን ለመጠበቅ ታግዷል። ይህን እርምጃ በማያውቁት ሰው እንዲወስዱ እየተመሩ ከሆነ፣ ማጭበርበር ሊሆን ይችላል።"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"በጥሪ ወቅት እርምጃን ማጠናቀቅ አይቻልም"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"የእርስዎን መሣሪያ እና ውሂብ ለመጠበቅ ይህ ቅንብር ታግዷል። <xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>አጭበርባሪዎች እርስዎ ከአዲስ ምንጭ ላይ የማይታወቁ መተግበሪያዎችን እንዲጭኑ በመጠየቅ ጎጂ መተግበሪያዎችን ለመጫን ሊሞክሩ ይችላሉ።"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>አጭበርባሪዎች እርስዎ ለአንድ መተግበሪያ የተደራሽነት መዳረሻ እንዲፈቅዱ በመጠየቅ የመሣሪያዎን ቁጥጥር ሊወስዱ ይችላሉ።"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"መተግበሪያ የ<xliff:g id="PERMISSION_NAME">%1$s</xliff:g> መዳረሻ ተከልክሏል"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"መተግበሪያው የእርስዎን የግል እና የፋይናንስ መረጃ አደጋ ላይ የሚጥል አደገኛ ፈቃድ እንዲደርስ ጠይቋል።<xliff:g id="ID_1"><br><br></xliff:g>ያለዚህ የተገደበ ፈቃድ መተግበሪያው በትክክል ላይሰራ ይችላል። <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>እንዴት መዳረሻን እንደሚፈቅዱ ይረዱ</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"መተግበሪያ ነባሪ <xliff:g id="ROLE_NAME">%1$s</xliff:g> የመሆን መዳረሻ ተከልክሏል"</string> diff --git a/PermissionController/res/values-ar-v33/strings.xml b/PermissionController/res/values-ar-v33/strings.xml index 6b881f064..3c86f5ffd 100644 --- a/PermissionController/res/values-ar-v33/strings.xml +++ b/PermissionController/res/values-ar-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"المزيد من التنبيهات"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"التنبيهات التي تم إغلاقها"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{التوسيع لعرض تنبيه واحد إضافي}zero{التوسيع لعرض # تنبيه إضافي}two{التوسيع لعرض تنبيهين إضافيَين}few{التوسيع لعرض # تنبيهات إضافية}many{التوسيع لعرض # تنبيهًا إضافيًا}other{التوسيع لعرض # تنبيه إضافي}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"تصغير"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"تنبيه: <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"اكتمل الإجراء"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"التحقّق من الإعدادات التي يمكن أن تعزّز حماية جهازك"</string> diff --git a/PermissionController/res/values-ar/strings.xml b/PermissionController/res/values-ar/strings.xml index 0b463c09d..5872dae21 100644 --- a/PermissionController/res/values-ar/strings.xml +++ b/PermissionController/res/values-ar/strings.xml @@ -84,7 +84,7 @@ <string name="storage_supergroup_warning_allow" msgid="103093462784523190">"تمّ تصميم هذا التطبيق لإصدار قديم من Android. إذا منحته هذا الإذن، سيتم السماح بوصوله إلى كل مساحة التخزين (بما في ذلك الصور والفيديوهات والموسيقى والصوت والملفات الأخرى)."</string> <string name="storage_supergroup_warning_deny" msgid="6420765672683284347">"تمّ تصميم هذا التطبيق لإصدار قديم من Android. إذا رفضت منحه هذا الإذن، سيتم رفض وصوله إلى كل مساحة التخزين (بما في ذلك الصور والفيديوهات والموسيقى والصوت والملفات الأخرى)."</string> <string name="default_permission_description" msgid="4624464917726285203">"تنفيذ إجراء غير معروف"</string> - <string name="app_permissions_group_summary" msgid="8788419008958284002">"تمّ السماح لـ <xliff:g id="COUNT_0">%1$d</xliff:g> من أصل <xliff:g id="COUNT_1">%2$d</xliff:g> تطبيق."</string> + <string name="app_permissions_group_summary" msgid="8788419008958284002">"عدد التطبيقات المسموح لها: <xliff:g id="COUNT_0">%1$d</xliff:g> من أصل <xliff:g id="COUNT_1">%2$d</xliff:g>"</string> <string name="app_permissions_group_summary2" msgid="4329922444840521150">"التطبيقات التي تم منحها الإذن: <xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string> <string name="menu_show_system" msgid="4254021607027872504">"إظهار تطبيقات النظام"</string> <string name="menu_hide_system" msgid="3855390843744028465">"إخفاء تطبيقات النظام"</string> @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"إذن \"<xliff:g id="PERM">%1$s</xliff:g>\" لهذا التطبيق على \"<xliff:g id="DEVICE_NAME">%2$s</xliff:g>\""</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"الاطّلاع على جميع أذونات تطبيق \"<xliff:g id="APP">%1$s</xliff:g>\""</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"الاطّلاع على جميع التطبيقات التي لديها هذا الإذن"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"معلومات"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"الإعدادات"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"عرض أذونات استخدام ميكروفون \"مساعد Google\""</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"إعدادات التطبيقات غير المُستخدَمة"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"إزالة الأذونات في حال عدم استخدام التطبيق"</string> @@ -251,7 +253,7 @@ <string name="app_permission_never_accessed_summary" msgid="401346181461975090">"لم يستخدم الإذن مطلقًا"</string> <string name="app_permission_never_accessed_denied_summary" msgid="6596000497490905146">"تم الرفض / لم يسبق الحصول على الإذن"</string> <string name="allowed_header" msgid="7769277978004790414">"التطبيقات المسموح لها"</string> - <string name="allowed_always_header" msgid="6455903312589013545">"تطبيقات مسموح لها بالوصول طوال الوقت"</string> + <string name="allowed_always_header" msgid="6455903312589013545">"الإذن ممنوحٌ طوال الوقت"</string> <string name="allowed_foreground_header" msgid="6845655788447833353">"تطبيقات يمكنها الوصول عند استخدامها فقط"</string> <string name="allowed_storage_scoped" msgid="5383645873719086975">"التطبيقات المسموح لها بالوصول إلى الوسائط فقط"</string> <string name="allowed_storage_full" msgid="5356699280625693530">"التطبيقات المسموح لها بإدارة كل الملفات"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"فتح الروابط"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"التطبيقات التلقائية للعمل"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"التطبيقات التلقائية في المساحة الخاصّة"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"متوافقة مع الجهاز"</string> + <string name="default_app_others" msgid="7793029848126079876">"غير ذلك"</string> <string name="default_app_none" msgid="9084592086808194457">"غير محدَّد"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(الإعداد التلقائي للنظام)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"ليست هناك تطبيقات."</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"يريد تطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> تحميل معلومات تصحيح الأخطاء."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"هل تريد مشاركة بيانات تصحيح الأخطاء؟"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"رصَد النظام مشكلة."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"يطلب تطبيق <xliff:g id="APP_NAME_0">%1$s</xliff:g> تحميل تقرير للأخطاء من هذا الجهاز تم تسجيله بتاريخ <xliff:g id="DATE">%2$s</xliff:g> في <xliff:g id="TIME">%3$s</xliff:g>. وتشمل تقارير الأخطاء المعلومات الشخصية حول جهازك أو المعلومات التي سجلتها التطبيقات، مثل أسماء المستخدمين وبيانات الموقع الجغرافي ومعرّفات الأجهزة ومعلومات الشبكة. ويجب عدم مشاركة تقارير الأخطاء إلا مع المستخدمين والتطبيقات التي تثق بمشاركة هذه المعلومات معها. هل تريد السماح لتطبيق <xliff:g id="APP_NAME_1">%4$s</xliff:g> بتحميل تقرير أخطاء؟"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"يطلب تطبيق \"<xliff:g id="APP_NAME_0">%1$s</xliff:g>\" تحميل تقرير خطأ من هذا الجهاز تم تسجيله بتاريخ <xliff:g id="DATE">%2$s</xliff:g> في <xliff:g id="TIME">%3$s</xliff:g>. وتشمل تقارير الأخطاء معلومات شخصية حول جهازك أو تلك التي سجّلتها التطبيقات، مثل أسماء المستخدمين وبيانات الموقع الجغرافي ومعرّفات الأجهزة ومعلومات الشبكة. ويجب عدم مشاركة تقارير الأخطاء إلا مع المستخدمين والتطبيقات الموثوقة بمشاركة هذه المعلومات معها.\n\n هل المطلوب السماح لتطبيق \"<xliff:g id="APP_NAME_1">%4$s</xliff:g>\" بتحميل تقرير خطأ؟"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"حدث خطأ أثناء معالجة تقرير الخطأ لتطبيق <xliff:g id="APP_NAME">%1$s</xliff:g>، ولذلك تم رفض مشاركة بيانات تصحيح الأخطاء التفصيلية. نأسف للمقاطعة."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"سماح"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"رفض"</string> @@ -471,7 +475,7 @@ <string name="permgrouprequest_device_aware_storage_isolated" msgid="6463062962458809752">"هل تريد السماح لـ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> بالوصول إلى الصور والوسائط على <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>؟"</string> <string name="permgrouprequest_contacts" msgid="8391550064551053695">"هل تريد السماح لتطبيق <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> بالوصول إلى جهات الاتصال؟"</string> <string name="permgrouprequest_device_aware_contacts" msgid="731025863972535928">"هل تريد السماح لـ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> بالوصول إلى جهات اتصالك على <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>؟"</string> - <string name="permgrouprequest_location" msgid="6990232580121067883">"هل تريد السماح لتطبيق <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> بالوصول إلى الموقع الجغرافي لهذا الجهاز؟"</string> + <string name="permgrouprequest_location" msgid="6990232580121067883">"هل مطلوب السماح لتطبيق <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> بالوصول إلى الموقع الجغرافي لهذا الجهاز؟"</string> <string name="permgrouprequest_device_aware_location" msgid="6075412127429878638">"هل تريد السماح لـ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> بالوصول إلى الموقع الجغرافي الخاص بـ <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>؟"</string> <string name="permgrouprequestdetail_location" msgid="2635935335778429894">"لن يكون بإمكان التطبيق الوصول إلى الموقع الجغرافي إلا عند استخدامك لهذا التطبيق."</string> <string name="permgroupbackgroundrequest_location" msgid="1085680897265734809">"هل تريد السماح لتطبيق <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> بالوصول إلى الموقع الجغرافي لهذا الجهاز؟"</string> @@ -491,7 +495,7 @@ <string name="permgrouprequest_coarselocation_imagetext" msgid="8650605041483025297">"تقريبي"</string> <string name="permgrouprequest_calendar" msgid="1493150855673603806">"هل تريد السماح لتطبيق <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> بالوصول إلى التقويم؟"</string> <string name="permgrouprequest_device_aware_calendar" msgid="7161929851377463612">"هل تريد السماح لـ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> بالوصول إلى تقويمك على <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>؟"</string> - <string name="permgrouprequest_sms" msgid="5672063688745420991">"هل تريد السماح لتطبيق <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> بإرسال رسائل SMS وعرضها؟"</string> + <string name="permgrouprequest_sms" msgid="5672063688745420991">"هل مطلوب السماح لتطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> بإرسال رسائل SMS وعرضها؟"</string> <string name="permgrouprequest_device_aware_sms" msgid="6639977653040502291">"هل تريد السماح لـ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> بإرسال الرسائل القصيرة وعرضها على <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>؟"</string> <string name="permgrouprequest_storage" msgid="8717773092518621602">"هل تريد السماح لتطبيق <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> بالوصول إلى الصور والوسائط والملفات على جهازك؟"</string> <string name="permgrouprequest_device_aware_storage" msgid="6933251810928606636">"هل تريد السماح لـ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> بالوصول إلى الصور والوسائط والملفات على <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>؟"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"السماح بالإعدادات المحظورة"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"الإعداد محظور"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"للحفاظ على أمانك، هذا الإعداد غير متوفِّر حاليًا."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"لا يتوفّر هذا الإجراء أثناء إجراء مكالمة هاتفية"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"لا يُسمح للتطبيقات بتثبيت تطبيقات أخرى أثناء إجراء مكالمة هاتفية.\n\n يطلب المخادِعون غالبًا هذا النوع من الإجراءات أثناء المكالمات الهاتفية، لذا تم حظره لحماية بياناتك. إذا طلبَ منك شخص غير معروف اتّخاذ هذا الإجراء، قد يكون ذلك عملية خداع."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"يتعذّر إكمال الإجراء أثناء إجراء مكالمة"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"تم حظر هذا الإعداد لحماية الجهاز والبيانات.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>قد يطلب منك المخادِعون تثبيت تطبيقات غير معروفة من مصدر جديد في محاولة لتثبيت تطبيقات ضارّة."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>قد يحاول المخادِعون التحكّم في جهازك من خلال طلب السماح بوصول أحد التطبيقات إلى ميزات تسهيل الاستخدام."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"تم منع التطبيق من الوصول إلى <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"طلب التطبيق أحد أذونات الوصول إلى المعلومات الحساسة، ما قد يعرّض معلوماتك الشخصية والمالية للخطر.<xliff:g id="ID_1"><br><br></xliff:g>من المحتمل ألا يعمل التطبيق بشكل صحيح إذا لم يحصل على هذا الإذن المقيَّد. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>مزيد من المعلومات حول كيفية منح الأذونات</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"لم يُسمَح للتطبيق بأن يكون <xliff:g id="ROLE_NAME">%1$s</xliff:g> التلقائي"</string> diff --git a/PermissionController/res/values-as-v33/strings.xml b/PermissionController/res/values-as-v33/strings.xml index db8b95d3e..08f877f7a 100644 --- a/PermissionController/res/values-as-v33/strings.xml +++ b/PermissionController/res/values-as-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"অধিক সতৰ্কবাৰ্তা"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"অগ্ৰাহ্য কৰা সতৰ্কবাৰ্তা"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{বিস্তাৰ কৰক আৰু এটা সতৰ্কবাৰ্তা চাওক}one{বিস্তাৰ কৰক আৰু # টা সতৰ্কবাৰ্তা চাওক}other{বিস্তাৰ কৰক আৰু # টা সতৰ্কবাৰ্তা চাওক}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"সংকোচন কৰক"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"সতৰ্কতা। <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"কার্য সম্পূর্ণ হ\'ল"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"আপোনাৰ ডিভাইচ অধিক সুৰক্ষিত কৰিব পৰা ছেটিংসমূহ পৰীক্ষা কৰক"</string> diff --git a/PermissionController/res/values-as/strings.xml b/PermissionController/res/values-as/strings.xml index 2e6c890b0..b49b5669b 100644 --- a/PermissionController/res/values-as/strings.xml +++ b/PermissionController/res/values-as/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g>ত এই এপৰ <xliff:g id="PERM">%1$s</xliff:g>ৰ এক্সেছ"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"আটাইবোৰ <xliff:g id="APP">%1$s</xliff:g> অনুমতি চাওক"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"এই অনুমতি থকা আটাইবোৰ এপ্ চাওক"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"তথ্য"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"ছেটিং"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"সহায়ক মাইক্ৰ’ফ’নৰ ব্যৱহাৰ দেখুৱাওক"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"ব্যৱহাৰ নকৰা এপৰ ছেটিং"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"যদি এপ্টো ব্যৱহাৰ কৰা নাই অনুমতিসমূহ আঁতৰাওক"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"লিংকসমূহ খুলি থকা হৈছে"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"কৰ্মস্থানৰ বাবে ডিফ’ল্ট"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"প্ৰাইভেট স্পে’চৰ বাবে ডিফ’ল্ট"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"ডিভাইচৰ বাবে অপ্টিমাইজ কৰা হৈছে"</string> + <string name="default_app_others" msgid="7793029848126079876">"অন্য"</string> <string name="default_app_none" msgid="9084592086808194457">"নাই"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(ছিষ্টেম ডিফ\'ল্ট)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"কোনো এপ্ নাই"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g>এ ডিবাগ তথ্য আপল’ড কৰিব বিচাৰিছে।"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"ডিবাগ কৰা ডেটা শ্বেয়াৰ কৰিবনে?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"ছিষ্টেমটোৱে কিবা সমস্যা চিনাক্ত কৰিছে।"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g>এ এই ডিভাইচটোৰ <xliff:g id="DATE">%2$s</xliff:g> তাৰিখে <xliff:g id="TIME">%3$s</xliff:g>ত সংগ্ৰহ কৰা এটা বাগ ৰিপ’ৰ্ট আপল’ড কৰাৰ অনুমতি বিচাৰিছে। সেই বাগ ৰিপ’ৰ্টটোত আপোনাৰ ডিভাইচটোৰ বিষয়ে ব্যক্তিগত তথ্য বা এপে লগ কৰা তথ্য, যেনে ব্যৱহাৰকাৰীৰ নাম, অৱস্থান ডেটা, ডিভাইচ পৰিচায়ক আৰু নেটৱৰ্ক সম্পৰ্কীয় তথ্য ইত্যাদি অন্তৰ্ভুক্ত থাকিব। এইখিনি তথ্যৰ ক্ষেত্ৰত কেৱল আপুনি বিশ্বাস কৰা ব্যক্তি বা এপৰ সৈতেহে বাগ ৰিপ’ৰ্ট শ্বেয়াৰ কৰক। <xliff:g id="APP_NAME_1">%4$s</xliff:g>ক বাগ ৰিপ’ৰ্ট আপল’ড কৰাৰ অনুমতি দিবনে?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g>এ এই ডিভাইচটোৰ <xliff:g id="DATE">%2$s</xliff:g> তাৰিখে <xliff:g id="TIME">%3$s</xliff:g>ত সংগ্ৰহ কৰা এটা বাগ ৰিপ’ৰ্ট আপল’ড কৰাৰ অনুমতি বিচাৰিছে। সেই বাগ ৰিপ’ৰ্টটোত আপোনাৰ ডিভাইচটোৰ বিষয়ে ব্যক্তিগত তথ্য বা এপে লগ কৰা তথ্য, যেনে ব্যৱহাৰকাৰীৰ নাম, অৱস্থানৰ ডেটা, ডিভাইচ পৰিচায়ক আৰু নেটৱৰ্ক সম্পৰ্কীয় তথ্য ইত্যাদি অন্তৰ্ভুক্ত থাকে। এই তথ্যৰ ক্ষেত্ৰত কেৱল আপুনি বিশ্বাস কৰা ব্যক্তি বা এপৰ সৈতে বাগ ৰিপ’ৰ্ট শ্বেয়াৰ কৰক। \n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g>ক বাগ ৰিপ’ৰ্ট আপল’ড কৰাৰ অনুমতি দিবনে?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g>ৰ বিষয়ে বাগ ৰিপ’ৰ্টটোৰ প্ৰক্ৰিয়া চলাওঁতে আসোঁৱাহ হৈছে। গতিকে বিতং ডিবাগিং ডেটা শ্বেয়াৰ কৰিবলৈ অস্বীকাৰ কৰা হৈছে। এই ব্যাঘাতৰ বাবে দুঃখিত।"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"অনুমতি দিয়ক"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"অস্বীকাৰ কৰক"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"প্ৰতিবন্ধিত ছেটিঙৰ অনুমতি দিয়ক"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"প্ৰতিবন্ধিত ছেটিং"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"আপোনাৰ সুৰক্ষাৰ বাবে, এই ছেটিংটো বৰ্তমান উপলব্ধ নহয়।"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"ফ’ন কল চলি থকাৰ সময়ত এই কাৰ্যটো কৰিব নোৱাৰি"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"ফ’ন কল চলি থকাৰ সময়ত এপক অন্য এপ্ ইনষ্টল কৰিবলৈ দিয়াৰ অনুমতি নাই।\n\n ফ’ন কল চলি থকাৰ সময়ত প্ৰৱঞ্চকে প্ৰায়েই এই ধৰণৰ কাৰ্য কৰিবলৈ অনুৰোধ কৰে, গতিকে আপোনাক সুৰক্ষিত কৰিবলৈ এয়া অৱৰোধ কৰা হয়। যদি আপোনাক আপুনি চিনি নোপোৱা কোনো লোকে এই কাৰ্যটো কৰিবলৈ নিৰ্দেশনা দিয়ে, সেয়া প্ৰৱঞ্চনা হ’ব পাৰে।"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"কলৰ সময়ত কাৰ্য সম্পূৰ্ণ কৰিব নোৱাৰি"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"আপোনাৰ ডিভাইচ আৰু ডেটা সুৰক্ষিত কৰিবলৈ এই ছেটিংটো অৱৰোধ কৰা হৈছে।<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>স্কেমাৰসকলে আপোনাক এটা নতুন উৎসৰ পৰা অজ্ঞাত এপ্সমূহ ইনষ্টল কৰিবলৈ কৈ ক্ষতিকাৰক এপ্সমূহ ইনষ্টল কৰিবলৈ চেষ্টা কৰিব পাৰে।"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>স্কেমাৰসকলে আপোনাক এটা এপৰ বাবে সাধ্য সুবিধাৰ এক্সেছৰ অনুমতি দিবলৈ কৈ আপোনাৰ ডিভাইচৰ নিয়ন্ত্ৰণ ল’বলৈ চেষ্টা কৰিব পাৰে।"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"এপ্টোক <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>ৰ এক্সেছ প্ৰত্যাখ্যান কৰা হৈছে"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"এপ্টোৱে সংবেদনশীল অনুমতি এক্সেছ কৰিবলৈ অনুৰোধ কৰিছে, যিটোৱে আপোনাৰ ব্যক্তিগত আৰু বিত্তীয় তথ্য বিপদাপন্ন কৰিব পাৰে।<xliff:g id="ID_1"><br><br></xliff:g>এপ্টোৱে এই প্ৰতিবন্ধিত অনুমতিটোৰ অবিহনে সঠিককৈ কাম নকৰাটো সম্ভৱ হ’ব পাৰে। <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>কেনেকৈ এক্সেছৰ অনুমতি দিব লাগে জানক</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"এপ্টোক ডিফ’ল্ট <xliff:g id="ROLE_NAME">%1$s</xliff:g>ৰ এক্সেছ প্ৰত্যাখ্যান কৰা হৈছে"</string> diff --git a/PermissionController/res/values-az-v33/strings.xml b/PermissionController/res/values-az-v33/strings.xml index da3e73e74..79b215907 100644 --- a/PermissionController/res/values-az-v33/strings.xml +++ b/PermissionController/res/values-az-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Daha çox siqnal"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Qapadılmış xəbərdarlıqlar"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Genişləndirin və daha bir xəbərdarlığa baxın}other{Genişləndirin və daha # xəbərdarlığa baxın}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Yığcamlaşdırın"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Xəbərdarlıq. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Əməliyyat tamamlandı"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Cihazınıza qoruma əlavə edə biləcək ayarları yoxlayın"</string> diff --git a/PermissionController/res/values-az/strings.xml b/PermissionController/res/values-az/strings.xml index 4a7ddc91f..3276db505 100644 --- a/PermissionController/res/values-az/strings.xml +++ b/PermissionController/res/values-az/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> cihazında bu tətbiq üçün <xliff:g id="PERM">%1$s</xliff:g> girişi"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Bütün <xliff:g id="APP">%1$s</xliff:g> icazələrinə baxın"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Bu icazəyə sahib olan bütün tətbiqlərə baxın"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Məlumat"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Ayarlar"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Assistent üçün mikrofon istifadəsini göstərin"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"İstifadə edilməyən tətbiq ayarları"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Tətbiq işlənməyəndə icazə ləğv edilsin"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Linklərin açılması"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"İş üçün defolt"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Şəxsi sahə üçün defolt"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Cihaz üçün optimallaşdırılıb"</string> + <string name="default_app_others" msgid="7793029848126079876">"Digərləri"</string> <string name="default_app_none" msgid="9084592086808194457">"Yoxdur"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Sistem defoltu)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Tətbiq yoxdur"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> sazlama məlumatını yükləmək istəyir."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Sazlama datası paylaşılsın?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Sistem xətası aşkarlandı."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> bu cihazdan <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g> tarixində götürülmüş baq hesabatını yükləmək istəyir. Baq hesabatlarına istifadəçi adları, məkan datası, cihaz identifikatorları və şəbəkə məlumatı kimi cihaz və ya tətbiqlər haqqında məxfi məlumat daxildir. Baq hesabatlarını yalnız güvəndiyiniz şəxs və tətbiqlərlə paylaşın. <xliff:g id="APP_NAME_1">%4$s</xliff:g> tətbiqinə baq hesabatını yükləməyə icazə verilsin?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> bu cihazdan <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g> tarixində götürülmüş baq hesabatını yükləmək istəyir. Baq hesabatlarına istifadəçi adları, məkan datası, cihaz identifikatorları və şəbəkə məlumatı kimi cihaz və ya tətbiqlər haqqında məxfi məlumat daxildir. Baq hesabatlarını yalnız güvəndiyiniz şəxs və tətbiqlərlə paylaşın. \n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g> tətbiqinə baq hesabatını yükləmək icazəsi verilsin?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> üçün baq hesabatı işlənərkən xəta baş verdi. Sazlanma datası haqqında ətraflı məlumatın paylaşılması rədd edildi. Problemə görə üzr istəyirik."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"İcazə verin"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Rədd edin"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Məhdudlaşdırılmış ayarlara icazə verin"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Məhdudlaşdırılmış ayar"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Güvənlik üçün bu ayar əlçatan deyil."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Telefon zəngi zamanı əməliyyat mümkün deyil"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Telefon zəngi zamanı tətbiqlərin digər tətbiqləri quraşdırmağına icazə verilmir.\n\n Fırıldaqçılar, adətən, telefon danışıqları zamanı bu cür əməliyyatları həyata keçirməyinizi tələb edirlər, ona görə də sizi qorumaq bloklanıb. Tanımadığınız şəxs tərəfindən bu əməliyyatları həyata keçirməyiniz istənilsə, bu, fırıldaqçılıq ola bilər."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Zəng zamanı əməliyyatı tamamlamaq olmur"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Cihaz və datanızı qorumaq üçün bu ayar bloklanıb.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Fırıldaqçılar yeni mənbədən naməlum tətbiqlər quraşdırmağınızı istəyərək zərərli tətbiqlər quraşdırmağa cəhd edə bilərlər."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Fırıldaqçılar tətbiq üçün xüsusi imkanlara giriş verməyinizi istəyərək cihazınızı idarə etməyə cəhd edə bilərlər."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Tətbiqə <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> icazəsinə giriş verilmədi"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Tətbiq şəxsi və maliyyə məlumatlarınızı riskə ata biləcək həssas məlumat icazəsinə giriş istədi.<xliff:g id="ID_1"><br><br></xliff:g>Bu məhdud icazə olmadan tətbiq düzgün işləməyə bilər. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Girişə icazə vermək haqqında ətraflı</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Tətbiqə defolt <xliff:g id="ROLE_NAME">%1$s</xliff:g> roluna giriş verilmədi"</string> diff --git a/PermissionController/res/values-b+sr+Latn-v33/strings.xml b/PermissionController/res/values-b+sr+Latn-v33/strings.xml index acc79ac84..8da4acd5c 100644 --- a/PermissionController/res/values-b+sr+Latn-v33/strings.xml +++ b/PermissionController/res/values-b+sr+Latn-v33/strings.xml @@ -30,9 +30,10 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Još obaveštenja"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Odbačena obaveštenja"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Proširite i vidite još jedno obaveštenje}one{Proširite i vidite još # obaveštenje}few{Proširite i vidite još # obaveštenja}other{Proširite i vidite još # obaveštenja}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Skupi"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Obaveštenje. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Radnja je dovršena"</string> - <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Proverite podešavanja koja mogu da dodaju zaštitu uređaju"</string> + <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Proverite podešavanja koja mogu da doprinesu boljoj zaštiti uređaja"</string> <string name="safety_center_qs_page_landing" msgid="1717368301679228128">"Brza podešavanja bezbednosti i privatnosti"</string> <string name="safety_center_qs_close_button" msgid="1352313308176244599">"Zatvori"</string> <string name="safety_center_qs_expand_action" msgid="2193190557696484169">"Proširi i prikaži opcije"</string> diff --git a/PermissionController/res/values-b+sr+Latn/strings.xml b/PermissionController/res/values-b+sr+Latn/strings.xml index e26a7599a..f65a2ad0e 100644 --- a/PermissionController/res/values-b+sr+Latn/strings.xml +++ b/PermissionController/res/values-b+sr+Latn/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Ova aplikacija ima pristup za: <xliff:g id="PERM">%1$s</xliff:g> na uređaju <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Prikaži sve dozvole za: <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Prikaži sve aplikacije sa ovom dozvolom"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informacije"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Podešavanja"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Prikaži kako Pomoćnik koristi mikrofon"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Podešavanja nekorišćenih aplikacija"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Ukloni dozvole ako se aplikacija ne koristi"</string> @@ -353,7 +355,7 @@ <string name="accessibility_service_dialog_title_multiple" msgid="5527879210683548175">"Aplikacije pristupačnosti (<xliff:g id="NUM_SERVICES">%s</xliff:g>) imaju potpun pristup uređaju"</string> <string name="accessibility_service_dialog_bottom_text_single" msgid="1128666197822205958">"<xliff:g id="SERVICE_NAME">%s</xliff:g> može da pregleda sadržaj ekrana, radnje i unose, obavlja radnje i upravlja ekranom."</string> <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"Ove aplikacije mogu da pregledaju sadržaj ekrana, radnje i unose, kao i da obavljaju radnje i upravljaju ekranom."</string> - <string name="role_assistant_label" msgid="4727586018198208128">"Podrazumev. digitalni pomoćnik"</string> + <string name="role_assistant_label" msgid="4727586018198208128">"Podrazumevani digitalni pomoćnik"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"Aplikacija digitalnog pomoćnika"</string> <string name="role_assistant_description" msgid="6622458130459922952">"Aplikacije za pomoć mogu da vam pomognu na osnovu informacija sa ekrana koji gledate. Neke aplikacije podržavaju usluge pokretača i glasovnog unosa da bi vam pružile integrisanu pomoć."</string> <string name="role_browser_label" msgid="2877796144554070207">"Podrazumevana apl. pregledača"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Otvaranje linkova"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Podrazumevana za posao"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Podrazumevano za privatan prostor"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimizovano za uređaj"</string> + <string name="default_app_others" msgid="7793029848126079876">"Drugo"</string> <string name="default_app_none" msgid="9084592086808194457">"Ništa"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Podrazumevana sistemska)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Nema aplikacija"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi da otpremi informacije za otklanjanje grešaka."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Želite da delite podatke o otklanjanju grešaka?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Sistem je otkrio problem."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> traži da otpremi izveštaj o greškama sa ovog uređaja koji je napravljen <xliff:g id="DATE">%2$s</xliff:g> u <xliff:g id="TIME">%3$s</xliff:g>. Izveštaji o greškama obuhvataju lične podatke o uređaju ili podatke koje su evidentirale aplikacije, na primer, korisnička imena, podatke o lokaciji, identifikatore uređaja i informacije o mreži. Delite izveštaje o greškama samo sa ljudima i aplikacijama koje smatrate pouzdanim za te informacije. Želite li da dozvolite da <xliff:g id="APP_NAME_1">%4$s</xliff:g> otpremi izveštaj o grešci?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> traži da otpremi izveštaj o grešci sa ovog uređaja koji je napravljen <xliff:g id="DATE">%2$s</xliff:g> u <xliff:g id="TIME">%3$s</xliff:g>. Izveštaji o greškama obuhvataju lične podatke o uređaju ili podatke koje su evidentirale aplikacije, na primer, korisnička imena, podatke o lokaciji, identifikatore uređaja i informacije o mreži. Delite izveštaje o greškama samo sa ljudima i aplikacijama kojima možete da poverite te informacije.\n\nŽelite li da dozvolite da <xliff:g id="APP_NAME_1">%4$s</xliff:g> otpremi izveštaj o grešci?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Došlo je do greške pri obradi izveštaja o grešci za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>. Zato je odbijeno deljenje detaljnih podataka o otklanjanju grešaka. Izvinjavamo se zbog prekida."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Dozvoli"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Odbij"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Dozvoli ograničena podešavanja"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Ograničeno podešavanje"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Ovo podešavanje je trenutno nedostupno radi vaše bezbednosti."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Radnja nije dostupna tokom telefonskog poziva"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Nije dozvoljeno da aplikacije instaliraju druge aplikacije tokom telefonskog poziva.\n\n Prevaranti često traže ovaj tip radnje tokom telefonskog poziva, pa smo je blokirali da bismo vas zaštitili. Ako vas neko koga ne poznajete upućuje na ovu radnju, to bi mogla da bude prevara."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Radnja ne može da se završi tokom poziva"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Ovo podešavanje je blokirano da bi se zaštitili uređaj i podaci.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Prevaranti mogu da pokušaju da instaliraju štetne aplikacije tako što će tražiti da instalirate nepoznate aplikacije iz novog izvora."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Prevaranti mogu da pokušaju da preuzmu kontrolu nad uređajem tako što će tražiti da za aplikaciju dozvolite pristup za pristupačnost."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Aplikaciji nije dozvoljen pristup dozvoli: <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Aplikacija je zatražila pristup osetljivoj dozvoli, što može da ugrozi bezbednost ličnih i finansijskih podataka.<xliff:g id="ID_1"><br><br></xliff:g>Aplikacija možda neće raditi ispravno bez ove ograničene dozvole. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Saznajte kako da dozvolite pristup</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Aplikaciji nije dozvoljen pristup da postane podrazumevana: <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-be-v33/strings.xml b/PermissionController/res/values-be-v33/strings.xml index 511ed49c6..0742aa8d7 100644 --- a/PermissionController/res/values-be-v33/strings.xml +++ b/PermissionController/res/values-be-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Іншыя абвесткі"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Адхіленыя абвесткі"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Разгарніце, каб убачыць яшчэ адну абвестку}one{Разгарніце, каб убачыць яшчэ # абвестку}few{Разгарніце, каб убачыць яшчэ # абвесткі}many{Разгарніце, каб убачыць яшчэ # абвестак}other{Разгарніце, каб убачыць яшчэ # абвесткі}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Згарнуць"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Абвестка. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Дзеянне завершана"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Праверце налады, якія могуць павысіць бяспеку вашай прылады"</string> diff --git a/PermissionController/res/values-be/strings.xml b/PermissionController/res/values-be/strings.xml index e02518d3d..438da867f 100644 --- a/PermissionController/res/values-be/strings.xml +++ b/PermissionController/res/values-be/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Дазвол \"<xliff:g id="PERM">%1$s</xliff:g>\" для гэтай праграмы на прыладзе \"<xliff:g id="DEVICE_NAME">%2$s</xliff:g>\""</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Паказаць усе дазволы праграмы \"<xliff:g id="APP">%1$s</xliff:g>\""</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Паказаць усе праграмы з гэтым дазволам"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Інфармацыя"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Налады"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Паказваць выкарыстанне мікрафона памочнікам"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Налады неактыўных праграм"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Выдаляць дазволы, калі праграма не выкарыстоўваецца"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Адкрыццё спасылак"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Стандартныя для працы"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Стандартныя праграмы для прыватнай прасторы"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Аптымізаваныя для прылады"</string> + <string name="default_app_others" msgid="7793029848126079876">"Іншыя"</string> <string name="default_app_none" msgid="9084592086808194457">"Няма"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Стандартная сістэмная)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Няма праграм"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"Праграма \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" спрабуе запампаваць звесткі пра адладку."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Абагуліць даныя адладкі?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Сістэма выявіла праблему."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"Праграма \"<xliff:g id="APP_NAME_0">%1$s</xliff:g>\" запытвае запампоўку справаздачы пра памылкі з гэтай прылады ад <xliff:g id="DATE">%2$s</xliff:g> у <xliff:g id="TIME">%3$s</xliff:g>. Справаздача пра памылкі ўключае персанальную інфармацыю пра вашу прыладу ці зарэгістраваныя праграмы, напрыклад імёны карыстальнікаў, звесткі пра месцазнаходжанне, ідэнтыфікатары прылады і даныя пра сетку. Абагульвайце справаздачы пра памылкі толькі з людзьмі і праграмамі, якім давяраеце. Дазволіць праграме \"<xliff:g id="APP_NAME_1">%4$s</xliff:g>\" запампаваць справаздачу пра памылкі?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"Праграма \"<xliff:g id="APP_NAME_0">%1$s</xliff:g>\" запытвае дазволу запампаваць з гэтай прылады справаздачу пра памылку ад <xliff:g id="DATE">%2$s</xliff:g> (<xliff:g id="TIME">%3$s</xliff:g>). Справаздачы пра памылку ўключаюць асабістую інфармацыю пра вашу прыладу або інфармацыю, зарэгістраваную праграмамі, напрыклад імёны карыстальнікаў, даныя пра месцазнаходжанне, ідэнтыфікатары прылады і інфармацыю пра сетку. Абагульвайце справаздачы пра памылкі толькі з карыстальнікамі і праграмамі, якім давяраеце.\n\nДазволіць праграме \"<xliff:g id="APP_NAME_1">%4$s</xliff:g>\" запампаваць справаздачу пра памылку?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Узнікла памылка пры апрацоўцы справаздачы пра памылкі для праграмы \"<xliff:g id="APP_NAME">%1$s</xliff:g>\". Абагульванне падрабязных звестак пра адладку адхілена. Просім прабачэння за збой."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Дазволіць"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Адмовіць"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Дазволіць абмежаваныя налады"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Налада з абмежаваным доступам"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"У мэтах бяспекі гэта налада цяпер недаступная."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Дзеянне недаступнае падчас тэлефоннага выкліку"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Падчас тэлефоннага выкліку забараняецца даваць дазвол праграмам усталёўваць іншыя праграмы.\n\n У тэлефонных размовах махляры часта просяць усталяваць праграмы, таму ў мэтах бяспекі мы блакіруем такія дзеянні. Запыт ад невядомай вам асобы выканаць падобнае дзеянне можа расцэньвацца як махлярства."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Нельга выканаць гэта дзеянне падчас выкліку"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Гэта налада заблакіравана для абароны вашай прылады і даных. <xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Каб паспрабаваць усталяваць шкодныя праграмы, махляры могуць прасіць вас усталяваць невядомыя праграмы з новай крыніцы."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Каб атрымаць кантроль над вашай прыладай, махляры могуць запытаць для праграмы доступ да спецыяльных магчымасцей."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Праграме адмоўлена ў дазволе \"<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>\""</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Праграма запытала дазвол на доступ да канфідэнцыяльнай інфармацыі. Калі вы яго дасце, ваша асабістая і фінансавая інфармацыя можа аказацца ў небяспецы.<xliff:g id="ID_1"><br><br></xliff:g>Магчыма, без гэтага абмежаванага дазволу праграма не будзе працаваць належным чынам. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Даведацца, як дазволіць доступ</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Праграме адмоўлена ў дазволе стандартна выконваць наступную ролю: <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-bg-v33/strings.xml b/PermissionController/res/values-bg-v33/strings.xml index 6080b29b8..8c9466fe0 100644 --- a/PermissionController/res/values-bg-v33/strings.xml +++ b/PermissionController/res/values-bg-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Още сигнали"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Отхвърлени сигнали"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Разгънете и вижте още един сигнал}other{Разгънете и вижте още # сигнала}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Свиване"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Сигнал. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Действието е завършено"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Проверете настройките, които могат да подобрят защитата на устройството ви"</string> diff --git a/PermissionController/res/values-bg/strings.xml b/PermissionController/res/values-bg/strings.xml index f60db861f..6713e5dee 100644 --- a/PermissionController/res/values-bg/strings.xml +++ b/PermissionController/res/values-bg/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Достъп до <xliff:g id="PERM">%1$s</xliff:g> на <xliff:g id="DEVICE_NAME">%2$s</xliff:g> за това приложение"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Преглед на всички разрешения, предоставени за: <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Преглед на всички приложения с това разрешение"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Информация"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Настройки"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Показване на употребата на микрофона за Асистент"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Настройки за неизползваните приложения"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Премахване на разрешенията, ако приложението не се използва"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Отваряне на връзки"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"По подразбиране за работа"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Стандартни за частното пространство"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Оптимизирано за устройството"</string> + <string name="default_app_others" msgid="7793029848126079876">"Други"</string> <string name="default_app_none" msgid="9084592086808194457">"Няма"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Стандартно за системата)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Няма приложения"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> иска да качи информация за отстраняване на грешки."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Споделяне на данните за отстраняване на грешки?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Системата откри проблем."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> иска да качи сигнал за програмна грешка от това устройство, създаден на <xliff:g id="DATE">%2$s</xliff:g> в <xliff:g id="TIME">%3$s</xliff:g>. Сигналите за програмни грешки включват лична информация за устройството ви или регистрирана от приложенията, като например потребителски имена, данни за местоположението, идентификатори на устройството и информация за мрежата. Споделяйте сигналите за програмни грешки само с хора и приложения, на които бихте доверили тази информация. Да се разреши ли на <xliff:g id="APP_NAME_1">%4$s</xliff:g> да качи сигнал за програмна грешка?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> иска да качи отчет за програмни грешки от това устройство, създаден на <xliff:g id="DATE">%2$s</xliff:g> в <xliff:g id="TIME">%3$s</xliff:g> Отчетите за програмни грешки включват лична информация за устройството ви или информация, регистрирана от приложенията, като например потребителски имена, данни за местоположението, идентификатори на устройството и информация за мрежата. Споделяйте отчетите за програмни грешки само с хора и приложения, на които бихте доверили тази информация. \n\nДа се разреши ли на <xliff:g id="APP_NAME_1">%4$s</xliff:g> да качи отчет за програмни грешки?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"При обработката на сигнала за програмна грешка за <xliff:g id="APP_NAME">%1$s</xliff:g> възникна проблем. Затова споделянето на подробните данни за отстраняването на грешки бе отказано. Извиняваме се за прекъсването."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Разрешаване"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Отказ"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Разрешаване на ограничените настройки"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Ограничена настройка"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"От съображения за сигурност понастоящем тази настройка не е налице."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Действието не е налице по време на тел. обаждане"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"По време на телефонно обаждане не можете да разрешавате на приложенията да инсталират други приложения.\n\nТова действие е блокирано от съображения за сигурност, защото често се използва от измамници по време на телефонни разговори. Ако човек, когото не познавате, ви напътства, за да предприемете това действие, възможно е да става дума за измама."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Действието не е възможно по време на обаждане"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Тази настройка е блокирана с цел защита на устройството и данните ви.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Измамници може да се опитат да инсталират опасни приложения, като ви помолят да инсталирате неизвестни приложения от нов източник."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Измамници може да се опитат да поемат контрола над устройството ви, като ви помолят да разрешите на дадено приложение да осъществява достъп до услугите за достъпност."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"На приложението бе отказан достъп до <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Приложението поиска разрешение за достъп до поверителни данни, което може да изложи на риск личната или финансовата ви информация.<xliff:g id="ID_1"><br><br></xliff:g>Възможно е приложението да не работи правилно без това ограничено разрешение. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Научете как да разрешите достъпа</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Приложението не получи разрешение да бъде по подразбиране: <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-bn-v33/strings.xml b/PermissionController/res/values-bn-v33/strings.xml index 6bef7e90d..9019de1de 100644 --- a/PermissionController/res/values-bn-v33/strings.xml +++ b/PermissionController/res/values-bn-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"আরও সতর্কতা"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"বাতিল করা সতর্কতা"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{বড় করুন ও আরও একটি সতর্কতা দেখুন}one{বড় করুন ও আরও #টি সতর্কতা দেখুন}other{বড় করুন ও আরও #টি সতর্কতা দেখুন}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"আড়াল করুন"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"সতর্কতা। <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"অ্যাকশন সম্পূর্ণ হয়েছে"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"আপনার ডিভাইসকে আরও সুরক্ষিত করতে পারে এমন সেটিংস দেখুন"</string> diff --git a/PermissionController/res/values-bn/strings.xml b/PermissionController/res/values-bn/strings.xml index 27c5f85cc..131a87878 100644 --- a/PermissionController/res/values-bn/strings.xml +++ b/PermissionController/res/values-bn/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g>-এ এই অ্যাপের জন্য <xliff:g id="PERM">%1$s</xliff:g>-এর অ্যাক্সেস"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"<xliff:g id="APP">%1$s</xliff:g>-এর ক্ষেত্রে দেওয়া সব অনুমতি দেখুন"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"যেসব অ্যাপের এই অনুমতি আছে সেগুলি দেখুন"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"তথ্য"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"সেটিংস"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Assistant-এর মাইক্রোফোন ব্যবহার সম্পর্কিত ডেটা দেখুন"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"ব্যবহার করা হয়নি এমন অ্যাপ সেটিংস"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"অ্যাপ ব্যবহার করা না হলে সেটি থেকে অনুমতি প্রত্যাহার করে নিন"</string> @@ -355,7 +357,7 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"এই অ্যাপগুলি আপনার স্ক্রিন, অ্যাকশন ও ইনপুট দেখতে এবং অ্যাকশন নিতে ও ডিসপ্লে নিয়ন্ত্রণ করতে পারে।"</string> <string name="role_assistant_label" msgid="4727586018198208128">"ডিফল্ট ডিজিটাল অ্যাসিস্ট্যান্ট অ্যাপ"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"ডিজিটাল অ্যাসিস্ট্যান্ট অ্যাপ"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"আপনি যে স্ক্রিন দেখছেন সেটির তথ্যের উপর নির্ভর করে সহায়তা অ্যাপ আপনাকে সাহায্য করতে পারে৷ কিছু অ্যাপ আপনাকে ইন্টিগ্রেটেড সহায়তা দিতে, লঞ্চার ও ভয়েস ইনপুট দুটি পরিষেবাই ব্যবহার করতে পারে।"</string> + <string name="role_assistant_description" msgid="6622458130459922952">"আপনি যে স্ক্রিন দেখছেন সেটির তথ্যের উপর নির্ভর করে অ্যাসিস্ট অ্যাপ আপনাকে সাহায্য করতে পারে৷ কিছু অ্যাপ আপনাকে ইন্টিগ্রেটেড সহায়তা দিতে, লঞ্চার ও ভয়েস ইনপুট দুটি পরিষেবাই ব্যবহার করতে পারে।"</string> <string name="role_browser_label" msgid="2877796144554070207">"ডিফল্ট ব্রাউজার অ্যাপ"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"ব্রাউজার অ্যাপ"</string> <string name="role_browser_description" msgid="3465253637499842671">"এমন অ্যাপ যা ইন্টারনেট অ্যাক্সেস করতে সাহায্য করে ও ট্যাপ করা লিঙ্কগুলি দেখায়"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"লিঙ্ক খোলা"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"অফিসের জন্য ডিফল্ট"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"প্রাইভেট স্পেসের জন্য ডিফল্ট"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"ডিভাইসের জন্য অপ্টিমাইজ করা হয়েছে"</string> + <string name="default_app_others" msgid="7793029848126079876">"অন্যান্য"</string> <string name="default_app_none" msgid="9084592086808194457">"কোনওটিই নয়"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(সিস্টেম ডিফল্ট)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"কোনও অ্যাপ নেই"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> ডিবাগিংয়ের তথ্য আপলোড করতে চায়।"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"ডিবাগিং ডেটা শেয়ার করবেন?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"সিস্টেম একটি সমস্যা শনাক্ত করেছে।"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"এই ডিভাইস থেকে <xliff:g id="DATE">%2$s</xliff:g> তারিখে <xliff:g id="TIME">%3$s</xliff:g>-এ নেওয়া একটি সমস্যার রিপোর্ট <xliff:g id="APP_NAME_0">%1$s</xliff:g> আপলোড করতে চাইছে। ইউজার নেম, লোকেশন ডেটা, ডিভাইসের শনাক্তকারী ও নেটওয়ার্কের তথ্যের মতো আপনার ডিভাইস ও লগ-ইন করা অ্যাপের ব্যাপারে ব্যক্তিগত তথ্য সমস্যার রিপোর্টে অন্তর্ভুক্ত থাকে। যেসব লোকজন বা অ্যাপকে আপনি এই তথ্য জানানোর ব্যাপারে বিশ্বাস করতে পারেন শুধুমাত্র তাদের সাথেই সমস্যার রিপোর্ট শেয়ার করুন। একটি সমস্যার রিপোর্ট আপলোড করতে <xliff:g id="APP_NAME_1">%4$s</xliff:g>-কে অনুমতি দিতে চান?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"এই ডিভাইস থেকে <xliff:g id="DATE">%2$s</xliff:g>-এ <xliff:g id="TIME">%3$s</xliff:g>-এ নেওয়া একটি সমস্যার রিপোর্ট <xliff:g id="APP_NAME_0">%1$s</xliff:g> আপলোড করতে চাইছে। ইউজার নেম, লোকেশন ডেটা, ডিভাইসের শনাক্তকারী ও নেটওয়ার্কের তথ্যের মতো আপনার ডিভাইস ও লগ-ইন করা অ্যাপের ব্যাপারে ব্যক্তিগত তথ্য সমস্যার রিপোর্টে অন্তর্ভুক্ত থাকে। যেসব লোকজন বা অ্যাপকে আপনি এই তথ্য জানানোর ব্যাপারে বিশ্বাস করতে পারেন শুধুমাত্র তাদের সাথেই সমস্যার রিপোর্ট শেয়ার করুন। একটি সমস্যার রিপোর্ট আপলোড করতে \n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g>-কে অনুমতি দিতে চান?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এর ত্রুটির প্রতিবেদন প্রসেস করার সময় সমস্যা হয়েছে। তাই ডিবাগিং সংক্রান্ত বিস্তারিত ডেটা শেয়ার করার প্রক্রিয়াটি বাতিল করা হয়েছে। বিঘ্ন ঘটায় দুঃখিত।"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"অনুমতি দিন"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"অনুমতি দেবেন না"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"বিধিনিষেধযুক্ত সেটিংসের অনুমতি দিন"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"বিধিনিষেধযুক্ত সেটিংস"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"আপনার নিরাপত্তার জন্য, এই সেটিং বর্তমানে উপলভ্য নেই।"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"ফোন কলের সময় অ্যাকশন নেওয়া যাবে না"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"ফোন কলের সময় অ্যাপকে অন্য অ্যাপ ইনস্টল করার অনুমতি দেওয়া হয় না।\n\n ফোন কলের সময় স্ক্যামার প্রায়ই এই ধরনের অ্যাকশনের অনুরোধ করেন, তাই আপনাকে সুরক্ষিত রাখতে এটি ব্লক করা হয়েছে। আপনি চেনেন না এমন কেউ আপনাকে এই অ্যাকশন নিতে বললে, সেটি স্ক্যাম হতে পারে।"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"কল চলাকালীন অ্যাকশন সম্পূর্ণ করা যাচ্ছে না"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"আপনার ডিভাইস ও ডেটা সুরক্ষিত রাখতে এই সেটিং ব্লক করা হয়েছে।<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>স্ক্যামাররা আপনাকে নতুন সোর্স থেকে অজানা অ্যাপ ইনস্টল করার কথা বলে, ক্ষতিকর অ্যাপ ইনস্টল করার চেষ্টা করতে পারে।"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>স্ক্যামাররা কোনও অ্যাপের জন্য অ্যাক্সেসিবিলিটি অ্যাক্সেস করার অনুমতি দিতে বলার মাধ্যমে, আপনার ডিভাইসের কন্ট্রোল নেওয়ার চেষ্টা করতে পারে।"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"অ্যাপকে <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> অ্যাক্সেস করতে দেওয়া হয়নি"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"অ্যাপটি সংবেদনশীল অনুমতি অ্যাক্সেস করার অনুরোধ জানিয়েছে, যার জন্য আপনার ব্যক্তিগত ও আর্থিক অবস্থা সম্পর্কিত তথ্যের ক্ষেত্রে ঝুঁকির সম্ভাবনা থাকতে পারে।<xliff:g id="ID_1"><br><br></xliff:g>এই সীমাবদ্ধ অনুমতি ছাড়া অ্যাপটি সঠিকভাবে কাজ না করার সম্ভাবনাও আছে। <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>কীভাবে অ্যাক্সেস করার অনুমতি দেবেন সেই সম্পর্কে জানুন</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"অ্যাপকে ডিফল্ট <xliff:g id="ROLE_NAME">%1$s</xliff:g> হিসেবে কাজ করার অ্যাক্সেস দেওয়া হয়নি"</string> diff --git a/PermissionController/res/values-bs-v33/strings.xml b/PermissionController/res/values-bs-v33/strings.xml index 598dc6a6c..fb802c7df 100644 --- a/PermissionController/res/values-bs-v33/strings.xml +++ b/PermissionController/res/values-bs-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Više upozorenja"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Odbačena upozorenja"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Proširite i vidite još jedno upozorenje}one{Proširite i vidite još # upozorenje}few{Proširite i vidite još # upozorenja}other{Proširite i vidite još # upozorenja}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Suzi"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Upozorenje. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Radnja je završena"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Provjerite postavke koje mogu dodatno zaštiti vaš uređaj"</string> diff --git a/PermissionController/res/values-bs/strings.xml b/PermissionController/res/values-bs/strings.xml index 95c1d96b6..cda6d19d6 100644 --- a/PermissionController/res/values-bs/strings.xml +++ b/PermissionController/res/values-bs/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Pristup aplikaciji \"<xliff:g id="PERM">%1$s</xliff:g>\" za ovu aplikaciju na uređaju \"<xliff:g id="DEVICE_NAME">%2$s</xliff:g>\""</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Prikaži sva odobrenja aplikacije <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Prikaži sve aplikacije s ovim odobrenjem"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informacije"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Postavke"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Prikaži korištenje mikrofona asistenta"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Postavke za nekorištene aplikacije"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Ukloni odobrenja ako se aplikacija ne koristi"</string> @@ -355,7 +357,7 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"Ove aplikacije mogu pregledati vaš ekran, radnje i unose, izvršavati radnje i kontrolirati ekran."</string> <string name="role_assistant_label" msgid="4727586018198208128">"Zadani digitalni asistent"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"Aplikacija digitalnog asistenta"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"Aplikacije za pomoć vam mogu pomoći na osnovu informacija s ekrana koji pregledate. Neke aplikacije podržavaju i usluge pokretača i glasovnog unosa kako bi vam pružile sveukupnu pomoć."</string> + <string name="role_assistant_description" msgid="6622458130459922952">"Aplikacije za pomoć vam mogu pomoći na osnovu informacija s ekrana koji pregledate. Neke aplikacije podržavaju i usluge pokretača i glasovnog unosa kako bi vam pružile integriranu pomoć."</string> <string name="role_browser_label" msgid="2877796144554070207">"Zadana aplikacija preglednika"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"Aplikacija preglednika"</string> <string name="role_browser_description" msgid="3465253637499842671">"Aplikacije koje vam pružaju pristup internetu i prikazuju linkove koje možete dodirnuti"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Otvaranje linkova"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Uobičajeno za rad"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Zadano za privatni prostor"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimizirano za uređaj"</string> + <string name="default_app_others" msgid="7793029848126079876">"Drugo"</string> <string name="default_app_none" msgid="9084592086808194457">"Nema"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Sistemski zadano)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Nema aplikacija"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> želi otpremiti informacije o otklanjanju grešaka."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Podijeliti podatke o otklanjanju grešaka?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Sistem je otkrio problem."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> traži da s ovog uređaja otpremi izvještaj o greškama napravljen <xliff:g id="DATE">%2$s</xliff:g> u <xliff:g id="TIME">%3$s</xliff:g>. Izvještaji o greškama uključuju lične informacije o vašem uređaju ili koje su zabilježile aplikacije, npr. korisnička imena, podatke o lokaciji, identifikatore uređaja i informacije o mreži. Izvještaje o greškama dijelite samo s osobama i aplikacijama kojim vjerujete. Dozvoliti aplikaciji <xliff:g id="APP_NAME_1">%4$s</xliff:g> da otpremi izvještaj o greškama?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"Aplikacija <xliff:g id="APP_NAME_0">%1$s</xliff:g> traži da s uređaja otpremi izvještaj o grešci kreiran na dan <xliff:g id="DATE">%2$s</xliff:g> u <xliff:g id="TIME">%3$s</xliff:g>. Izvještaji o greškama uključuju lične informacije o uređaju ili informacije koje su zabilježile aplikacije, npr. korisnička imena, podatke o lokaciji, identifikatore uređaja i informacije o mreži. Dijelite izvještaje o greškama samo s osobama i aplikacijama koje smatrate pouzdanima.\n\nDozvoliti aplikaciji <xliff:g id="APP_NAME_1">%4$s</xliff:g> da otpremi izvještaj o grešci?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Došlo je do greške prilikom obrade izvještaja o greškama za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>. Stoga je odbijeno dijeljenje detaljnih podataka o otklanjanju grešaka. Izvinjavamo se na prekidu."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Dozvoli"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Odbij"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Dozvoli ograničene postavke"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Ograničena postavka"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Radi vaše sigurnosti postavka trenutno nije dostupna."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Radnja nije dostupna tokom telefonskog poziva"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Dozvoljavanje aplikacijama da instaliraju druge aplikacije nije dozvoljeno tokom telefonskog poziva.\n\n Prevaranti često traže ovu vrstu radnje tokom telefonskih razgovora, pa ovo blokiramo da vas zaštitimo. Ako neko koga ne poznajete traži da poduzmete ovu radnju, to može biti prevara."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Nije moguće izvršiti radnju tokom poziva"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Blokirali smo postavku da zaštitimo vaš uređaj i podatke.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Prevaranti mogu pokušati instalirati štetne aplikacije traženjem da instalirate nepoznate aplikacije iz novog izvora."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Prevaranti mogu pokušati preuzeti kontrolu nad uređajem traženjem da dozvolite pristup funkcijama pristupačnosti za aplikaciju."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Aplikaciji je odbijen pristup odobrenju <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Aplikacija je zatražila pristup osjetljivom odobrenju, što može ugroziti vaše lične i finansijske informacije.<xliff:g id="ID_1"><br><br></xliff:g>Moguće je da aplikacija neće ispravno raditi bez ovog ograničenog odobrenja. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Saznajte kako dozvoliti pristup</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Aplikaciji je odbijen pristup da bude zadana <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-ca-v33/strings.xml b/PermissionController/res/values-ca-v33/strings.xml index 0526fffbc..6b7313973 100644 --- a/PermissionController/res/values-ca-v33/strings.xml +++ b/PermissionController/res/values-ca-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Més alertes"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Alertes ignorades"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Desplega i consulta 1 alerta més}many{Desplega i consulta # alertes més}other{Desplega i consulta # alertes més}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Replega"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alerta. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Acció completa"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Comprova les opcions de configuració que puguin afegir protecció al dispositiu"</string> diff --git a/PermissionController/res/values-ca/strings.xml b/PermissionController/res/values-ca/strings.xml index fd1e23c51..e392dff82 100644 --- a/PermissionController/res/values-ca/strings.xml +++ b/PermissionController/res/values-ca/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Accés de <xliff:g id="PERM">%1$s</xliff:g> a aquesta aplicació (<xliff:g id="DEVICE_NAME">%2$s</xliff:g>)"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Mostra tots els permisos per a <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Mostra totes les aplicacions que tenen aquest permís"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informació"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Configuració"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Mostra l\'ús del micròfon de l\'Assistent"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Configuració d\'aplicació no utilitzada"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Suprimeix els permisos si no s\'utilitza l\'aplicació"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Obertura d\'enllaços"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Predeterminada per a la feina"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Predeterminades per a l\'espai privat"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimitzades per al dispositiu"</string> + <string name="default_app_others" msgid="7793029848126079876">"Altres"</string> <string name="default_app_none" msgid="9084592086808194457">"Cap"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Opció predeterminada del sistema)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Cap aplicació"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> vol penjar informació de depuració."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Vols compartir les dades de depuració?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"El sistema ha detectat un problema."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> sol·licita penjar un informe d\'errors des d\'aquest dispositiu generat el dia <xliff:g id="DATE">%2$s</xliff:g> (<xliff:g id="TIME">%3$s</xliff:g>). Els informes d\'errors inclouen informació personal sobre el dispositiu o informació registrada per les aplicacions, com ara noms d\'usuaris, dades de la ubicació, identificadors del dispositiu i informació de la xarxa. Comparteix informes d\'errors només amb persones i aplicacions de confiança. Vols permetre que <xliff:g id="APP_NAME_1">%4$s</xliff:g> pengi un informe d\'errors?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> sol·licita penjar un informe d\'errors des d\'aquest dispositiu generat el dia <xliff:g id="DATE">%2$s</xliff:g> (<xliff:g id="TIME">%3$s</xliff:g>). Els informes d\'errors inclouen informació personal sobre el dispositiu o informació registrada per les aplicacions, com ara noms d\'usuaris, dades de la ubicació, identificadors del dispositiu i informació de la xarxa. Comparteix informes d\'errors només amb persones i aplicacions de confiança. \n\nVols permetre que <xliff:g id="APP_NAME_1">%4$s</xliff:g> pengi un informe d\'errors?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Hi ha hagut un error en processar l\'informe d\'errors de l\'aplicació <xliff:g id="APP_NAME">%1$s</xliff:g> i, per tant, s\'han denegat les dades de depuració detallades. Sentim la interrupció."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Permet"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Denega"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Permet la configuració restringida"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Opció de configuració restringida"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Per a la teva seguretat, aquesta opció de configuració no està disponible en aquests moments."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Acció no disponible durant les trucades"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"No es permet que les aplicacions instal·lin altres aplicacions durant una trucada.\n\n Els estafadors solen demanar aquest tipus d\'acció durant les trucades, de manera que s\'ha bloquejat per protegir-te. Si algú que no coneixes t\'indica que facis aquesta acció, pot ser que es tracti d\'una estafa."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"No es pot completar l\'acció durant la trucada"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Aquesta opció de configuració està bloquejada per protegir el dispositiu i les dades.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Els estafadors poden intentar instal·lar aplicacions perjudicials demanant-te que instal·lis aplicacions desconegudes d\'una font nova."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>És possible que els estafadors intentin prendre el control del teu dispositiu demanant-te que donis a una aplicació accés a funcions d\'accessibilitat."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"A l\'aplicació se li ha denegat l\'accés a <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"L\'aplicació ha demanat accés a un permís sensible, el qual pot posar en risc la teva informació personal o financera.<xliff:g id="ID_1"><br><br></xliff:g>És possible que l\'aplicació no funcioni correctament sense aquest permís restringit. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Més informació sobre com pots permetre l\'accés</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"A l\'aplicació se li ha denegat l\'accés per ser <xliff:g id="ROLE_NAME">%1$s</xliff:g> de manera predeterminada"</string> diff --git a/PermissionController/res/values-cs-v33/strings.xml b/PermissionController/res/values-cs-v33/strings.xml index 84a0f9fd1..0f17ff2d3 100644 --- a/PermissionController/res/values-cs-v33/strings.xml +++ b/PermissionController/res/values-cs-v33/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="role_dialer_request_description" msgid="6188305064871543419">"Tato aplikace vám bude moci zasílat oznámení a bude mít přístup k fotoaparátu, kontaktům, mikrofonu, telefonu a SMS"</string> - <string name="role_sms_request_description" msgid="1506966389698625395">"Tato aplikace vám bude moci zasílat oznámení a bude mít přístup k fotoaparátu, kontaktům, souborům, mikrofonu, telefonu a SMS"</string> + <string name="role_sms_request_description" msgid="1506966389698625395">"Tato aplikace vám bude moct zasílat oznámení a bude mít přístup k fotoaparátu, kontaktům, souborům, mikrofonu, telefonu a SMS"</string> <string name="permission_description_summary_storage" msgid="1917071243213043858">"Aplikace s tímto oprávněním mají přístup ke všem souborům v tomto zařízení"</string> <string name="work_policy_title" msgid="832967780713677409">"Informace o vašich pracovních zásadách"</string> <string name="work_policy_summary" msgid="3886113358084963931">"Nastavení spravuje IT administrátor"</string> @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Další upozornění"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Zavřená upozornění"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Rozbalením zobrazíte jedno další upozornění}few{Rozbalením zobrazíte # další upozornění}many{Rozbalením zobrazíte # dalšího upozornění}other{Rozbalením zobrazíte # dalších upozornění}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Sbalit"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Upozornění. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Akce dokončena"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Zkontrolujte nastavení, která mohou zvýšit ochranu vašeho zařízení"</string> diff --git a/PermissionController/res/values-cs/strings.xml b/PermissionController/res/values-cs/strings.xml index 95eb6a558..242661d91 100644 --- a/PermissionController/res/values-cs/strings.xml +++ b/PermissionController/res/values-cs/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Přístup k <xliff:g id="PERM">%1$s</xliff:g> pro tuto aplikaci v zařízení <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Zobrazit všechna oprávnění aplikace <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Zobrazit všechny aplikace s tímto oprávněním"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informace"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Nastavení"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Zobrazit používání mikrofonu asistentem"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Nastavení nepoužívaných aplikací"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Odebrat oprávnění, pokud se aplikace nepoužívá"</string> @@ -381,7 +383,7 @@ <string name="role_emergency_search_keywords" msgid="1920007722599213358">"v případě nouze"</string> <string name="role_home_label" msgid="3871847846649769412">"Výchozí aplikace pro domácnost"</string> <string name="role_home_short_label" msgid="8544733747952272337">"Vstupní aplikace"</string> - <string name="role_home_description" msgid="7997371519626556675">"Aplikace (tzv. spouštěče), které nahrazují plochu na zařízení Android a dávají vám přístup k obsahu a funkcím zařízení."</string> + <string name="role_home_description" msgid="7997371519626556675">"Aplikace (tzv. spouštěče), které nahrazují plochu na zařízení Android a dávají vám přístup k obsahu a funkcím zařízení."</string> <string name="role_home_request_title" msgid="738136983453341081">"Nastavit <xliff:g id="APP_NAME">%1$s</xliff:g> jako výchozí aplikaci pro domácnost?"</string> <string name="role_home_request_description" msgid="2658833966716057673">"Není potřeba žádné oprávnění"</string> <string name="role_home_search_keywords" msgid="3830755001192666285">"spouštěč"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Otevírání odkazů"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Výchozí pracovní"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Výchozí pro soukromý prostor"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimalizováno pro zařízení"</string> + <string name="default_app_others" msgid="7793029848126079876">"Jiné"</string> <string name="default_app_none" msgid="9084592086808194457">"Žádná aplikace"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Výchozí nastavení systému)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Žádné aplikace"</string> @@ -450,13 +454,13 @@ <string name="special_app_access_no_apps" msgid="4102911722787886970">"Žádné aplikace"</string> <string name="home_missing_work_profile_support" msgid="1756855847669387977">"Nepodporuje pracovní profil"</string> <string name="encryption_unaware_confirmation_message" msgid="8274491794636402484">"Poznámka: Pokud restartujete zařízení a máte nastavený zámek obrazovky, tato aplikace se nespustí, dokud zařízení neodemknete."</string> - <string name="assistant_confirmation_message" msgid="7476540402884416212">"Asistent bude moci číst informace o aplikacích používaných v systému, včetně údajů viditelných na obrazovce a přístupných v rámci aplikací."</string> + <string name="assistant_confirmation_message" msgid="7476540402884416212">"Asistent bude moct číst informace o aplikacích používaných v systému, včetně údajů viditelných na obrazovce a přístupných v rámci aplikací."</string> <string name="incident_report_channel_name" msgid="3144954065936288440">"Sdílet data ladění"</string> <string name="incident_report_notification_title" msgid="4635984625656519773">"Sdílet podrobná data pro ladění?"</string> <string name="incident_report_notification_text" msgid="3376480583513587923">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> chce nahrát informace pro ladění."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Sdílet data ladění?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Systém zjistil problém."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"Aplikace <xliff:g id="APP_NAME_0">%1$s</xliff:g> chce nahrát zprávu o chybě tohoto zařízení, která byla pořízena <xliff:g id="DATE">%2$s</xliff:g> v <xliff:g id="TIME">%3$s</xliff:g>. Zprávy o chybě zahrnují osobní údaje o zařízení a údaje z aplikací, např. uživatelská jména, údaje o poloze, identifikátory zařízení a informace o sítích. Zprávy o chybách sdílejte jen s lidmi a aplikacemi, kterým důvěřujete. Chcete aplikaci <xliff:g id="APP_NAME_1">%4$s</xliff:g> povolit nahrát zprávu o chybě?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"Aplikace <xliff:g id="APP_NAME_0">%1$s</xliff:g> chce nahrát zprávu o chybě tohoto zařízení, která byla pořízena <xliff:g id="DATE">%2$s</xliff:g> v <xliff:g id="TIME">%3$s</xliff:g>. Zprávy o chybách zahrnují osobní údaje o zařízení a údaje z aplikací, například uživatelská jména, údaje o poloze, identifikátory zařízení a informace o sítích. Zprávy o chybách sdílejte jen s lidmi a aplikacemi, kterým důvěřujete.\n\nChcete aplikaci <xliff:g id="APP_NAME_1">%4$s</xliff:g> povolit nahrát zprávu o chybě?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Při zpracování zprávy o chybě aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> došlo k chybě. Sdílení podrobných údajů o ladění proto bylo zamítnuto. Omlouváme se za přerušení."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Povolit"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Zamítnout"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Povolit omezená nastavení"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Blokované nastavení"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Z důvodu vaší bezpečnosti toto nastavení momentálně není dostupné."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Akce není během telefonního hovoru k dispozici"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Během telefonního hovoru nelze aplikacím povolit instalovat další aplikace.\n\n O tento typ akce během hovorů často žádají podvodníci. Kvůli vaší ochraně je proto blokována. Pokud vás k této akci navádí někdo, koho neznáte, může se jednat o podvod."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Akci nelze dokončit během hovoru"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Toto nastavení je z důvodu ochrany zařízení a dat zablokováno.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Podvodníci se můžou pokusit nainstalovat škodlivé aplikace tím, že vás požádají o instalaci neznámých aplikací z nového zdroje."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Podvodníci se můžou pokusit převzít nad vaším zařízením kontrolu tím, že vás požádají, abyste aplikaci povolili přístup ke službám pro usnadnění."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Aplikaci byl odepřen přístup k oprávnění <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Aplikace požádala o přístup k citlivému oprávnění, které může ohrozit vaše osobní a finanční údaje.<xliff:g id="ID_1"><br><br></xliff:g>Je možné, že aplikace bez tohoto oprávnění nebude fungovat správně. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Jak povolit přístup</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Aplikaci byla odepřena role výchozí <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-da-v33/strings.xml b/PermissionController/res/values-da-v33/strings.xml index 3e532459f..a1caec0e7 100644 --- a/PermissionController/res/values-da-v33/strings.xml +++ b/PermissionController/res/values-da-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Flere underretninger"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Lukkede underretninger"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Udvid for at se én yderligere advarsel}one{Udvid for at se # yderligere advarsel}other{Udvid for at se # yderligere advarsler}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Skjul"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Underretning. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Handlingen er udført"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Tjek indstillinger, der kan øge sikkerheden på din enhed"</string> diff --git a/PermissionController/res/values-da/strings.xml b/PermissionController/res/values-da/strings.xml index 8f7acd378..aa0261836 100644 --- a/PermissionController/res/values-da/strings.xml +++ b/PermissionController/res/values-da/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"adgang til <xliff:g id="PERM">%1$s</xliff:g> for denne app på <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Se alle tilladelser for <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Se alle apps med denne tilladelse"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Oplysninger"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Indstillinger"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Vis brug af Assistent-mikrofonen"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Ubrugte appindstillinger"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Fjern tilladelser, hvis appen ikke bruges"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Åbning af links"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Standard til arbejde"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Standard for privat område"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimeret til enheden"</string> + <string name="default_app_others" msgid="7793029848126079876">"Andre"</string> <string name="default_app_none" msgid="9084592086808194457">"Ingen"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Systemstandard)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Ingen apps"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> vil gerne uploade fejretningsoplysninger."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Vil du dele fejlretningsdata?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Systemet har registreret et problem."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> anmoder om at uploade en fejlrapport fra denne enhed, som stammer fra <xliff:g id="DATE">%2$s</xliff:g> kl. <xliff:g id="TIME">%3$s</xliff:g>. Fejlrapporter indeholder personlige oplysninger om din enhed, eller som er registreret af apps, f.eks. brugernavne, lokationsdata, enheds-id\'er og netværksoplysninger. Oplysningerne i fejlrapporterne må kun deles med personer og apps, du har tillid til. Vil du give <xliff:g id="APP_NAME_1">%4$s</xliff:g> tilladelse til at uploade en fejlrapport?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> anmoder om at uploade en fejlrapport fra denne enhed, som stammer fra <xliff:g id="DATE">%2$s</xliff:g> kl. <xliff:g id="TIME">%3$s</xliff:g>. Fejlrapporter indeholder personlige oplysninger om din enhed, eller som er registreret af apps, f.eks. brugernavne, lokationsdata, enheds-id\'er og netværksoplysninger. Fejlrapporter bør kun deles med personer og apps, du har tillid til.\n\nVil du give <xliff:g id="APP_NAME_1">%4$s</xliff:g> tilladelse til at uploade en fejlrapport?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Der opstod en fejl i behandlingen af fejlrapporten for <xliff:g id="APP_NAME">%1$s</xliff:g>. Det er derfor ikke muligt at dele detaljerede fejlretningsdata. Vi beklager ulejligheden."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Tillad"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Afvis"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Tillad begrænsede indstillinger"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Begrænset indstilling"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Af hensyn til din sikkerhed er denne indstilling i øjeblikket ikke tilgængelig."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Handlingen er utilgængelig under et telefonopkald"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Det er ikke tilladt at give apps tilladelse til at installere andre apps under et telefonopkald.\n\n Svindlere opfordrer ofte til denne type handling under telefonopkald, så den er blokeret for at beskytte dig. Hvis du bliver bedt om at foretage denne handling af en person, du ikke kender, kan det være svindel."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Handlingen kan ikke udføres under opkald"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Denne indstilling er blokeret for at beskytte din enhed og dine data.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Svindlere kan forsøge at installere skadelige apps ved at bede dig om at installere ukendte apps fra en ny kilde."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Svindlere kan forsøge at tage kontrollen over din enhed ved at bede dig om at give en app adgang til hjælpefunktioner."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Appen blev nægtet adgang til <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Appen anmodede om adgang til en følsom tilladelse, der kan kompromittere dine personlige eller økonomiske oplysninger.<xliff:g id="ID_1"><br><br></xliff:g>Appen fungerer muligvis ikke korrekt uden denne begrænsede tilladelse. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Se, hvordan du giver tilladelse</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Appen blev nægtet adgang til at være <xliff:g id="ROLE_NAME">%1$s</xliff:g> som standard"</string> diff --git a/PermissionController/res/values-de-v33/strings.xml b/PermissionController/res/values-de-v33/strings.xml index d82bd4619..d67d9c20a 100644 --- a/PermissionController/res/values-de-v33/strings.xml +++ b/PermissionController/res/values-de-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Weitere Benachrichtigungen"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Ausgeblendete Benachrichtigungen"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Maximieren und eine weitere Warnung anzeigen}other{Maximieren und # weitere Warnungen anzeigen}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Minimieren"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Warnung. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Aktion abgeschlossen"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Einstellungen aufrufen, mit denen sich der Schutz meines Geräts verbessern lässt"</string> diff --git a/PermissionController/res/values-de/strings.xml b/PermissionController/res/values-de/strings.xml index b34776c76..69bcee8b4 100644 --- a/PermissionController/res/values-de/strings.xml +++ b/PermissionController/res/values-de/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g>-Zugriff für diese App auf dem <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Alle Berechtigungen der App „<xliff:g id="APP">%1$s</xliff:g>“ anzeigen"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Alle Apps mit dieser Berechtigung anzeigen"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informationen"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Einstellungen"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Nutzung der Berechtigung \"Mikrofon\" für Assistant anzeigen"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Nicht verwendete App-Einstellungen"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Berechtigungen entfernen, wenn die App nicht verwendet wird"</string> @@ -362,7 +364,7 @@ <string name="role_browser_request_title" msgid="2895200507835937192">"<xliff:g id="APP_NAME">%1$s</xliff:g> als Standard-Browser-App festlegen?"</string> <string name="role_browser_request_description" msgid="5888803407905985941">"Keine Berechtigungen erforderlich"</string> <string name="role_dialer_label" msgid="1100224146343237968">"Standard-App zum Telefonieren"</string> - <string name="role_dialer_short_label" msgid="7186888549465352489">"Telefon"</string> + <string name="role_dialer_short_label" msgid="7186888549465352489">"Telefon App"</string> <string name="role_dialer_description" msgid="8768708633696539612">"Apps, mit denen du dein Gerät zum Telefonieren benutzen kannst"</string> <string name="role_dialer_request_title" msgid="5959618560705912058">"<xliff:g id="APP_NAME">%1$s</xliff:g> als Standard-App zum Telefonieren festlegen?"</string> <string name="role_dialer_request_description" msgid="6288839625724909320">"Diese App erhält Zugriff auf Folgendes: Kamera, Kontakte, Mikrofon, Telefon und SMS"</string> @@ -438,8 +440,10 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Links öffnen"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Standard-Apps für Arbeit"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Standard-Apps für das vertrauliche Profil"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Für dein Gerät optimiert"</string> + <string name="default_app_others" msgid="7793029848126079876">"Sonstige"</string> <string name="default_app_none" msgid="9084592086808194457">"Keine"</string> - <string name="default_app_system_default" msgid="6218386768175513760">"(System-Standardeinstellung)"</string> + <string name="default_app_system_default" msgid="6218386768175513760">"(System-Standardeinstellung)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Keine Apps"</string> <string name="default_payment_app_other_nfc_services" msgid="5957633798695758917">"Andere NFC‑Dienste"</string> <string name="car_default_app_selected" msgid="5416420830430644174">"Ausgewählt"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> möchte Informationen zur Fehlerbehebung hochladen."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Daten zur Fehlerbehebung teilen?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Das System hat ein Problem erkannt."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> möchte einen Fehlerbericht von diesem Gerät hochladen, der am <xliff:g id="DATE">%2$s</xliff:g> um <xliff:g id="TIME">%3$s</xliff:g> erstellt wurde. Fehlerberichte enthalten Informationen zu deinem Gerät, die du persönlich eingegeben hast oder die von Apps aufgezeichnet werden, z. B. Nutzernamen, Standortdaten, Geräte-IDs und Netzwerkinformationen. Teile Fehlerberichte nur mit Personen und Apps, denen du vertraust. Darf <xliff:g id="APP_NAME_1">%4$s</xliff:g> einen Fehlerbericht hochladen?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> möchte einen Fehlerbericht von diesem Gerät hochladen, der am <xliff:g id="DATE">%2$s</xliff:g> um <xliff:g id="TIME">%3$s</xliff:g> erstellt wurde. Fehlerberichte enthalten Informationen zu deinem Gerät, die du persönlich eingegeben hast oder die von Apps aufgezeichnet werden, z. B. Nutzernamen, Standortdaten, Geräte-IDs und Netzwerkinformationen. Teile Fehlerberichte nur mit Personen und Apps, denen du vertraust.\n\nDarf <xliff:g id="APP_NAME_1">%4$s</xliff:g> einen Fehlerbericht hochladen?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Bei der Verarbeitung des Fehlerberichts für <xliff:g id="APP_NAME">%1$s</xliff:g> ist ein Fehler aufgetreten. Die detaillierten Daten zur Fehlerbehebung wurden daher nicht geteilt. Wir entschuldigen uns für die Störung."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Zulassen"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Ablehnen"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Eingeschränkte Einstellungen zulassen"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Eingeschränkte Einstellung"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Aus Sicherheitsgründen ist diese Einstellung derzeit nicht verfügbar."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Aktion während Anrufen nicht verfügbar"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Während eines Anrufs kannst du Apps nicht erlauben, andere Apps zu installieren.\n\n Betrüger versuchen oft, dich am Telefon genau dazu zu bringen, daher haben wir diese Art von Aktion zu deinem Schutz blockiert. Drängt dich jemand Unbekanntes zu einer solchen Installation, könnte es sich um Betrug handeln."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Aktion während eines Anrufs nicht möglich"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Diese Einstellung ist zum Schutz deines Geräts und deiner Daten blockiert.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Betrüger könnten versuchen, schädliche Apps zu installieren, indem sie dich bitten, unbekannte Apps aus einer neuen Quelle zu installieren."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Betrüger könnten versuchen, die Kontrolle über dein Gerät zu übernehmen, indem sie dich bitten, einer App Zugriff auf Bedienungshilfen zu gewähren."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"App wurde Zugriff auf „<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>“ verweigert"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Die App hat Zugriff auf eine vertrauliche Berechtigung angefordert. Wenn du diesen zulässt, sind deine privaten Daten und Finanzdaten eventuell gefährdet.<xliff:g id="ID_1"><br><br></xliff:g>Die App funktioniert ohne diese eingeschränkte Berechtigung aber möglicherweise nicht richtig. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Informationen dazu, wie du den Zugriff erlaubst</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"App wurde der Zugriff verweigert, die standardmäßige <xliff:g id="ROLE_NAME">%1$s</xliff:g> zu sein"</string> diff --git a/PermissionController/res/values-el-v33/strings.xml b/PermissionController/res/values-el-v33/strings.xml index 4cefe7f04..33dff873a 100644 --- a/PermissionController/res/values-el-v33/strings.xml +++ b/PermissionController/res/values-el-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Περισσότερες ειδοποιήσεις"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Ειδοποιήσεις που παραβλέφθηκαν"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Αναπτύξτε και δείτε μία ακόμη ειδοποίηση}other{Αναπτύξτε και δείτε # ακόμη ειδοποιήσεις}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Σύμπτυξη"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Ειδοποίηση. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Η ενέργεια ολοκληρώθηκε"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Ελέγξτε ρυθμίσεις που μπορούν να προσθέσουν προστασία στη συσκευή σας"</string> diff --git a/PermissionController/res/values-el/strings.xml b/PermissionController/res/values-el/strings.xml index ed69ea315..b066c75ca 100644 --- a/PermissionController/res/values-el/strings.xml +++ b/PermissionController/res/values-el/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Πρόσβαση στην άδεια <xliff:g id="PERM">%1$s</xliff:g> για αυτή την εφαρμογή στη συσκευή <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Εμφάνιση όλων των αδειών της εφαρμογής <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Εμφάνιση όλων των εφαρμογών με αυτή την άδεια"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Πληροφορίες"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Ρυθμίσεις"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Εμφάνιση χρήσης μικροφώνου βοηθού"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Ρυθμίσεις μη χρησιμοποιούμενων εφαρμογών"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Καταργήστε τις άδειες, εάν η εφαρμογή δεν χρησιμοποιείται."</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Άνοιγμα συνδέσμων"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Προεπιλογή για εργασία"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Προεπιλογή για ιδιωτικό χώρο"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Βελτιστοποιημένες για τη συσκευή"</string> + <string name="default_app_others" msgid="7793029848126079876">"Άλλες"</string> <string name="default_app_none" msgid="9084592086808194457">"Καμία"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Προεπιλογή συστήματος)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Δεν υπάρχουν εφαρμογές"</string> @@ -451,13 +455,13 @@ <string name="home_missing_work_profile_support" msgid="1756855847669387977">"Δεν υποστηρίζει προφίλ εργασίας"</string> <string name="encryption_unaware_confirmation_message" msgid="8274491794636402484">"Σημείωση: Εάν έχετε ορίσει ένα κλείδωμα οθόνης και επανεκκινήσετε τη συσκευή, η εκκίνηση αυτής της εφαρμογής δεν θα είναι δυνατή έως ότου ξεκλειδώσετε τη συσκευή σας."</string> <string name="assistant_confirmation_message" msgid="7476540402884416212">"Ο βοηθός θα μπορεί να διαβάσει πληροφορίες σχετικά με τις εφαρμογές που χρησιμοποιούνται στο σύστημά σας, συμπεριλαμβανομένων πληροφοριών που είναι ορατές στην οθόνη σας ή προσβάσιμες εντός των εφαρμογών."</string> - <string name="incident_report_channel_name" msgid="3144954065936288440">"Κοινοποίηση δεδομένων εντοπισμού σφαλμάτων"</string> - <string name="incident_report_notification_title" msgid="4635984625656519773">"Κοινοποίηση λεπτομερ. δεδομ. εντοπισμού σφαλμάτων;"</string> - <string name="incident_report_notification_text" msgid="3376480583513587923">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> θέλει να ανεβάσει πληροφορίες εντοπισμού σφαλμάτων."</string> - <string name="incident_report_dialog_title" msgid="669104389325204095">"Κοινοπ. δεδομ. εντοπισμού και διόρθωσης σφαλμάτων;"</string> + <string name="incident_report_channel_name" msgid="3144954065936288440">"Κοινοποίηση δεδομένων αποσφαλμάτωσης"</string> + <string name="incident_report_notification_title" msgid="4635984625656519773">"Κοινοποίηση λεπτομερ. δεδομ. αποσφαλμάτωσης;"</string> + <string name="incident_report_notification_text" msgid="3376480583513587923">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> θέλει να ανεβάσει πληροφορίες αποσφαλμάτωσης."</string> + <string name="incident_report_dialog_title" msgid="669104389325204095">"Κοινοπ. δεδομ. αποσφαλμάτωσης;"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Το σύστημα εντόπισε ένα πρόβλημα."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"Η εφαρμογή <xliff:g id="APP_NAME_0">%1$s</xliff:g> ζητάει να ανεβάσει μια αναφορά σφαλμάτων από αυτήν τη συσκευή η οποία λήφθηκε στις <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g>. Οι αναφορές σφαλμάτων περιλαμβάνουν προσωπικά στοιχεία σχετικά με τη συσκευή σας ή στοιχεία που έχουν καταγράψει οι εφαρμογές σας, για παράδειγμα, ονόματα χρηστών, δεδομένα τοποθεσίας, αναγνωριστικά συσκευών και πληροφορίες δικτύου. Να κοινοποιείτε αναφορές σφαλμάτων μόνο σε άτομα και εφαρμογές που θεωρείτε ότι μπορείτε να εμπιστευτείτε με αυτές τις πληροφορίες. Επιτρέπετε στο <xliff:g id="APP_NAME_1">%4$s</xliff:g> να ανεβάσει μια αναφορά σφαλμάτων;"</string> - <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Παρουσιάστηκε ένα σφάλμα κατά την επεξεργασία της αναφοράς σφάλματος για την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>. Γι\' αυτόν τον λόγο, η κοινοποίηση λεπτομερών δεδομένων εντοπισμού και διόρθωσης σφαλμάτων απορρίφθηκε. Λυπούμαστε για τη διακοπή."</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"Η εφαρμογή <xliff:g id="APP_NAME_0">%1$s</xliff:g> ζητάει να ανεβάσει μια αναφορά σφάλματος από αυτή τη συσκευή η οποία λήφθηκε στις <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g>. Οι αναφορές σφάλματος περιλαμβάνουν προσωπικά στοιχεία σχετικά με τη συσκευή σας ή στοιχεία που έχουν καταγράψει οι εφαρμογές, για παράδειγμα, ονόματα χρηστών, δεδομένα τοποθεσίας, αναγνωριστικά συσκευών και πληροφορίες δικτύου. Να κοινοποιείτε τις αναφορές σφάλματος μόνο σε άτομα και εφαρμογές στα οποία θεωρείτε ότι μπορείτε να εμπιστεύεστε αυτές τις πληροφορίες.\n\nΝα επιτραπεί στην εφαρμογή <xliff:g id="APP_NAME_1">%4$s</xliff:g> να ανεβάσει μια αναφορά σφάλματος;"</string> + <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Παρουσιάστηκε ένα σφάλμα κατά την επεξεργασία της αναφοράς σφάλματος για την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>. Γι\' αυτόν τον λόγο, η κοινοποίηση λεπτομερών δεδομένων αποσφαλμάτωσης απορρίφθηκε. Λυπούμαστε για τη διακοπή."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Να επιτρέπεται"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Να μην επιτρέπεται"</string> <string name="adjust_user_sensitive_title" msgid="4196724451314280527">"Σύνθετες ρυθμίσεις"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Επιτρέπονται περιορισμένες ρυθμίσεις"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Περιορισμένη ρύθμιση"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Για την ασφάλειά σας, αυτή η ρύθμιση δεν είναι διαθέσιμη αυτή τη στιγμή."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Δεν διατίθεται κατά τη διάρκεια τηλεφωνικής κλήσης"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Κατά τη διάρκεια μιας τηλεφωνικής κλήσης, δεν επιτρέπεται η παραχώρηση άδειας σε μια εφαρμογή για εγκατάσταση άλλων εφαρμογών.\n\n Οι απατεώνες συχνά ζητούν να κάνετε τέτοιες ενέργειες κατά τη διάρκεια τηλεφωνικών κλήσεων, επομένως η ενέργεια έχει αποκλειστεί για την προστασία σας. Αν κάποιος που δεν γνωρίζετε σας ζητάει να πραγματοποιήσετε αυτή την ενέργεια, ενδέχεται να πρόκειται για απάτη."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Αδύνατη ολοκλήρωση της ενέργειας κατά την κλήση"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Αυτή η ρύθμιση έχει αποκλειστεί για την προστασία της συσκευής και των δεδομένων σας.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Οι απατεώνες μπορεί να προσπαθήσουν να εγκαταστήσουν επιβλαβείς εφαρμογές, ζητώντας σας να εγκαταστήσετε άγνωστες εφαρμογές από μια νέα πηγή."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Οι απατεώνες μπορεί να προσπαθήσουν να αποκτήσουν τον έλεγχο της συσκευής σας, ζητώντας σας να επιτρέψετε την πρόσβαση σε λειτουργίες προσβασιμότητας για μια εφαρμογή."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Απορρίφθηκε η πρόσβαση της εφαρμογής στην άδεια <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Η εφαρμογή ζήτησε πρόσβαση σε μια άδεια πρόσβασης σε ευαίσθητες πληροφορίες, γεγονός που μπορεί να θέσει σε κίνδυνο τα προσωπικά και οικονομικά στοιχεία σας.<xliff:g id="ID_1"><br><br></xliff:g>Είναι πιθανό η εφαρμογή να μην λειτουργεί σωστά χωρίς αυτή την περιορισμένη άδεια. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Μάθετε πώς μπορείτε να επιτρέψετε την πρόσβαση</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Δεν επιτράπηκε στην εφαρμογή να οριστεί ως η προεπιλεγμένη <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-en-rAU-v33/strings.xml b/PermissionController/res/values-en-rAU-v33/strings.xml index 498c090f3..bf2e7692a 100644 --- a/PermissionController/res/values-en-rAU-v33/strings.xml +++ b/PermissionController/res/values-en-rAU-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"More alerts"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Dismissed alerts"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Expand and see one more alert}other{Expand and see # more alerts}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Collapse"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alert. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Action complete"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Check settings that can add protection to your device"</string> diff --git a/PermissionController/res/values-en-rAU/strings.xml b/PermissionController/res/values-en-rAU/strings.xml index d5a94de2f..0ec4ed4f2 100644 --- a/PermissionController/res/values-en-rAU/strings.xml +++ b/PermissionController/res/values-en-rAU/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g> access for this app on <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"See all <xliff:g id="APP">%1$s</xliff:g> permissions"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"See all apps with this permission"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Information"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Settings"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Show Assistant microphone usage"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Unused app settings"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Remove permissions if app isn’t used"</string> @@ -355,7 +357,7 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"These apps can view your screen, actions and inputs, perform actions, and control the display."</string> <string name="role_assistant_label" msgid="4727586018198208128">"Default digital assistant app"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"Digital assistant app"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"Assist apps can help you, based on information from the screen that you’re viewing. Some apps support both Launcher and voice input services to give you integrated assistance."</string> + <string name="role_assistant_description" msgid="6622458130459922952">"Assist apps can help you based on information from the screen that you’re viewing. Some apps support both Launcher and voice input services to give you integrated assistance."</string> <string name="role_browser_label" msgid="2877796144554070207">"Default browser app"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"Browser app"</string> <string name="role_browser_description" msgid="3465253637499842671">"Apps that give you access to the Internet and display links that you tap"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Opening links"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Default for work"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Default for private space"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimised for device"</string> + <string name="default_app_others" msgid="7793029848126079876">"Others"</string> <string name="default_app_none" msgid="9084592086808194457">"None"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(System default)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"No apps"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> would like to upload debugging information."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Share debugging data?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"The system has detected a problem."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> would like to upload a bug report from this device taken on <xliff:g id="DATE">%2$s</xliff:g> at <xliff:g id="TIME">%3$s</xliff:g>. Bug reports include personal information about your device or data logged by apps, such as user names, location data, device identifiers and network information. Only share bug reports with people and apps that you trust with this information. Allow <xliff:g id="APP_NAME_1">%4$s</xliff:g> to upload a bug report?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> is requesting to upload a bug report from this device taken on <xliff:g id="DATE">%2$s</xliff:g> at <xliff:g id="TIME">%3$s</xliff:g>. Bug reports include personal information about your device or logged by apps, for example, user names, location data, device identifiers and network information. Only share bug reports with people and apps that you trust with this information.\n\nAllow <xliff:g id="APP_NAME_1">%4$s</xliff:g> to upload a bug report?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"There was an error processing the bug report for <xliff:g id="APP_NAME">%1$s</xliff:g>. So sharing the detailed debugging data has been denied. Sorry for the interruption."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Allow"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Deny"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Allow restricted settings"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Restricted setting"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"For your security, this setting is currently unavailable."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Action not available while on a phone call"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Allowing apps to install other apps is not allowed during a phone call.\n\n Scammers often request this type of action during phone call conversations, so it\'s blocked to protect you. If you are being guided to take this action by someone whom you don\'t know, it might be a scam."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Can\'t complete action during call"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"This setting is blocked to protect your device and data.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Scammers may try to install harmful apps by asking you to install unknown apps from a new source."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Scammers may try to take control of your device by asking you to allow accessibility access for an app."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"App was denied access to <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"The app requested access to a sensitive permission which can put your personal and financial info at risk.<xliff:g id="ID_1"><br><br></xliff:g>It\'s possible that the app won\'t work properly without this restricted permission. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Learn how to allow access</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"App was denied access to be default <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-en-rCA-v33/strings.xml b/PermissionController/res/values-en-rCA-v33/strings.xml index 84fda13e2..8fbcf7e8c 100644 --- a/PermissionController/res/values-en-rCA-v33/strings.xml +++ b/PermissionController/res/values-en-rCA-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"More alerts"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Dismissed alerts"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Expand and see one more alert}other{Expand and see # more alerts}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Collapse"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alert. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Action complete"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Check settings that can add protection to your device"</string> diff --git a/PermissionController/res/values-en-rCA/strings.xml b/PermissionController/res/values-en-rCA/strings.xml index d39bcf96a..c6f8464a3 100644 --- a/PermissionController/res/values-en-rCA/strings.xml +++ b/PermissionController/res/values-en-rCA/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g> access for this app on <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"See all <xliff:g id="APP">%1$s</xliff:g> permissions"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"See all apps with this permission"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Information"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Settings"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Show assistant microphone usage"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Unused app settings"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Remove permissions if app isn’t used"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Opening links"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Default for work"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Default for private space"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimized for device"</string> + <string name="default_app_others" msgid="7793029848126079876">"Others"</string> <string name="default_app_none" msgid="9084592086808194457">"None"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(System default)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"No apps"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> would like to upload debugging information."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Share debugging data?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"The system has detected a problem."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> is requesting to upload a bug report from this device taken on <xliff:g id="DATE">%2$s</xliff:g> at <xliff:g id="TIME">%3$s</xliff:g>. Bug reports include personal information about your device or logged by apps, for example, user names, location data, device identifiers, and network information. Only share bug reports with people and apps you trust with this information. Allow <xliff:g id="APP_NAME_1">%4$s</xliff:g> to upload a bug report?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> is requesting to upload a bug report from this device taken on <xliff:g id="DATE">%2$s</xliff:g> at <xliff:g id="TIME">%3$s</xliff:g>. Bug reports include personal information about your device or logged by apps, for example, user names, location data, device identifiers, and network information. Only share bug reports with people and apps you trust with this information.\n\nAllow <xliff:g id="APP_NAME_1">%4$s</xliff:g> to upload a bug report?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"There was an error processing the bug report for <xliff:g id="APP_NAME">%1$s</xliff:g>. So sharing the detailed debugging data has been denied. Sorry for the interruption."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Allow"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Deny"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Allow restricted settings"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Restricted setting"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"For your security, this setting is currently unavailable."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Action not available while on a phone call"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Allowing apps to install other apps is not allowed during a phone call.\n\n Scammers often request this type of action during phone call conversations, so it’s blocked to protect you. If you are being guided to take this action by someone you don’t know, it might be a scam."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Can’t complete action during call"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"This setting is blocked to protect your device and data.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Scammers may try to install harmful apps by asking you to install unknown apps from a new source."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Scammers may try to take control of your device by asking you to allow accessibility access for an app."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"App was denied access to <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"The app requested access to a sensitive permission which can put your personal and financial info at risk.<xliff:g id="ID_1"><br><br></xliff:g>It\'s possible the app won\'t work properly without this restricted permission. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Learn how to allow access</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"App was denied access to be default <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-en-rGB-v33/strings.xml b/PermissionController/res/values-en-rGB-v33/strings.xml index 498c090f3..bf2e7692a 100644 --- a/PermissionController/res/values-en-rGB-v33/strings.xml +++ b/PermissionController/res/values-en-rGB-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"More alerts"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Dismissed alerts"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Expand and see one more alert}other{Expand and see # more alerts}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Collapse"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alert. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Action complete"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Check settings that can add protection to your device"</string> diff --git a/PermissionController/res/values-en-rGB/strings.xml b/PermissionController/res/values-en-rGB/strings.xml index f9a015705..44a195ef9 100644 --- a/PermissionController/res/values-en-rGB/strings.xml +++ b/PermissionController/res/values-en-rGB/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g> access for this app on <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"See all <xliff:g id="APP">%1$s</xliff:g> permissions"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"See all apps with this permission"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Information"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Settings"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Show Assistant microphone usage"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Unused app settings"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Remove permissions if app isn’t used"</string> @@ -355,7 +357,7 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"These apps can view your screen, actions and inputs, perform actions, and control the display."</string> <string name="role_assistant_label" msgid="4727586018198208128">"Default digital assistant app"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"Digital assistant app"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"Assist apps can help you, based on information from the screen that you’re viewing. Some apps support both Launcher and voice input services to give you integrated assistance."</string> + <string name="role_assistant_description" msgid="6622458130459922952">"Assist apps can help you based on information from the screen that you’re viewing. Some apps support both Launcher and voice input services to give you integrated assistance."</string> <string name="role_browser_label" msgid="2877796144554070207">"Default browser app"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"Browser app"</string> <string name="role_browser_description" msgid="3465253637499842671">"Apps that give you access to the Internet and display links that you tap"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Opening links"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Default for work"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Default for private space"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimised for device"</string> + <string name="default_app_others" msgid="7793029848126079876">"Others"</string> <string name="default_app_none" msgid="9084592086808194457">"None"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(System default)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"No apps"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> would like to upload debugging information."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Share debugging data?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"The system has detected a problem."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> would like to upload a bug report from this device taken on <xliff:g id="DATE">%2$s</xliff:g> at <xliff:g id="TIME">%3$s</xliff:g>. Bug reports include personal information about your device or data logged by apps, such as user names, location data, device identifiers and network information. Only share bug reports with people and apps that you trust with this information. Allow <xliff:g id="APP_NAME_1">%4$s</xliff:g> to upload a bug report?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> is requesting to upload a bug report from this device taken on <xliff:g id="DATE">%2$s</xliff:g> at <xliff:g id="TIME">%3$s</xliff:g>. Bug reports include personal information about your device or logged by apps, for example, user names, location data, device identifiers and network information. Only share bug reports with people and apps that you trust with this information.\n\nAllow <xliff:g id="APP_NAME_1">%4$s</xliff:g> to upload a bug report?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"There was an error processing the bug report for <xliff:g id="APP_NAME">%1$s</xliff:g>. So sharing the detailed debugging data has been denied. Sorry for the interruption."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Allow"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Deny"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Allow restricted settings"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Restricted setting"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"For your security, this setting is currently unavailable."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Action not available while on a phone call"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Allowing apps to install other apps is not allowed during a phone call.\n\n Scammers often request this type of action during phone call conversations, so it\'s blocked to protect you. If you are being guided to take this action by someone whom you don\'t know, it might be a scam."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Can\'t complete action during call"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"This setting is blocked to protect your device and data.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Scammers may try to install harmful apps by asking you to install unknown apps from a new source."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Scammers may try to take control of your device by asking you to allow accessibility access for an app."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"App was denied access to <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"The app requested access to a sensitive permission which can put your personal and financial info at risk.<xliff:g id="ID_1"><br><br></xliff:g>It\'s possible that the app won\'t work properly without this restricted permission. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Learn how to allow access</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"App was denied access to be default <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-en-rIN-v33/strings.xml b/PermissionController/res/values-en-rIN-v33/strings.xml index 498c090f3..bf2e7692a 100644 --- a/PermissionController/res/values-en-rIN-v33/strings.xml +++ b/PermissionController/res/values-en-rIN-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"More alerts"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Dismissed alerts"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Expand and see one more alert}other{Expand and see # more alerts}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Collapse"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alert. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Action complete"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Check settings that can add protection to your device"</string> diff --git a/PermissionController/res/values-en-rIN/strings.xml b/PermissionController/res/values-en-rIN/strings.xml index f9a015705..44a195ef9 100644 --- a/PermissionController/res/values-en-rIN/strings.xml +++ b/PermissionController/res/values-en-rIN/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g> access for this app on <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"See all <xliff:g id="APP">%1$s</xliff:g> permissions"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"See all apps with this permission"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Information"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Settings"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Show Assistant microphone usage"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Unused app settings"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Remove permissions if app isn’t used"</string> @@ -355,7 +357,7 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"These apps can view your screen, actions and inputs, perform actions, and control the display."</string> <string name="role_assistant_label" msgid="4727586018198208128">"Default digital assistant app"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"Digital assistant app"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"Assist apps can help you, based on information from the screen that you’re viewing. Some apps support both Launcher and voice input services to give you integrated assistance."</string> + <string name="role_assistant_description" msgid="6622458130459922952">"Assist apps can help you based on information from the screen that you’re viewing. Some apps support both Launcher and voice input services to give you integrated assistance."</string> <string name="role_browser_label" msgid="2877796144554070207">"Default browser app"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"Browser app"</string> <string name="role_browser_description" msgid="3465253637499842671">"Apps that give you access to the Internet and display links that you tap"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Opening links"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Default for work"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Default for private space"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimised for device"</string> + <string name="default_app_others" msgid="7793029848126079876">"Others"</string> <string name="default_app_none" msgid="9084592086808194457">"None"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(System default)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"No apps"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> would like to upload debugging information."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Share debugging data?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"The system has detected a problem."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> would like to upload a bug report from this device taken on <xliff:g id="DATE">%2$s</xliff:g> at <xliff:g id="TIME">%3$s</xliff:g>. Bug reports include personal information about your device or data logged by apps, such as user names, location data, device identifiers and network information. Only share bug reports with people and apps that you trust with this information. Allow <xliff:g id="APP_NAME_1">%4$s</xliff:g> to upload a bug report?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> is requesting to upload a bug report from this device taken on <xliff:g id="DATE">%2$s</xliff:g> at <xliff:g id="TIME">%3$s</xliff:g>. Bug reports include personal information about your device or logged by apps, for example, user names, location data, device identifiers and network information. Only share bug reports with people and apps that you trust with this information.\n\nAllow <xliff:g id="APP_NAME_1">%4$s</xliff:g> to upload a bug report?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"There was an error processing the bug report for <xliff:g id="APP_NAME">%1$s</xliff:g>. So sharing the detailed debugging data has been denied. Sorry for the interruption."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Allow"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Deny"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Allow restricted settings"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Restricted setting"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"For your security, this setting is currently unavailable."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Action not available while on a phone call"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Allowing apps to install other apps is not allowed during a phone call.\n\n Scammers often request this type of action during phone call conversations, so it\'s blocked to protect you. If you are being guided to take this action by someone whom you don\'t know, it might be a scam."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Can\'t complete action during call"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"This setting is blocked to protect your device and data.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Scammers may try to install harmful apps by asking you to install unknown apps from a new source."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Scammers may try to take control of your device by asking you to allow accessibility access for an app."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"App was denied access to <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"The app requested access to a sensitive permission which can put your personal and financial info at risk.<xliff:g id="ID_1"><br><br></xliff:g>It\'s possible that the app won\'t work properly without this restricted permission. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Learn how to allow access</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"App was denied access to be default <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-es-rUS-v33/strings.xml b/PermissionController/res/values-es-rUS-v33/strings.xml index 0205fca80..52b8b9497 100644 --- a/PermissionController/res/values-es-rUS-v33/strings.xml +++ b/PermissionController/res/values-es-rUS-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Más alertas"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Alertas descartadas"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Expande y ve una alerta más}many{Expande y ve # de alertas más}other{Expande y ve # alertas más}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Contraer"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alerta: <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Se completó la acción"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Revisa los parámetros de configuración que pueden proteger aún más tu dispositivo"</string> diff --git a/PermissionController/res/values-es-rUS/strings.xml b/PermissionController/res/values-es-rUS/strings.xml index 4041247fe..94179a6e7 100644 --- a/PermissionController/res/values-es-rUS/strings.xml +++ b/PermissionController/res/values-es-rUS/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Acceso a <xliff:g id="PERM">%1$s</xliff:g> para esta app en <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Ver todos los permisos de <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Ver todas las apps que tienen este permiso"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Información"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Configuración"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Mostrar el uso del micrófono del Asistente"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Configuración de apps sin usar"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Quitar los permisos si la app no se usa"</string> @@ -368,7 +370,7 @@ <string name="role_dialer_request_description" msgid="6288839625724909320">"Esta app obtendrá acceso a la cámara, los contactos, micrófono, teléfono y SMS"</string> <string name="role_dialer_search_keywords" msgid="3324448983559188087">"marcador"</string> <string name="role_sms_label" msgid="8456999857547686640">"App de SMS predeterminada"</string> - <string name="role_sms_short_label" msgid="4371444488034692243">"app de SMS"</string> + <string name="role_sms_short_label" msgid="4371444488034692243">"App de SMS"</string> <string name="role_sms_description" msgid="3424020199148153513">"Apps que te permiten usar tu número de teléfono para enviar y recibir mensajes de texto cortos, fotos, videos y mucho más"</string> <string name="role_sms_request_title" msgid="7953552109601185602">"¿Quieres establecer <xliff:g id="APP_NAME">%1$s</xliff:g> como app de SMS predeterminada?"</string> <string name="role_sms_request_description" msgid="2691004766132144886">"Se le otorgará acceso a esta app a tu cámara, contactos, archivos y contenido multimedia, micrófono, teléfono y SMS"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Abrir vínculos"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Predeterminadas de trabajo"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Configuración predeterminada del espacio privado"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimizadas para el dispositivo"</string> + <string name="default_app_others" msgid="7793029848126079876">"Otras"</string> <string name="default_app_none" msgid="9084592086808194457">"Ninguna"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Predeterminada del sistema)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Sin apps"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere subir información de depuración."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"¿Deseas compartir datos de depuración?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"El sistema detectó un problema."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> solicita subir un informe de errores de este dispositivo generado el <xliff:g id="DATE">%2$s</xliff:g> a las <xliff:g id="TIME">%3$s</xliff:g>. Los informes de errores pueden incluir información personal sobre tu dispositivo o registrada por apps, como nombres de usuario, datos de ubicación, identificadores del dispositivo y datos de red. Solo debes compartir los informes de errores con personas y apps de confianza. ¿Permitir que <xliff:g id="APP_NAME_1">%4$s</xliff:g> suba un informe de errores?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> solicita subir un informe de errores de este dispositivo generado el <xliff:g id="DATE">%2$s</xliff:g> a la(s) <xliff:g id="TIME">%3$s</xliff:g>. Los informes de errores pueden incluir información personal sobre tu dispositivo o registrada por apps, como nombres de usuario, datos de ubicación, identificadores del dispositivo y datos de red. Solo debes compartir los informes de errores con personas y apps de confianza.\n\n¿Quieres permitir que <xliff:g id="APP_NAME_1">%4$s</xliff:g> suba un informe de errores?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Se produjo un error al procesar el informe de errores para <xliff:g id="APP_NAME">%1$s</xliff:g>. Por lo tanto, no es posible compartir los datos detallados de depuración. Lamentamos la interrupción."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Permitir"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Rechazar"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Permitir configuración restringida"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Parámetro restringido"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Por seguridad, este parámetro de configuración no está disponible actualmente."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"La acción no está disponible durante una llamada telefónica"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"No se permite que las apps instalen otras apps durante una llamada telefónica.\n\n Esto se debe a que los estafadores suelen solicitar este tipo de acciones durante conversaciones telefónicas. Si alguien que no conoces te indica que realices esta acción, es posible que se trate de una estafa."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"No se puede completar la acción durante las llamadas"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Se bloqueó este parámetro de configuración para proteger tu dispositivo y tus datos.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Los estafadores pueden solicitarte que instales apps desconocidas de una fuente nueva para alojar apps dañinas en tu dispositivo."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Los estafadores pueden pedirte acceso a la configuración de accesibilidad de una app para tomar el control de tu dispositivo."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"A la app se le negó el acceso a <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"La app solicitó acceso a un permiso sensible, lo que puede poner en riesgo tu información financiera y personal.<xliff:g id="ID_1"><br><br></xliff:g>Es posible que la app no funcione como corresponde sin este permiso restringido. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Descubre cómo permitir el acceso</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"A la app se le negó el acceso para usarse como <xliff:g id="ROLE_NAME">%1$s</xliff:g> de forma predeterminada"</string> diff --git a/PermissionController/res/values-es-v33/strings.xml b/PermissionController/res/values-es-v33/strings.xml index 0104103fe..fec5ccaee 100644 --- a/PermissionController/res/values-es-v33/strings.xml +++ b/PermissionController/res/values-es-v33/strings.xml @@ -30,9 +30,10 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Más alertas"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Alertas ignoradas"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Amplía para ver una alerta más}many{Amplía para ver # alertas más}other{Amplía para ver # alertas más}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Ocultar"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alerta. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Acción completada"</string> - <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Comprueba los ajustes que pueden proteger más tu dispositivo"</string> + <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Comprueba los ajustes que pueden ofrecer una mayor protección a tu dispositivo"</string> <string name="safety_center_qs_page_landing" msgid="1717368301679228128">"Ajustes rápidos de seguridad y privacidad"</string> <string name="safety_center_qs_close_button" msgid="1352313308176244599">"Cerrar"</string> <string name="safety_center_qs_expand_action" msgid="2193190557696484169">"Desplegar y mostrar opciones"</string> diff --git a/PermissionController/res/values-es/strings.xml b/PermissionController/res/values-es/strings.xml index 6298bd83b..6ec8bb7b1 100644 --- a/PermissionController/res/values-es/strings.xml +++ b/PermissionController/res/values-es/strings.xml @@ -195,13 +195,15 @@ <string name="app_permission_button_allow_limited_access" msgid="8824410215149764113">"Permitir acceso limitado"</string> <string name="precise_image_description" msgid="6349638632303619872">"Ubicación precisa"</string> <string name="approximate_image_description" msgid="938803699637069884">"Ubicación aproximada"</string> - <string name="app_permission_location_accuracy" msgid="7166912915040018669">"Usar ubic. precisa"</string> + <string name="app_permission_location_accuracy" msgid="7166912915040018669">"Ubicación precisa"</string> <string name="app_permission_location_accuracy_subtitle" msgid="2654077606404987210">"Cuando la ubicación precisa está desactivada, las aplicaciones pueden consultar tu ubicación aproximada"</string> <string name="app_permission_title" msgid="2090897901051370711">"Permiso de <xliff:g id="PERM">%1$s</xliff:g>"</string> <string name="app_permission_header" msgid="2951363137032603806">"Acceso a <xliff:g id="PERM">%1$s</xliff:g> para esta aplicación"</string> <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Acceso de <xliff:g id="PERM">%1$s</xliff:g> a esta aplicación en <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Ver todos los permisos de <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Ver todas las aplicaciones con este permiso"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Información"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Ajustes"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Mostrar el uso del micrófono del Asistente"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Ajustes de aplicaciones sin usar"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Quitar permisos si la aplicación no se usa"</string> @@ -250,13 +252,13 @@ <string name="app_permission_most_recent_denied_summary" msgid="7659497197737708112">"Actualmente denegado / Último acceso: <xliff:g id="TIME_DATE">%1$s</xliff:g>"</string> <string name="app_permission_never_accessed_summary" msgid="401346181461975090">"No ha accedido nunca"</string> <string name="app_permission_never_accessed_denied_summary" msgid="6596000497490905146">"Denegado / Último acceso: Nunca"</string> - <string name="allowed_header" msgid="7769277978004790414">"Permitidas"</string> + <string name="allowed_header" msgid="7769277978004790414">"Con permiso"</string> <string name="allowed_always_header" msgid="6455903312589013545">"Con permiso siempre"</string> <string name="allowed_foreground_header" msgid="6845655788447833353">"Permitidas solo mientras se usan"</string> <string name="allowed_storage_scoped" msgid="5383645873719086975">"Pueden acceder solo al contenido multimedia"</string> <string name="allowed_storage_full" msgid="5356699280625693530">"Pueden gestionar todos los archivos"</string> <string name="ask_header" msgid="2633816846459944376">"Preguntar siempre"</string> - <string name="denied_header" msgid="903209608358177654">"No permitido"</string> + <string name="denied_header" msgid="903209608358177654">"Sin permiso"</string> <string name="permission_group_name_with_device_name" msgid="8798741850536024820">"<xliff:g id="PERM_GROUP_NAME">%1$s</xliff:g> en <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="storage_footer_hyperlink_text" msgid="8873343987957834810">"Ver más aplicaciones que pueden acceder a todos los archivos"</string> <string name="days" msgid="609563020985571393">"{count,plural, =1{1 día}many{# días}other{# días}}"</string> @@ -355,7 +357,7 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"Estas aplicaciones pueden ver tu pantalla, lo que haces y lo que introduces; realizar acciones; y controlar la pantalla."</string> <string name="role_assistant_label" msgid="4727586018198208128">"Aplicación de asistente digital predeterminada"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"Aplicación de asistente digital"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"Las aplicaciones de asistencia te ayudan según la información que aparezca en la pantalla. Algunas aplicaciones admiten tanto el menú de aplicaciones como los servicios de entrada de voz para ofrecerte asistencia integrada."</string> + <string name="role_assistant_description" msgid="6622458130459922952">"Las aplicaciones de asistencia te ayudan a partir de la información que aparezca en la pantalla. Algunas aplicaciones admiten tanto el menú de aplicaciones como los servicios de entrada de voz para ofrecerte asistencia integrada."</string> <string name="role_browser_label" msgid="2877796144554070207">"Aplicación de navegador predeterminada"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"Aplicación de navegador"</string> <string name="role_browser_description" msgid="3465253637499842671">"Son las aplicaciones que te permiten acceder a Internet y abren los enlaces que tocas"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Abrir enlaces"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Predeterminadas para trabajo"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Predeterminadas para el espacio privado"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimizadas para el dispositivo"</string> + <string name="default_app_others" msgid="7793029848126079876">"Otras"</string> <string name="default_app_none" msgid="9084592086808194457">"Ninguna"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Predeterminado del sistema)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"No hay aplicaciones"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> quiere subir información de depuración."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"¿Quieres compartir datos de depuración?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"El sistema ha detectado un problema."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> solicita subir el informe de errores de este dispositivo generado el <xliff:g id="DATE">%2$s</xliff:g> a las <xliff:g id="TIME">%3$s</xliff:g>. Los informes de errores incluyen información personal sobre el dispositivo o datos registrados por las aplicaciones, como nombres de usuario, datos de ubicación, identificadores del dispositivo e información de red. Comparte estos informes únicamente con personas y aplicaciones de confianza. ¿Permitir que <xliff:g id="APP_NAME_1">%4$s</xliff:g> suba un informe de errores?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> solicita subir el informe de errores de este dispositivo generado el <xliff:g id="DATE">%2$s</xliff:g> a las <xliff:g id="TIME">%3$s</xliff:g>. Los informes de errores incluyen información personal sobre el dispositivo o datos registrados por las aplicaciones, como nombres de usuario, datos de ubicación, identificadores del dispositivo e información de red. Comparte estos informes únicamente con personas y aplicaciones de confianza.\n\n¿Permitir que <xliff:g id="APP_NAME_1">%4$s</xliff:g> suba un informe de errores?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"No se ha podido procesar el informe de errores de <xliff:g id="APP_NAME">%1$s</xliff:g>, por lo que no se han podido compartir los datos de depuración detallados. Sentimos las molestias."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Permitir"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Denegar"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Permitir ajustes restringidos"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Ajuste restringido"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Por seguridad, este ajuste no está disponible actualmente."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Acción no disponible durante una llamada"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"No es posible permitir que las aplicaciones instalen otras aplicaciones durante una llamada telefónica.\n\n Los estafadores suelen solicitar este tipo de acciones durante las conversaciones telefónicas, por lo que esta acción se bloquea para protegerte. Si alguien que no conoces te indica que debes realizar esta acción, podría tratarse de una estafa."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"No se puede completar la acción durante una llamada"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Este ajuste está bloqueado para proteger tu dispositivo y tus datos.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Los estafadores pueden pedirte que instales aplicaciones de una fuente nueva para instalar aplicaciones dañinas."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Los estafadores pueden solicitarte acceso a los ajustes de accesibilidad de una aplicación para intentar tomar el control de tu dispositivo."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Se ha denegado el acceso a <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> a la aplicación"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"La aplicación ha solicitado acceso a un permiso sensible que puede poner en riesgo tu información personal y financiera.<xliff:g id="ID_1"><br><br></xliff:g>Es posible que la aplicación no funcione correctamente sin este permiso restringido. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Consulta cómo permitir el acceso</a>."</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Se ha denegado el acceso para que la aplicación sea <xliff:g id="ROLE_NAME">%1$s</xliff:g> predeterminada"</string> diff --git a/PermissionController/res/values-et-v33/strings.xml b/PermissionController/res/values-et-v33/strings.xml index e5a6edf90..56dd683ca 100644 --- a/PermissionController/res/values-et-v33/strings.xml +++ b/PermissionController/res/values-et-v33/strings.xml @@ -30,9 +30,10 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Rohkem teavitusi"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Hoiatused, millest on loobutud"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Laiendage ja vaadake veel ühte hoiatust}other{Laiendage ja vaadake veel # hoiatust}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Ahenda"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Hoiatus. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Toiming on lõpetatud"</string> - <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Kontrollige seadeid, mis võivad teie seadme kaitset tõhusamaks muuta"</string> + <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Kontrollige seadeid, mis võivad teie seadme kaitset tõhusamaks muuta."</string> <string name="safety_center_qs_page_landing" msgid="1717368301679228128">"Turvalisuse ja privaatsuse kiirseaded"</string> <string name="safety_center_qs_close_button" msgid="1352313308176244599">"Sule"</string> <string name="safety_center_qs_expand_action" msgid="2193190557696484169">"Laienda ja kuva valikud"</string> diff --git a/PermissionController/res/values-et/strings.xml b/PermissionController/res/values-et/strings.xml index a289032c0..a8f8fb6dd 100644 --- a/PermissionController/res/values-et/strings.xml +++ b/PermissionController/res/values-et/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g> juurdepääs sellele rakendusele seadmes <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Kuva rakenduse <xliff:g id="APP">%1$s</xliff:g> kõik load"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Kuva kõik selle loaga rakendused"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Teave"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Seaded"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Kuva assistendi mikrofoni kasutamine"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Kasutamata rakenduse seaded"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Eemalda load, kui rakendust ei kasutata"</string> @@ -300,7 +302,7 @@ <string name="accessibility_remove_access_button_label" msgid="44145801526711640">"Eemalda juurdepääs"</string> <string name="accessibility_show_all_apps_button_label" msgid="960067249326392280">"Kuva täieliku juurdepääsuga rakendused"</string> <string name="accessibility_remove_access_success_label" msgid="4380995302917014670">"Juurdepääs eemaldati"</string> - <string name="safety_center_notification_app_label" msgid="2457720616141926534">"Android-süsteem"</string> + <string name="safety_center_notification_app_label" msgid="2457720616141926534">"Androidi süsteem"</string> <string name="auto_revoke_after_notification_title" msgid="5417761027669887431">"Rakenduse load eemaldati privaatsuse kaitsmiseks"</string> <string name="auto_revoke_after_notification_content_one" msgid="6804038707453662753">"Rakendust <xliff:g id="APP_NAME">%s</xliff:g> ei ole mõne kuu jooksul kasutatud. Puudutage ülevaatamiseks."</string> <string name="auto_revoke_after_notification_content_two" msgid="9108709764831425172">"Rakendust <xliff:g id="APP_NAME">%s</xliff:g> ja veel 1 rakendust ei ole mõne kuu jooksul kasutatud. Puudutage ülevaatamiseks."</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Linkide avamine"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Vaikerakendused töö jaoks"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Privaatse ruumi vaikerakendused"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Seadme jaoks optimeeritud"</string> + <string name="default_app_others" msgid="7793029848126079876">"Muud"</string> <string name="default_app_none" msgid="9084592086808194457">"Puudub"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Süsteemi vaikeseade)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Rakendusi pole"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> soovib üles laadida silumisteavet."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Kas soovite silumisandmeid jagada?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Süsteem tuvastas probleemi."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> palub luba sellest seadmest veaaruande üleslaadimiseks (jäädvustati <xliff:g id="DATE">%2$s</xliff:g> kell <xliff:g id="TIME">%3$s</xliff:g>). Veaaruanded hõlmavad teie seadmega seotud isiklikke andmeid või rakenduste logitud isiklikke andmeid (nt kasutajanimesid, asukohaandmeid, seadme ID-sid ja võrguteavet). Jagage veaaruandeid ainult inimeste ja rakendustega, keda/mida usaldate. Kas lubada rakendusel <xliff:g id="APP_NAME_1">%4$s</xliff:g> veaaruanne üles laadida?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> palub luba sellest seadmest veaaruande üleslaadimiseks (loodi <xliff:g id="DATE">%2$s</xliff:g> kell <xliff:g id="TIME">%3$s</xliff:g>). Veaaruanded hõlmavad teie seadmega seotud või rakenduste logitud isiklikke andmeid (nt kasutajanimed, asukohaandmed, seadme ID-d ja võrguteave). Jagage veaaruandeid ainult inimeste ja rakendustega, keda/mida usaldate.\n\nKas lubada rakendusel <xliff:g id="APP_NAME_1">%4$s</xliff:g> veaaruanne üles laadida?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> veaaruande töötlemisel ilmnes viga. Seetõttu keelati üksikasjalike silumisandmete jagamine. Vabandage katkestuse pärast!"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Luba"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Keela"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Piiratud seadete lubamine"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Piiratud seade"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Teie turvalisuse huvides pole see seade praegu saadaval."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Toiming pole telefonikõne ajal saadaval"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Telefonikõne ajal pole lubatud anda rakendustele luba installida teisi rakendusi.\n\n Petised taotlevad telefonivestluse ajal sageli seda tüüpi toimingut, mistõttu on see teie kaitsmiseks blokeeritud. Kui keegi, keda te ei tea, suunab teid seda toimingut tegema, võib tegu olla pettusega."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Seda toimingut ei saa kõne ajal teha"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"See säte on teie seadme ja andmete kaitsmiseks blokeeritud.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Petised võivad proovida installida kahjulikke rakendusi, paludes teil installida uuest allikast tundmatuid rakendusi."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Petised võivad proovida teie seadet oma kontrolli alla haarata, paludes teil lubada rakenduse jaoks juurdepääsu juurdepääsetavusfunktsioonidele."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Rakendusele ei antud luba <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Rakendus taotles tundlikku luba, mis võib teie isikuandmed ja finantsteabe ohtu seada.<xliff:g id="ID_1"><br><br></xliff:g>Võimalik, et rakendus ei tööta ilma selle piiratud loata korralikult. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>> Teave juurdepääsu andmise kohta</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Rakendusele ei antud luba olla vaikimisi <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-eu-v33/strings.xml b/PermissionController/res/values-eu-v33/strings.xml index 424feaf4a..c50fe66c9 100644 --- a/PermissionController/res/values-eu-v33/strings.xml +++ b/PermissionController/res/values-eu-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Alerta gehiago"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Baztertutako alertak"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Zabaldu eta ikusi beste alerta bat}other{Zabaldu eta ikusi # alerta gehiago}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Tolestu"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alerta. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Osatu da ekintza"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Egiaztatu gailuaren segurtasuna hobe dezaketen ezarpenak"</string> diff --git a/PermissionController/res/values-eu/strings.xml b/PermissionController/res/values-eu/strings.xml index 73c1015b6..5906b18dc 100644 --- a/PermissionController/res/values-eu/strings.xml +++ b/PermissionController/res/values-eu/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g> erabiltzeko baimena aplikazio honetarako <xliff:g id="DEVICE_NAME">%2$s</xliff:g> gailuan"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Ikusi <xliff:g id="APP">%1$s</xliff:g> aplikazioaren baimen guztiak"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Ikusi baimen hau duten aplikazio guztiak"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informazioa"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Ezarpenak"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Erakutsi laguntzaileak mikrofonoa erabiltzeko duen baimena"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Erabili gabeko aplikazioen ezarpenak"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Kendu baimenak aplikazioa erabiltzen ez bada"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Irekiko diren estekak"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Lanerako aplikazio lehenetsiak"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Eremu pribatuko aplikazio lehenetsiak"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Gailurako optimizatuta"</string> + <string name="default_app_others" msgid="7793029848126079876">"Beste batzuk"</string> <string name="default_app_none" msgid="9084592086808194457">"Bat ere ez"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(sistemaren aplikazio lehenetsia)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Ez dago aplikaziorik"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak arazketa-informazioa kargatu nahi du."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Arazketa-datuak partekatu nahi dituzu?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Arazo bat hauteman du sistemak."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="DATE">%2$s</xliff:g> (<xliff:g id="TIME">%3$s</xliff:g>) datan sortutako akatsen txostena kargatzeko baimena eskatzen ari da <xliff:g id="APP_NAME_0">%1$s</xliff:g>. Akatsen txostenek zure gailuari buruzkoa den edo aplikazioek erregistratu duten informazio pertsonala dute; adibidez, erabiltzaile-izenak, kokapenari buruzko datuak, gailu-identifikatzaileak eta sareari buruzko informazioa. Informazio hori izateko fidagarriak iruditzen zaizkizun pertsona eta aplikazioekin soilik partekatu beharko zenituzke akatsen txostenak. <xliff:g id="APP_NAME_1">%4$s</xliff:g> aplikazioari akatsen txostena kargatzeko baimena eman nahi diozu?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="DATE">%2$s</xliff:g> (<xliff:g id="TIME">%3$s</xliff:g>) datan sortutako akatsen txostena kargatzeko baimena eskatzen ari da <xliff:g id="APP_NAME_0">%1$s</xliff:g>. Akatsen txostenek zure gailuari buruzkoa den edo aplikazioek erregistratu duten informazio pertsonala dute; adibidez, erabiltzaile-izenak, kokapenari buruzko datuak, gailu-identifikatzaileak eta sareari buruzko informazioa. Informazio hori izateko fidagarriak iruditzen zaizkizun pertsona eta aplikazioekin soilik partekatu beharko zenituzke akatsen txostenak.\n\nAkatsen txostena kargatzeko baimena eman nahi diozu <xliff:g id="APP_NAME_1">%4$s</xliff:g> aplikazioari?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Errore bat gertatu da <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioaren akatsen txostena prozesatzean; beraz, ezin izan dira partekatu arazketa-datu xehatuak. Barkatu eragozpenak."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Eman baimena"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Ukatu"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Eman ezarpen mugatuak erabiltzeko baimena"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Murriztapenak ditu ezarpenak"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Zure segurtasuna bermatzeko, ezarpena ez dago erabilgarri une honetan."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Ekintza hori ez dago erabilgarri telefono-deietan"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Telefono-dei batean zaudenean ezin diezu eman beste aplikazio batzuk instalatzeko baimena aplikazioei.\n\n Iruzurgileek halako ekintzak egiteko eskatu ohi dute telefono bidezko elkarrizketetan; beraz, aukera hori blokeatu dugu zu babesteko. Ezagutzen ez duzun norbaitek halako zerbait egiteko esaten badizu, baliteke azpikeria izatea."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Ezin da osatu ekintza deia abian den bitartean"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Ezarpen hau blokeatuta dago zure gailua eta datuak babesteko.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Baliteke iruzurgileak aplikazio kaltegarriak instalatzen saiatzea, aplikazio ezezagunak iturburu berri batetik instalatzeko eskatuta."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Baliteke iruzurgileak zure gailua kontrolatzen saiatzea, aplikazio batean erabilerraztasun-eginbideak erabiltzeko baimena eskatuta."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Aplikazioari <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> erabiltzeko baimena ukatu zaio"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Kontuzko informazioa erabiltzeko baimen bat eskatu du aplikazioak, eta agian horrek arriskuan jarriko ditu zure informazio pertsonala eta finantzei buruzko informazioa.<xliff:g id="ID_1"><br><br></xliff:g>Baliteke aplikazioak behar bezala ez funtzionatzea baimen murriztu hori gabe. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Lortu baimena emateko argibideak</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Aplikazioari <xliff:g id="ROLE_NAME">%1$s</xliff:g> lehenetsia izateko baimena ukatu zaio"</string> diff --git a/PermissionController/res/values-fa-v33/strings.xml b/PermissionController/res/values-fa-v33/strings.xml index 6c7abf7c5..4b93d824d 100644 --- a/PermissionController/res/values-fa-v33/strings.xml +++ b/PermissionController/res/values-fa-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"هشدارهای بیشتر"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"هشدارهای ردشده"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{گسترده کردن و دیدن یک هشدار دیگر}one{گسترده کردن و دیدن # هشدار دیگر}other{گسترده کردن و دیدن # هشدار دیگر}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"جمع کردن"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"هشدار. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"کنش کامل شد"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"بررسی کردن تنظیماتی که میتواند امنیت بیشتری به دستگاهتان اضافه کند"</string> diff --git a/PermissionController/res/values-fa-watch/strings.xml b/PermissionController/res/values-fa-watch/strings.xml index b602b38f3..16acde24b 100644 --- a/PermissionController/res/values-fa-watch/strings.xml +++ b/PermissionController/res/values-fa-watch/strings.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="grant_dialog_button_deny_dont_ask_again" msgid="5709879604352260492">"مجاز نیست، دیگر سؤال نشود"</string> + <string name="grant_dialog_button_deny_dont_ask_again" msgid="5709879604352260492">"مجاز نیست، دوباره پرسیده نشود"</string> <string name="current_permission_template" msgid="6634462553790549887">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> <string name="preference_show_system_apps" msgid="1055740303992024300">"نمایش برنامههای سیستم"</string> <string name="permission_summary_enforced_by_policy" msgid="2352478756952948019">"امکان تغییر نیست"</string> diff --git a/PermissionController/res/values-fa/strings.xml b/PermissionController/res/values-fa/strings.xml index f04d8f4c9..603248fe7 100644 --- a/PermissionController/res/values-fa/strings.xml +++ b/PermissionController/res/values-fa/strings.xml @@ -75,7 +75,7 @@ <string name="app_disable_dlg_positive" msgid="7418444149981904940">"غیرفعال کردن برنامه"</string> <string name="app_disable_dlg_text" msgid="3126943217146120240">"اگر این برنامه را غیرفعال کنید، ممکن است Android و سایر برنامههای دیگر عملکرد موردانتظار را نداشته باشند. بهخاطر داشته باشید که نمیتوانید این برنامه را حذف کنید، چون از برنامههای ازپیش نصبشده روی دستگاه است. این برنامه، با غیرفعال کردن، خاموش میشود و در دستگاه پنهان میشود."</string> <string name="app_permission_manager" msgid="3903811137630909550">"مدیر اجازهها"</string> - <string name="never_ask_again" msgid="4728762438198560329">"دوباره سؤال نشود"</string> + <string name="never_ask_again" msgid="4728762438198560329">"دوباره پرسیده نشود"</string> <string name="no_permissions" msgid="3881676756371148563">"مجوزی موجود نیست"</string> <string name="additional_permissions" msgid="5801285469338873430">"اجازههای جانبی"</string> <string name="app_permissions_info_button_label" msgid="7633312050729974623">"باز کردن اطلاعات برنامه"</string> @@ -200,8 +200,10 @@ <string name="app_permission_title" msgid="2090897901051370711">"اجازه <xliff:g id="PERM">%1$s</xliff:g>"</string> <string name="app_permission_header" msgid="2951363137032603806">"دسترسی <xliff:g id="PERM">%1$s</xliff:g> برای این برنامه"</string> <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"دسترسی <xliff:g id="PERM">%1$s</xliff:g> از این برنامه در <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> - <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"مشاهده همه اجازههای <xliff:g id="APP">%1$s</xliff:g>"</string> + <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"دیدن همه اجازههای <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"دیدن همه برنامههایی که این مجوز را دارند"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"اطلاعات"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"تنظیمات"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"نمایش میزان استفاده «دستیار» از میکروفون"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"تنظیمات برنامههای استفادهنشده"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"اگر از برنامه استفاده نمیشود، اجازهها برداشته شوند"</string> @@ -273,7 +275,7 @@ <string name="unused_apps_notification_content" msgid="9195026773244581246">"اجازهها و فایلهای موقت حذف شدهاند و اعلانها متوقف شدهاند. برای مرور، تکضرب بزنید."</string> <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"مرور برنامههایی که اجازههای آنها برداشته شده است"</string> <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"اجازهها و فایلهای موقت مربوط به برنامههایی که مدتی از آنها استفاده نکردهاید برداشته شدند و اعلانها متوقف شدند."</string> - <string name="unused_apps_safety_center_action_title" msgid="8865914432518993194">"مرور برنامهها"</string> + <string name="unused_apps_safety_center_action_title" msgid="8865914432518993194">"بازبینی برنامهها"</string> <string name="post_drive_permission_decision_reminder_title" msgid="1290697371418139976">"بررسی اجازههای اخیر"</string> <string name="post_drive_permission_decision_reminder_summary_1_app_1_permission" msgid="670521503734140711">"درحین رانندگی، به <xliff:g id="APP">%1$s</xliff:g> اجازه دسترسی به <xliff:g id="PERMISSION">%2$s</xliff:g> را دادید"</string> <string name="post_drive_permission_decision_reminder_summary_1_app_2_permissions" msgid="671791184670801301">"درحین رانندگی، به <xliff:g id="APP">%1$s</xliff:g> اجازه دسترسی به <xliff:g id="PERMISSION_1">%2$s</xliff:g> و <xliff:g id="PERMISSION_2">%3$s</xliff:g> را دادید"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"باز کردن پیوندها"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"پیشفرض برای کار"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"برنامههای پیشفرض برای فضای خصوصی"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"بهینهسازیشده برای دستگاه"</string> + <string name="default_app_others" msgid="7793029848126079876">"موارد دیگر"</string> <string name="default_app_none" msgid="9084592086808194457">"هیچکدام"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(پیشفرض سیستم)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"برنامهای موجود نیست"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> میخواهد اطلاعات اشکالزدایی را بارگذاری کند."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"دادههای اشکالزدایی همرسانی شود؟"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"سیستم مشکلی را تشخیص داده است."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> درخواست بارگذاری گزارش اشکالی را دارد که در <xliff:g id="DATE">%2$s</xliff:g> ساعت <xliff:g id="TIME">%3$s</xliff:g> در این دستگاه پیش آمده است. گزارشهای اشکال شامل اطلاعات شخصی درباره دستگاه شما است یا اطلاعاتی که توسط برنامهها گزارش شده است، برای مثال نامهای کاربر، دادههای مکان، شناسههای دستگاه و اطلاعات شبکه. گزارشهای اشکال را تنها با افراد و برنامههایی همرسانی کنید که به آنها در اینباره اعتماد دارید. به <xliff:g id="APP_NAME_1">%4$s</xliff:g> اجازه بارگذاری گزارش اشکال داده شود؟"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> درخواست بارگذاری گزارش اشکالی را دارد که در <xliff:g id="DATE">%2$s</xliff:g> ساعت <xliff:g id="TIME">%3$s</xliff:g> در این دستگاه پیش آمده است. گزارشهای اشکال شامل اطلاعات شخصی درباره دستگاه شما است یا اطلاعاتی که توسط برنامهها گزارش شده است، برای مثال، نامهای کاربری، دادههای مکان، شناسههای دستگاه و اطلاعات شبکه. گزارشهای اشکال را فقط با افراد و برنامههایی همرسانی کنید که به آنها در اینباره اعتماد دارید.\n\nبه <xliff:g id="APP_NAME_1">%4$s</xliff:g> اجازه بارگذاری گزارش اشکال داده شود؟"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"هنگام پردازش گزارش اشکال برای <xliff:g id="APP_NAME">%1$s</xliff:g> خطایی رخ داد. بنابراین همرسانی دادههای اشکالزدایی دقیق رد شد. از وقفه پیشآمده پوزش میطلبیم."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"اجازه دادن"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"مجاز نبودن"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"مجاز کردن تنظیمات محدودشده"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"تنظیم محدودشده"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"برای حفظ امنیت شما، درحالحاضر این تنظیم دردسترس نیست."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"اقدام درطول تماس تلفنی دردسترس نیست"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"درطول تماس تلفنی، اجازه دادن به برنامهها برای نصب برنامههای دیگر مجاز نیست.\n\n افراد کلاهبردار اغلب این نوع اقدامات را درطول مکالمههای تلفنی درخواست میکنند، بنابراین این کار برای محافظت از شما مسدود شده است. اگر شخص ناآشنایی شما را ترغیب به انجام این اقدام میکند، ممکن است موضوع کلاهبرداری باشد."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"این کنش درطول تماس تکمیل نمیشود"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"برای محافظت از دستگاه و دادههای شما، این تنظیم مسدود شده است.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>کلاهبرداران ممکن است با درخواست نصب برنامههای ناشناس از منبعی جدید تلاش کنند برنامههای مضر نصب کنند."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>کلاهبرداران ممکن است با درخواست مجاز کردن دسترسی به تنظیم دسترسپذیری یکی از برنامهها تلاش کنند کنترل دستگاهتان را بهدست بگیرند."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"درخواست برنامه برای دسترسی به <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> رد شد"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"این برنامه درخواست دسترسی به اجازهای حساس را داشته است که میتواند اطلاعات شخصی و مالیتان را درمعرض خطر قرار دهد.<xliff:g id="ID_1"><br><br></xliff:g>ممکن است برنامه بدون این اجازه محدودشده بهدرستی کار نکند. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>با نحوه اعطای دسترسی آشنا شوید</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"درخواست دسترسی برنامه برای تبدیل شدن به <xliff:g id="ROLE_NAME">%1$s</xliff:g> پیشفرض رد شد"</string> diff --git a/PermissionController/res/values-fi-v33/strings.xml b/PermissionController/res/values-fi-v33/strings.xml index 9b57c6172..edb8737b3 100644 --- a/PermissionController/res/values-fi-v33/strings.xml +++ b/PermissionController/res/values-fi-v33/strings.xml @@ -16,8 +16,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="role_dialer_request_description" msgid="6188305064871543419">"Sovellus saa luvan lähettää sinulle ilmoituksia ja pääsyn kameraan, yhteystietoihin, mikrofoniin, puhelimeen ja tekstiviesteihin"</string> - <string name="role_sms_request_description" msgid="1506966389698625395">"Sovellus saa luvan lähettää sinulle ilmoituksia ja pääsyn kameraan, yhteystietoihin, tiedostoihin, mikrofoniin, puhelimeen ja tekstiviesteihin"</string> + <string name="role_dialer_request_description" msgid="6188305064871543419">"Sovellus saa luvan lähettää sinulle ilmoituksia ja se saa pääsyn kameraan, yhteystietoihin, mikrofoniin, puhelimeen ja tekstiviesteihin"</string> + <string name="role_sms_request_description" msgid="1506966389698625395">"Sovellus saa luvan lähettää sinulle ilmoituksia ja se saa pääsyn kameraan, yhteystietoihin, tiedostoihin, mikrofoniin, puhelimeen ja tekstiviesteihin"</string> <string name="permission_description_summary_storage" msgid="1917071243213043858">"Sovellukset, joilla on tämä lupa, saavat pääsyn kaikkiin laitteen tiedostoihin"</string> <string name="work_policy_title" msgid="832967780713677409">"Työkäytäntötietosi"</string> <string name="work_policy_summary" msgid="3886113358084963931">"IT-järjestelmänvalvojan ylläpitämät asetukset"</string> @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Lisää ilmoituksia"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Hylätyt hälytykset"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Laajenna ja katso yksi muu ilmoitus}other{Laajenna ja katso # muuta ilmoitusta}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Tiivistä"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Hälytys. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Toiminto suoritettu"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Tarkista asetukset, jotka voivat parantaa laitteesi turvallisuutta"</string> diff --git a/PermissionController/res/values-fi/strings.xml b/PermissionController/res/values-fi/strings.xml index a88c39ab2..c721e7299 100644 --- a/PermissionController/res/values-fi/strings.xml +++ b/PermissionController/res/values-fi/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Tällä sovelluksella on pääsy (<xliff:g id="PERM">%1$s</xliff:g>) laitteella <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Näytä kaikki luvat, jotka <xliff:g id="APP">%1$s</xliff:g> on saanut"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Näytä kaikki sovellukset, joilla on tämä lupa"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Tiedot"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Asetukset"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Näytä Assistantin mikrofonin käyttö"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Käyttämättömien sovellusten asetukset"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Poista luvat, jos sovellusta ei käytetä"</string> @@ -410,7 +412,7 @@ <string name="role_wallet_label" msgid="3719419175656204207">"Oletuslompakkosovellus"</string> <string name="role_wallet_short_label" msgid="6521288403762457452">"Lompakkosovellus"</string> <string name="role_wallet_description" msgid="3726535836165949838">"Lompakkosovelluksista on apua erilaisissa tilanteissa, koska niihin voi tallentaa esimerkiksi credit- ja kanta-asiakaskortit ja autonavaimet"</string> - <string name="role_wallet_request_title" msgid="4770217108262737093">"Valitaanko <xliff:g id="APP_NAME">%1$s</xliff:g> oletuslompakkosovelluksesi?"</string> + <string name="role_wallet_request_title" msgid="4770217108262737093">"Asetetaanko <xliff:g id="APP_NAME">%1$s</xliff:g> oletuslompakkosovelluksesi?"</string> <string name="role_wallet_request_description" msgid="6305487425777483053">"Lupia ei tarvita"</string> <string name="request_role_current_default" msgid="738722892438247184">"Nykyinen oletus"</string> <string name="request_role_dont_ask_again" msgid="3556017886029520306">"Älä kysy uudelleen"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Linkkien avaaminen"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Työkäytön oletus"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Oletus yksityiselle tilalle"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimoitu laitteelle"</string> + <string name="default_app_others" msgid="7793029848126079876">"Muut"</string> <string name="default_app_none" msgid="9084592086808194457">"Ei mitään"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Järjestelmän oletusarvo)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Ei sovelluksia"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa ladata virheenkorjaustietoja palvelimelle."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Jaetaanko virheenkorjausdataa?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Järjestelmä on havainnut ongelman."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> pyytää saada ladata laitteelta virheraportin, joka luotiin <xliff:g id="DATE">%2$s</xliff:g> kello <xliff:g id="TIME">%3$s</xliff:g>. Virheraportit sisältävät yksityisiä laitetietoja ja sovellusten kirjaamia tietoja, esimerkiksi käyttäjänimiä, sijaintitietoja, laitteen tunnistetietoja ja verkkotietoja. Jaa virheraportteja vain ihmisille ja sovelluksille, joiden tietojen käsittelyyn luotat. Saako <xliff:g id="APP_NAME_1">%4$s</xliff:g> lähettää virheraportin?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> pyytää lupaa ladata laitteelta virheraportin, joka luotiin <xliff:g id="DATE">%2$s</xliff:g> kello <xliff:g id="TIME">%3$s</xliff:g>. Virheraportit sisältävät laitteen tai sovellusten kirjaamia henkilökohtaisia tietoja, esimerkiksi käyttäjätunnuksia, sijaintitietoja, laitetunnisteita ja verkkotietoja. Jaa virheraportteja vain henkilöille ja sovelluksille, joihin luotat.\n\nSaako <xliff:g id="APP_NAME_1">%4$s</xliff:g> lähettää virheraportin?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Virheraportin (<xliff:g id="APP_NAME">%1$s</xliff:g>) käsittelyssä tapahtui virhe. Yksityiskohtaisen virheenkorjausdatan jakaminen on siis estetty. Pahoittelut keskeytyksestä."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Salli"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Estä"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Salli rajoitetut asetukset"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Rajoitettu asetus"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Asetus ei ole tällä hetkellä käytettävissä turvallisuussyistä."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Toiminto ei ole käytettävissä puhelun aikana"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Sovellusten ei sallita asentaa muita sovelluksia puhelun aikana.\n\n Huijarit pyytävät usein tätä puhelun aikana, joten se on estetty suojataksesi sinua. Jos joku, jota et tunne, kehottaa sinua toimimaan näin, kyseessä voi olla huijaus."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Toimintoa ei voi suorittaa puhelun aikana"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Tämä asetus on estetty laitteen ja datan suojaamiseksi.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Huijarit voivat yrittää asentaa haitallisia sovelluksia pyytämällä sinua asentamaan tuntemattomia sovelluksia uudesta lähteestä."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Huijarit voivat yrittää ottaa laitteen hallintaansa pyytämällä sinua sallimaan sovellukselle pääsyn saavutettavuuspalveluun."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Sovellukselta on evätty pääsy: <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Sovellus on pyytänyt pääsyä arkaluontoiseen lupaan, joka voi vaarantaa henkilökohtaisia tietojasi ja taloustietojasi.<xliff:g id="ID_1"><br><br></xliff:g>Sovellus ei välttämättä toimi oikein ilman tätä rajoitettua lupaa. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Lue, miten voit sallia pääsyn</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Sovellus ei saa olla oletuksena <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-fr-rCA-v33/strings.xml b/PermissionController/res/values-fr-rCA-v33/strings.xml index a2f81bcea..ddbddf8e6 100644 --- a/PermissionController/res/values-fr-rCA-v33/strings.xml +++ b/PermissionController/res/values-fr-rCA-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Plus d\'alertes"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Alertes ignorées"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Développez et affichez une autre alerte}one{Développez et affichez # autre alerte}many{Développez et affichez # d\'autres alertes}other{Développez et affichez # autres alertes}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Réduire"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alerte. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Action terminée"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Vérifiez les paramètres qui peuvent protéger davantage votre appareil"</string> diff --git a/PermissionController/res/values-fr-rCA/strings.xml b/PermissionController/res/values-fr-rCA/strings.xml index c7941a592..fc91de0e0 100644 --- a/PermissionController/res/values-fr-rCA/strings.xml +++ b/PermissionController/res/values-fr-rCA/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Accès <xliff:g id="PERM">%1$s</xliff:g> pour cette appli sur <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Afficher toutes les autorisations pour <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Afficher toutes les applis qui possèdent cette autorisation"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Renseignements"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Paramètres"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Afficher l\'usage du microphone de l\'assistant"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Paramètres des applis inutilisées"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Retirer les autorisations si l\'appli est inutilisée"</string> @@ -355,13 +357,13 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"Ces applis peuvent voir votre écran, vos actions et ce que vous entrez; elles peuvent également effectuer des actions et contrôler l\'écran."</string> <string name="role_assistant_label" msgid="4727586018198208128">"Assistant numérique par défaut"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"Appli d\'assistant numérique"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"Les applis d\'assistance peuvent vous aider en fonction de l\'information affichée à l\'écran. Certaines applis sont compatibles à la fois avec le lanceur d\'applis et les services d\'entrée vocale, vous permettant de bénéficier d\'une assistance intégrée."</string> + <string name="role_assistant_description" msgid="6622458130459922952">"Les applis d\'assistance peuvent se servir des informations à l\'écran pour vous aider. Certaines applis sont compatibles à la fois avec le lanceur d\'applis et les services d\'entrée vocale pour vous offrir une assistance intégrée."</string> <string name="role_browser_label" msgid="2877796144554070207">"Appli de navigation par défaut"</string> - <string name="role_browser_short_label" msgid="6745009127123292296">"Appli de navigateur"</string> + <string name="role_browser_short_label" msgid="6745009127123292296">"Appli de navigation"</string> <string name="role_browser_description" msgid="3465253637499842671">"Applis qui vous donnent accès à Internet et qui affichent des liens que vous pouvez toucher"</string> <string name="role_browser_request_title" msgid="2895200507835937192">"Définir <xliff:g id="APP_NAME">%1$s</xliff:g> comme appli par défaut pour la navigation?"</string> <string name="role_browser_request_description" msgid="5888803407905985941">"Aucune autorisation nécessaire"</string> - <string name="role_dialer_label" msgid="1100224146343237968">"Appli de téléphone par défaut"</string> + <string name="role_dialer_label" msgid="1100224146343237968">"Appli Téléphone par défaut"</string> <string name="role_dialer_short_label" msgid="7186888549465352489">"Appli Téléphone"</string> <string name="role_dialer_description" msgid="8768708633696539612">"Applis qui vous permettent de faire et de recevoir des appels téléphoniques sur votre appareil"</string> <string name="role_dialer_request_title" msgid="5959618560705912058">"Définir <xliff:g id="APP_NAME">%1$s</xliff:g> comme appli de téléphonie par défaut?"</string> @@ -380,8 +382,8 @@ <string name="role_emergency_request_description" msgid="131645948770262850">"Aucune autorisation nécessaire"</string> <string name="role_emergency_search_keywords" msgid="1920007722599213358">"En cas d\'urgence"</string> <string name="role_home_label" msgid="3871847846649769412">"Appli d\'accueil par défaut"</string> - <string name="role_home_short_label" msgid="8544733747952272337">"Appli sur l\'écran d\'accueil"</string> - <string name="role_home_description" msgid="7997371519626556675">"Applis qui remplacent les écrans d\'accueil sur votre appareil Android et qui vous donnent accès au contenu et aux fonctionnalités de votre appareil"</string> + <string name="role_home_short_label" msgid="8544733747952272337">"Appli d\'accueil"</string> + <string name="role_home_description" msgid="7997371519626556675">"Applis, aussi appelées lanceurs d\'applis, qui remplacent les écrans d\'accueil sur votre appareil Android et qui vous donnent accès au contenu et aux fonctionnalités de votre appareil"</string> <string name="role_home_request_title" msgid="738136983453341081">"Définir <xliff:g id="APP_NAME">%1$s</xliff:g> comme appli d\'écran d\'accueil par défaut?"</string> <string name="role_home_request_description" msgid="2658833966716057673">"Aucune autorisation nécessaire"</string> <string name="role_home_search_keywords" msgid="3830755001192666285">"lanceur d\'applis"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Ouverture des liens"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Par défaut pour util. profess."</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Applis par défaut pour l\'Espace privé"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimisée pour l\'appareil"</string> + <string name="default_app_others" msgid="7793029848126079876">"Autres"</string> <string name="default_app_none" msgid="9084592086808194457">"Aucune"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Paramètre(s) système par défaut)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Aucune appli"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite téléverser des données de débogage."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Partager les données de débogage?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Le système a détecté un problème."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"L\'appli <xliff:g id="APP_NAME_0">%1$s</xliff:g> souhaite téléverser un rapport de bogue créé le <xliff:g id="DATE">%2$s</xliff:g> à <xliff:g id="TIME">%3$s</xliff:g> sur cet appareil. Les rapports de bogue contiennent des données personnelles relatives à votre appareil ou enregistrées par des applis, comme des noms d\'utilisateur, des données de localisation, des identifiants d\'appareils et des renseignements relatifs au réseau. Ne partagez les rapports de bogue qu\'avec des personnes et des applis que vous jugez fiables. Autoriser l\'appli <xliff:g id="APP_NAME_1">%4$s</xliff:g> à téléverser un rapport de bogue?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"L\'appli <xliff:g id="APP_NAME_0">%1$s</xliff:g> souhaite téléverser un rapport de bogue créé le <xliff:g id="DATE">%2$s</xliff:g> à <xliff:g id="TIME">%3$s</xliff:g> sur cet appareil. Les rapports de bogue contiennent des données personnelles relatives à votre appareil ou enregistrées par des applis, comme des noms d\'utilisateur, des données de localisation, des identifiants d\'appareils et des renseignements relatifs au réseau. Ne partagez les rapports de bogue qu\'avec des personnes et des applis que vous jugez fiables.\n\nAutoriser l\'appli <xliff:g id="APP_NAME_1">%4$s</xliff:g> à téléverser un rapport de bogue?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Une erreur s\'est produite lors du traitement du rapport de bogue pour <xliff:g id="APP_NAME">%1$s</xliff:g>, alors le partage des données de débogage détaillées a été refusé. Nous sommes désolés de l\'interruption."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Autoriser"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Refuser"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Autoriser les paramètres restreints"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Paramètre restreint"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Pour protéger votre sécurité, ce paramètre n\'est pas accessible actuellement."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Action non proposée lors d\'un appel téléphonique"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Autoriser les applis à installer d\'autres applis n\'est pas permis lors d\'un appel téléphonique.\n\n Les escrocs demandent souvent ce type d\'action lors de conversations téléphoniques, alors ces actions sont bloquées pour vous protéger. Si quelqu\'un que vous ne connaissez pas vous guide dans cette démarche, il pourrait s\'agir d\'une escroquerie."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Impossible d\'effectuer l\'action pendant un appel"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Ce paramètre est bloqué pour protéger votre appareil et vos données.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Les escrocs peuvent tenter d\'installer des applis nuisibles en vous demandant d\'installer des applis inconnues à partir d\'une nouvelle source."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Les escrocs peuvent tenter de prendre le contrôle de votre appareil en vous demandant d\'autoriser l\'accès au service d\'accessibilité pour une appli."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"L\'appli n\'a pas obtenu l\'accès à <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"L\'appli a demandé l\'accès à une autorisation sensible qui pose un risque pour vos renseignements personnels et financiers.<xliff:g id="ID_1"><br><br></xliff:g>Il est possible que l\'appli ne fonctionne pas correctement sans cette autorisation limitée. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Découvrir comment autoriser l\'accès</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"L\'appli n\'a pas obtenu l\'accès pour avoir le rôle<xliff:g id="ROLE_NAME">%1$s</xliff:g> par défaut"</string> diff --git a/PermissionController/res/values-fr-v33/strings.xml b/PermissionController/res/values-fr-v33/strings.xml index 24bd671a8..d10b59e57 100644 --- a/PermissionController/res/values-fr-v33/strings.xml +++ b/PermissionController/res/values-fr-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Autres alertes"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Alertes ignorées"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Développer et voir 1 autre alerte}one{Développer et voir # autre alerte}many{Développer et voir # autres alertes}other{Développer et voir # autres alertes}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Réduire"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alerte. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Action terminée"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Vérifiez les paramètres qui peuvent renforcer la protection de votre appareil"</string> diff --git a/PermissionController/res/values-fr/strings.xml b/PermissionController/res/values-fr/strings.xml index e51f0a592..781f50a3d 100644 --- a/PermissionController/res/values-fr/strings.xml +++ b/PermissionController/res/values-fr/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Accès à <xliff:g id="PERM">%1$s</xliff:g> pour cette application sur <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Voir toutes les autorisations pour <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Voir toutes les applis ayant cette autorisation"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informations"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Paramètres"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Afficher l\'utilisation du micro par l\'Assistant"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Paramètres des applis inutilisées"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Supprimer les autorisations si l\'application n\'est pas utilisée"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Ouverture des liens"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Par défaut pour utilisation pro"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Paramètres par défaut d\'Espace privé"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimisées pour l\'appareil"</string> + <string name="default_app_others" msgid="7793029848126079876">"Autres"</string> <string name="default_app_none" msgid="9084592086808194457">"Aucune"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Application système par défaut)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Aucune application"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"L\'application <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite transférer des informations de débogage."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Partager les données de débogage ?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Le système a détecté un problème."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"L\'application <xliff:g id="APP_NAME_0">%1$s</xliff:g> souhaite transférer un rapport de bug créé le <xliff:g id="DATE">%2$s</xliff:g> à <xliff:g id="TIME">%3$s</xliff:g> depuis cet appareil. Les rapports de bug contiennent des informations personnelles relatives à votre appareil ou enregistrées par des applications, telles que des noms d\'utilisateur, des données de localisation, des identifiants d\'appareils et des informations relatives au réseau. Ne partagez les rapports de bug qu\'avec des personnes et des applications que vous estimez fiables. Autoriser l\'application <xliff:g id="APP_NAME_1">%4$s</xliff:g> à transférer un rapport de bug ?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"L\'application <xliff:g id="APP_NAME_0">%1$s</xliff:g> souhaite importer un rapport de bug créé le <xliff:g id="DATE">%2$s</xliff:g> à <xliff:g id="TIME">%3$s</xliff:g> depuis cet appareil. Les rapports de bug contiennent des informations personnelles relatives à votre appareil ou enregistrées par des applications, telles que des noms d\'utilisateur, des données de localisation, des identifiants d\'appareils et des informations relatives au réseau. Ne partagez les rapports de bug qu\'avec des personnes et des applications que vous estimez fiables.\n\n Autoriser <xliff:g id="APP_NAME_1">%4$s</xliff:g> à importer un rapport de bug ?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Une erreur s\'est produite lors du traitement du rapport de bug pour <xliff:g id="APP_NAME">%1$s</xliff:g>. Le partage des informations détaillées de débogage a donc été refusé. Veuillez nous excuser pour cette interruption."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Autoriser"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Refuser"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Autoriser les paramètres restreints"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Paramètre restreint"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Pour votre sécurité, ce paramètre est actuellement indisponible."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Action non disponible lors d\'un appel téléphonique"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Vous ne pouvez pas autoriser des applis à installer d\'autres applis pendant un appel téléphonique.\n\n Les escrocs demandent souvent d\'effectuer ce type d\'action lors d\'appels téléphoniques. Cette action est donc bloquée pour vous protéger. Si quelqu\'un que vous ne connaissez pas vous demande d\'effectuer cette action, il s\'agit peut-être d\'une escroquerie."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Action impossible pendant un appel"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Ce paramètre est bloqué pour protéger votre appareil et vos données. <xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Des escrocs peuvent essayer d\'installer des applis malveillantes en vous demandant d\'installer des applis inconnues à partir d\'une nouvelle source."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Des escrocs peuvent essayer de prendre le contrôle de votre appareil en vous demandant d\'autoriser l\'accès aux fonctionnalités d\'accessibilité pour une appli."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"L\'appli s\'est vu refuser l\'accès à <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Cette appli a demandé l\'accès à une autorisation sensible susceptible d\'exposer vos informations financières et personnelles à un risque.<xliff:g id="ID_1"><br><br></xliff:g>Si elle ne dispose pas d\'un accès à cette autorisation restreinte, l\'appli peut ne pas fonctionner correctement. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Découvrez comment autoriser l\'accès</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"L\'appli s\'est vu refuser l\'accès au statut de <xliff:g id="ROLE_NAME">%1$s</xliff:g> par défaut"</string> diff --git a/PermissionController/res/values-gl-v33/strings.xml b/PermissionController/res/values-gl-v33/strings.xml index 3c8898c4f..ea3123611 100644 --- a/PermissionController/res/values-gl-v33/strings.xml +++ b/PermissionController/res/values-gl-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Máis alertas"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Alertas pechadas"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Despregar tarxeta e ver 1 alerta máis}other{Despregar tarxeta e ver # alertas máis}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Contraer"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alerta. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Acción completada"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Comproba as opcións de configuración que poden aumentar a protección do dispositivo"</string> diff --git a/PermissionController/res/values-gl/strings.xml b/PermissionController/res/values-gl/strings.xml index b4766bf20..0a46020ff 100644 --- a/PermissionController/res/values-gl/strings.xml +++ b/PermissionController/res/values-gl/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Esta aplicación ten o seguinte permiso de acceso en <xliff:g id="DEVICE_NAME">%2$s</xliff:g>: <xliff:g id="PERM">%1$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Ver todos os permisos de <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Ver todas as aplicacións que teñen este permiso"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Información"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Configuración"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Mostrar uso do micrófono do Asistente"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Configuración das aplicacións sen uso"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Quitar permisos se non se usa a aplicación"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Apertura de ligazóns"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Predeterminadas para o traballo"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Aplicacións predeterminadas do espazo privado"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimizadas para o dispositivo"</string> + <string name="default_app_others" msgid="7793029848126079876">"Outras"</string> <string name="default_app_none" msgid="9084592086808194457">"Ningunha"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Opción predeterminada do sistema)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Non hai ningunha aplicación"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"A aplicación <xliff:g id="APP_NAME">%1$s</xliff:g> quere cargar información de depuración."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Queres compartir os datos de depuración?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"O sistema detectou un problema."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"A aplicación <xliff:g id="APP_NAME_0">%1$s</xliff:g> quere subir un informe de erros deste dispositivo, xerado o <xliff:g id="DATE">%2$s</xliff:g> (<xliff:g id="TIME">%3$s</xliff:g>). Os informes de erros inclúen información persoal sobre o dispositivo ou datos rexistrados polas aplicacións, como os nomes de usuario, os datos de localización, os identificadores do dispositivo e a información da rede. Comparte estes informes unicamente con persoas e aplicacións de confianza. Queres permitir que a aplicación <xliff:g id="APP_NAME_1">%4$s</xliff:g> cargue un informe de erros?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"A aplicación <xliff:g id="APP_NAME_0">%1$s</xliff:g> quere cargar un informe de erros, xerado o <xliff:g id="DATE">%2$s</xliff:g> (<xliff:g id="TIME">%3$s</xliff:g>) deste dispositivo. Os informes de erros inclúen información persoal sobre o aparello ou datos rexistrados polas aplicacións, como os nomes de usuario, os datos de localización, os identificadores do dispositivo e a información da rede. Comparte estes informes unicamente con persoas e aplicacións de confianza.\n\nQueres permitir que a aplicación <xliff:g id="APP_NAME_1">%4$s</xliff:g> cargue un informe de erros?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Houbo un erro ao procesar o informe de erros da aplicación <xliff:g id="APP_NAME">%1$s</xliff:g>, polo cal se denegou o uso compartido dos datos de depuración detallados. Lamentamos a interrupción."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Permitir"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Denegar"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Permitir opcións restrinxidas"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Opción de configuración restrinxida"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Pola túa seguranza, esta opción de configuración non está dispoñible nestes momentos."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Acción non dispoñible nas chamadas telefónicas"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Non está permitido que as aplicacións instalen outras aplicacións durante as chamadas telefónicas.\n\n Como os estafadores adoitan solicitar este tipo de accións durante as chamadas telefónicas, bloqueámola para protexerte. Se alguén pretende que realices esta acción, é posible que sexa unha estafa."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Non se pode completar a acción durante as chamadas"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Esta opción de configuración está bloqueada para protexer o teu dispositivo e os teus datos.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Os estafadores poden pedirche que instales aplicacións descoñecidas dunha orixe nova para instalar aplicacións daniñas."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Os estafadores poden solicitarche permiso para entrar nas opcións de accesibilidade dunha aplicación co fin de tentar asumir o control do teu dispositivo."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Denegóuselle á aplicación o acceso ao permiso: <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"A aplicación solicitou acceso a un permiso confidencial que pode poñer en perigo a túa información persoal e financeira.<xliff:g id="ID_1"><br><br></xliff:g>É posible que a aplicación non funcione correctamente sen este permiso restrinxido. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Máis información sobre como permitir o acceso</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Denegóuselle á aplicación o acceso para actuar como <xliff:g id="ROLE_NAME">%1$s</xliff:g> de forma predeterminada"</string> diff --git a/PermissionController/res/values-gu-v33/strings.xml b/PermissionController/res/values-gu-v33/strings.xml index d77558fc3..767538cdd 100644 --- a/PermissionController/res/values-gu-v33/strings.xml +++ b/PermissionController/res/values-gu-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"વધુ અલર્ટ"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"છોડી દીધેલા અલર્ટ"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{મોટું કરો અને વધુ એક અલર્ટ જુઓ}one{મોટું કરો અને વધુ # અલર્ટ જુઓ}other{મોટું કરો અને વધુ # અલર્ટ જુઓ}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"નાનું કરો"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"અલર્ટ. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"ક્રિયા પૂર્ણ થઈ"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"તમારા ડિવાઇસમાં સુરક્ષા ઉપાયો ઉમેરી શકે એવા સેટિંગ ચેક કરો"</string> diff --git a/PermissionController/res/values-gu/strings.xml b/PermissionController/res/values-gu/strings.xml index b97892c54..eca8f049a 100644 --- a/PermissionController/res/values-gu/strings.xml +++ b/PermissionController/res/values-gu/strings.xml @@ -64,7 +64,7 @@ <string name="unused_apps" msgid="2058057455175955094">"ન વપરાયેલી ઍપ"</string> <string name="edit_photos_description" msgid="5540108003480078892">"આ ઍપ માટે પસંદ કરેલા ફોટામાં ફેરફાર કરો"</string> <string name="no_unused_apps" msgid="12809387670415295">"કોઈ બિનવપરાયેલી ઍપ નથી"</string> - <string name="zero_unused_apps" msgid="9024448554157499748">"બિનવપરાયેલી 0 ઍપ"</string> + <string name="zero_unused_apps" msgid="9024448554157499748">"0 બિનવપરાયેલી ઍપ"</string> <string name="review_permission_decisions" msgid="309559429150613632">"પરવાનગી સંબંધિત નિર્ણયો"</string> <string name="review_permission_decisions_view_all" msgid="90391040431566130">"તાજેતરની પરવાનગી સંબંધિત બધા નિર્ણયો જુઓ"</string> <string name="review_permission_decisions_empty" msgid="8120775336417279806">"તાજેતરની પરવાનગી સંબંધિત કોઈ નિર્ણય નથી"</string> @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> પર આ ઍપ માટે <xliff:g id="PERM">%1$s</xliff:g>નો ઍક્સેસ"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"<xliff:g id="APP">%1$s</xliff:g>ની બધી પરવાનગીઓ જુઓ"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"આ પરવાનગી સાથે બધી ઍપ જુઓ"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"માહિતી"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"સેટિંગ"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"આસિસ્ટંટ દ્વારા વપરાયેલો માઇક્રોફોનની પરવાનગીનો ડેટા બતાવો"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"ન વપરાયેલી ઍપના સેટિંગ"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"ઍપ ઉપયોગમાં ન હોવા પર પરવાનગીઓ કાઢી નાખો"</string> @@ -355,7 +357,7 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"આ ઍપ તમારી સ્ક્રીન, ક્રિયાઓ તેમજ ઇનપુટ જોઈ શકે છે, ક્રિયાઓ કરી શકે છે અને ડિસ્પ્લેનું નિયંત્રણ કરી શકે છે."</string> <string name="role_assistant_label" msgid="4727586018198208128">"ડિફૉલ્ટ ડિજિટલ આસિસ્ટંટ ઍપ"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"ડિજિટલ આસિસ્ટંટ ઍપ"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"તમે જોઈ રહ્યા હો તે સ્ક્રીન પરની માહિતીના આધારે સહાયક ઍપ તમને સહાય કરી શકે છે. કેટલીક ઍપ્લિકેશનો તમને એકીકૃત સહાયતા આપવા માટે લૉન્ચર અને વૉઇસ ઇનપુટ સેવાઓ એમ બંનેને સમર્થન આપે છે."</string> + <string name="role_assistant_description" msgid="6622458130459922952">"તમે જોઈ રહ્યા હો તે સ્ક્રીન પરની માહિતીના આધારે સહાયક ઍપ તમને સહાય કરી શકે છે. કેટલીક ઍપ તમને એકીકૃત સહાયતા આપવા માટે લૉન્ચર અને વૉઇસ ઇનપુટ સેવાઓ બંનેને સમર્થન આપે છે."</string> <string name="role_browser_label" msgid="2877796144554070207">"ડિફૉલ્ટ બ્રાઉઝર ઍપ"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"બ્રાઉઝર ઍપ"</string> <string name="role_browser_description" msgid="3465253637499842671">"ઍપ કે જે તમને ઇન્ટરનેટનો ઍક્સેસ આપે અને તમે જેના પર ટૅપ કરો તે લિંક દર્શાવે"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"લિંક ખોલવી"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"કાર્ય માટે ડિફૉલ્ટ"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"ખાનગી સ્પેસ માટે ડિફૉલ્ટ"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"ડિવાઇસ માટે ઑપ્ટિમાઇઝ કરેલી છે"</string> + <string name="default_app_others" msgid="7793029848126079876">"અન્ય"</string> <string name="default_app_none" msgid="9084592086808194457">"કોઈ નહીં"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(સિસ્ટમ ડિફૉલ્ટ)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"કોઈ ઍપ નથી"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g>, ડિબગીંગ માહિતી અપલોડ કરવા માગે છે"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"શું ડિબગીંગનો ડેટા શેર કરવો છે?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"સિસ્ટમને સમસ્યા મળી છે."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> આ ડિવાઇસથી <xliff:g id="DATE">%2$s</xliff:g>ના રોજ <xliff:g id="TIME">%3$s</xliff:g> વાગ્યે લેવામાં આવેલ બગ રિપોર્ટ અપલોડ કરવાની મંજૂરી માગી રહી છે. બગ રિપોર્ટમાં તમારા ડિવાઇસ વિશે અથવા ઍપ દ્વારા લૉગ કરવામાં આવેલી વ્યક્તિગત માહિતી શામેલ હોય છે, જેમ કે વપરાશકર્તાનું નામ, સ્થાન ડેટા, ડિવાઇસ ઓળખકર્તા અને નેટવર્કની માહિતી. બગ રિપોર્ટને માત્ર તેવા જ લોકો અને ઍપ સાથે શેર કરો કે જેની પર તમે માહિતી બાબતે વિશ્વાસ કરો છો. <xliff:g id="APP_NAME_1">%4$s</xliff:g>ને બગ રિપોર્ટ અપલોડ કરવાની મંજૂરી આપીએ?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> આ ડિવાઇસથી <xliff:g id="DATE">%2$s</xliff:g>ના રોજ <xliff:g id="TIME">%3$s</xliff:g> વાગ્યે લેવામાં આવેલા બગ રિપોર્ટ અપલોડ કરવાની વિનંતી કરી રહી છે. બગ રિપોર્ટમાં તમારા ડિવાઇસ વિશે અથવા ઍપ દ્વારા લૉગ કરવામાં આવેલી વ્યક્તિગત માહિતી શામેલ હોય છે, જેમ કે વપરાશકર્તાનું નામ, લોકેશન ડેટા, ડિવાઇસ ઓળખકર્તા અને નેટવર્કની માહિતી. બગ રિપોર્ટને માત્ર તેવા જ લોકો અને ઍપ સાથે શેર કરો કે જેની પર તમે માહિતી બાબતે વિશ્વાસ કરો છો.\n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g>ને બગ રિપોર્ટ અપલોડ કરવાની મંજૂરી આપીએ?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> માટે ખામીની જાણકારીના રિપોર્ટ પર પ્રક્રિયા કરવામાં ભૂલ આવી હતી. તેથી ડિબગીંગના વિગતવાર ડેટાને શેર કરવાની વિનંતી નકારવામાં આવી છે. વિક્ષેપ બદલ માફ કરશો."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"મંજૂરી આપો"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"નકારો"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"પ્રતિબંધિત સેટિંગને મંજૂરી આપો"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"પ્રતિબંધિત સેટિંગ"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"તમારી સુરક્ષા માટે, આ સેટિંગ હાલમાં ઉપલબ્ધ નથી."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"ફોન કૉલ પર હોવા દરમિયાન આ ક્રિયા ઉપલબ્ધ હોતી નથી"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"કોઈ ફોન કૉલ દરમિયાન, કોઈ એક દ્વારા બીજી ઍપ ઇન્સ્ટૉલ કરવાની મંજૂરી આપવામાં આવતી નથી.\n\n સ્કૅમર દ્વારા ફોન કૉલ પરની વાતચીતો દરમિયાન આ પ્રકારની ક્રિયાની વિનંતી સામાન્ય રીતે કરવામાં આવતી હોય છે, તેથી તમારી સુરક્ષા માટે આને બ્લૉક કરવામાં આવે છે. જો કોઈ અજાણી વ્યક્તિ દ્વારા આ ક્રિયા કરવા માટે તમને માર્ગદર્શન આપવામાં આવતું હોય, તો આ સ્કૅમ હોઈ શકે છે."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"કૉલ દરમિયાન ક્રિયા પૂર્ણ કરી શકાતી નથી"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"તમારા ડિવાઇસ અને ડેટાને સુરક્ષિત રાખવા માટે આ સેટિંગ બ્લૉક કરવામાં આવ્યું છે.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>સ્કૅમર તમને નવા સૉર્સ પરથી અજાણી ઍપ ઇન્સ્ટૉલ કરવાનું કહીને હાનિકારક ઍપ ઇન્સ્ટૉલ કરવાનો પ્રયાસ કરી શકે છે."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>સ્કૅમર તમને કોઈ ઍપના ઍક્સેસની મંજૂરી આપવાનું કહીને તમારા ડિવાઇસને નિયંત્રિત કરવાનો પ્રયાસ કરી શકે છે."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"ઍપને <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>નો ઍક્સેસ નકારવામાં આવ્યો"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"આ ઍપ દ્વારા કોઈ સંવેદનશીલ માહિતીની પરવાનગીના ઍક્સેસની વિનંતી કરવામાં આવી છે, જેને કારણે તમારી વ્યક્તિગત અને નાણાકીય માહિતી જોખમમાં આવી શકે છે.<xliff:g id="ID_1"><br><br></xliff:g>એ પણ શક્ય છે કે આ પ્રતિબંધિત પરવાનગી વિના ઍપ કદાચ યોગ્ય રીતે કામ ન પણ કરી શકે. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>ઍક્સેસ મંજૂર કરવાની રીત જાણો</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"ઍપને ડિફૉલ્ટ <xliff:g id="ROLE_NAME">%1$s</xliff:g> બનવાનો ઍક્સેસ નકારવામાં આવ્યો"</string> diff --git a/PermissionController/res/values-hi-v33/strings.xml b/PermissionController/res/values-hi-v33/strings.xml index 9cf4f044d..ef727a060 100644 --- a/PermissionController/res/values-hi-v33/strings.xml +++ b/PermissionController/res/values-hi-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"ज़्यादा चेतावनियां"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"खारिज किए गए अलर्ट"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{कार्ड को बड़ा करके एक और सूचना देखें}one{कार्ड को बड़ा करके # और सूचना देखें}other{कार्ड को बड़ा करके # और सूचनाएं देखें}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"छोटा करें"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"चेतावनी. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"कार्रवाई पूरी हुई"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"आपके डिवाइस को सुरक्षित रखने वाली सेटिंग देखें"</string> @@ -40,7 +41,7 @@ <string name="safety_center_qs_privacy_control" msgid="1160682635058529673">"स्विच करें. <xliff:g id="PRIVACY_CONTROL_TITLE">%1$s</xliff:g>. <xliff:g id="PRIVACY_CONTROL_STATUS">%2$s</xliff:g>"</string> <string name="safety_center_qs_toggle_action" msgid="5920465736488119255">"टॉगल करें"</string> <string name="safety_center_qs_open_action" msgid="2760200829912423728">"खोलें"</string> - <string name="safety_center_review_settings_button" msgid="938981137942443930">"सेटिंग की समीक्षा करें"</string> + <string name="safety_center_review_settings_button" msgid="938981137942443930">"सेटिंग देखें"</string> <string name="safety_center_gear_label" msgid="5175877094379694098">"सेटिंग"</string> <string name="safety_center_info_label" msgid="8993181584061825412">"जानकारी"</string> </resources> diff --git a/PermissionController/res/values-hi/strings.xml b/PermissionController/res/values-hi/strings.xml index 54dceb35d..1c543caff 100644 --- a/PermissionController/res/values-hi/strings.xml +++ b/PermissionController/res/values-hi/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> पर इस ऐप्लिकेशन के लिए <xliff:g id="PERM">%1$s</xliff:g> का ऐक्सेस"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"<xliff:g id="APP">%1$s</xliff:g> को मिली सभी अनुमतियां देखें"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"इस अनुमति वाले सभी ऐप्लिकेशन देखें"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"जानकारी"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"सेटिंग"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"असिस्टेंट माइक्रोफ़ोन के इस्तेमाल से जुड़ा डेटा दिखाएं"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"इस्तेमाल न हो रहे ऐप के लिए सेटिंग"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"ऐप्लिकेशन का इस्तेमाल न होने पर अनुमतियां हटाएं"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"खुलने वाले लिंक"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"काम के लिए डिफ़ॉल्ट"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"प्राइवेट स्पेस के लिए डिफ़ॉल्ट ऐप्लिकेशन"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"डिवाइस के लिए ऑप्टिमाइज़ किया गया"</string> + <string name="default_app_others" msgid="7793029848126079876">"अन्य"</string> <string name="default_app_none" msgid="9084592086808194457">"कोई नहीं"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(सिस्टम डिफ़ॉल्ट)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"कोई ऐप्लिकेशन नहीं"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> डीबग करने की जानकारी अपलोड करना चाहता है."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"डीबग करने से जुड़ा डेटा शेयर करना चाहते हैं?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"सिस्टम को किसी समस्या का पता चला है."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> इस डिवाइस से <xliff:g id="DATE">%2$s</xliff:g> को <xliff:g id="TIME">%3$s</xliff:g> बजे ली गई गड़बड़ी की रिपोर्ट अपलोड करने की मंज़ूरी मांग रहा है. गड़बड़ी की रिपोर्ट में आपके डिवाइस के बारे में या ऐप्लिकेशन की ओर से लॉग की गई निजी जानकारी शामिल होती है, जैसे कि उपयोगकर्ता नाम, जगह की जानकारी का डेटा, डिवाइस पहचानकर्ता, और नेटवर्क की जानकारी. गड़बड़ी की रिपोर्ट सिर्फ़ उन लोगों और ऐप्लिकेशन के साथ शेयर करें जिन पर आप इस जानकारी को लेकर भरोसा करते हैं. क्या आप <xliff:g id="APP_NAME_1">%4$s</xliff:g> को गड़बड़ी की रिपोर्ट अपलोड करने देना चाहते हैं?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> इस डिवाइस से <xliff:g id="DATE">%2$s</xliff:g> को <xliff:g id="TIME">%3$s</xliff:g> बजे ली गई गड़बड़ी की रिपोर्ट अपलोड करने की मंज़ूरी मांग रहा है. गड़बड़ी की रिपोर्ट में आपके डिवाइस के बारे में या ऐप्लिकेशन की ओर से लॉग की गई निजी जानकारी शामिल होती है, जैसे कि उपयोगकर्ता नाम, जगह की जानकारी का डेटा, डिवाइस आइडेंटिफ़ायर, और नेटवर्क की जानकारी. गड़बड़ी की रिपोर्ट सिर्फ़ उन लोगों और ऐप्लिकेशन के साथ शेयर करें जिन पर आपको इस जानकारी को लेकर भरोसा हो.\n\nक्या <xliff:g id="APP_NAME_1">%4$s</xliff:g> को गड़बड़ी की रिपोर्ट अपलोड करने की अनुमति देनी है?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> के लिए गड़बड़ी की रिपोर्ट तैयार करने में दिक्कत हुई. इसलिए, डीबग करने के बारे में ज़्यादा जानकारी का डेटा शेयर नहींं किया जा सका. रुकावट के लिए खेद है."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"अनुमति दें"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"अनुमति न दें"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"पाबंदी वाली सेटिंग को अनुमति दें"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"इस सेटिंग पर पाबंदी लगाई गई है"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"आपकी सुरक्षा के लिए, यह सेटिंग फ़िलहाल उपलब्ध नहीं है."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"फ़ोन कॉल के दौरान, कार्रवाई नहीं की जा सकती"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"फ़ोन कॉल के दौरान, ऐप्लिकेशन को अन्य ऐप्लिकेशन इंस्टॉल करने की अनुमति नहीं है.\n\n फ़ोन पर बातचीत करते हुए, धोखाधड़ी करने वाले लोग अक्सर इस तरह की कार्रवाई करने का अनुरोध करते हैं. इसलिए, आपको सुरक्षित रखने के लिए यह अनुमति नहीं दी जाती है. अगर कोई अनज़ान व्यक्ति, आपको यह कार्रवाई करने के लिए कहता है, तो हो सकता है कि आपके साथ धोखाधड़ी की जा रही हो."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"कॉल के दौरान कार्रवाई पूरी नहीं की जा सकती"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"आपके डिवाइस और डेटा को सुरक्षित रखने के लिए, यह सेटिंग ब्लॉक की गई है. <xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>धोखाधड़ी करने वाले लोग, आपको नए सोर्स से अनजान ऐप्लिकेशन इंस्टॉल करने के लिए कहकर, आपके डिवाइस पर नुकसान पहुंचाने वाले ऐप्लिकेशन इंस्टॉल कराने की कोशिश कर सकते हैं."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>धोखाधड़ी करने वाले लोग, आपके डिवाइस में मौजूद किसी ऐप्लिकेशन को ऐक्सेस करने की अनुमति लेकर, आपके डिवाइस को कंट्रोल करने की कोशिश कर सकते हैं."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"ऐप्लिकेशन को, <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> को ऐक्सेस करने की अनुमति नहीं मिली"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"इस ऐप्लिकेशन ने संवेदनशील जानकारी ऐक्सेस करने का अनुरोध किया है. इसे अनुमति देने पर, आपकी निजी और वित्तीय जानकारी की सुरक्षा को खतरा हो सकता है.<xliff:g id="ID_1"><br><br></xliff:g>हालांकि, हो सकता है कि पाबंदी वाली अनुमति न मिलने पर, ऐप्लिकेशन सही तरह से काम न करें. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>ऐक्सेस देने का तरीका जानें</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"ऐप्लिकेशन को डिफ़ॉल्ट <xliff:g id="ROLE_NAME">%1$s</xliff:g> के तौर पर सेट करने की अनुमति नहीं दी गई"</string> diff --git a/PermissionController/res/values-hr-v33/strings.xml b/PermissionController/res/values-hr-v33/strings.xml index 77c8a200f..09df088d8 100644 --- a/PermissionController/res/values-hr-v33/strings.xml +++ b/PermissionController/res/values-hr-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Više upozorenja"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Odbačena upozorenja"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Proširite i pogledajte još jedno upozorenje}one{Proširite i pogledajte još # upozorenje}few{Proširite i pogledajte još # upozorenja}other{Proširite i pogledajte još # upozorenja}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Sažimanje"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Upozorenje. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Radnja je dovršena"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Provjerite postavke kojima možete dodatno zaštititi svoj uređaj"</string> diff --git a/PermissionController/res/values-hr/strings.xml b/PermissionController/res/values-hr/strings.xml index 7f268858a..d22700aee 100644 --- a/PermissionController/res/values-hr/strings.xml +++ b/PermissionController/res/values-hr/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Pristup značajke <xliff:g id="PERM">%1$s</xliff:g> za ovu aplikaciju na uređaju <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Pogledajte sva dopuštenja aplikacije <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Pogledajte sve aplikacije s tim dopuštenjem"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informacije"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Postavke"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Prikaz korištenja mikrofona Asistenta"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Postavke nekorištenih aplikacija"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Ukloni dopuštenja ako se aplikacija ne upotrebljava"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Otvaranje veza"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Zadano za posao"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Zadano za privatni prostor"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimizirano za uređaj"</string> + <string name="default_app_others" msgid="7793029848126079876">"Ostalo"</string> <string name="default_app_none" msgid="9084592086808194457">"Nijedna"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Zadana postavka sustava)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Nema aplikacija"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi prenijeti informacije o otklanjanju pogrešaka."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Dijeli podatke o otklanjanju pogrešaka?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Sistem je otkrio problem."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> zahtijeva prijenos izvješća o programskim pogreškama s ovog uređaja od <xliff:g id="DATE">%2$s</xliff:g> u <xliff:g id="TIME">%3$s</xliff:g>. Izvješća o programskim pogreškama sadržavaju osobne podatke o uređaju ili one koje su zabilježile aplikacije, kao što su korisnička imena, podaci o lokaciji, identifikatori uređaja i podaci o mreži. Izvješća o programskim pogreškama dijelite samo s osobama i aplikacijama koje smatrate pouzdanim. Želite li dopustiti aplikaciji <xliff:g id="APP_NAME_1">%4$s</xliff:g> prijenos izvješća o programskim pogreškama?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> zahtijeva prijenos izvješća o programskim pogreškama s ovog uređaja od <xliff:g id="DATE">%2$s</xliff:g> u <xliff:g id="TIME">%3$s</xliff:g>. Izvješća o programskim pogreškama uključuju osobne podatke o uređaju ili one koje su zabilježile aplikacije, kao što su korisnička imena, podaci o lokaciji, identifikatori uređaja i podaci o mreži. Izvješća o programskim pogreškama dijelite samo s osobama i aplikacijama koje smatrate pouzdanim.\n\nŽelite li aplikaciji <xliff:g id="APP_NAME_1">%4$s</xliff:g> dopustiti prijenos izvješća o programskim pogreškama?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Došlo je do pogreške pri obradi izvješća o programskoj pogrešci za aplikaciju <xliff:g id="APP_NAME">%1$s</xliff:g>. Stoga je odbijeno dijeljenje detaljnih podataka o otklanjanju pogrešaka. Ispričavamo se zbog prekida."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Dopusti"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Odbij"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Dopusti ograničene postavke"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Ograničena postavka"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Radi vaše sigurnosti ova postavka trenutačno nije dostupna."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Radnja nije dostupna tijekom telefonskog poziva"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Aplikacijama nije dopušteno instalirati druge aplikacije tijekom telefonskog poziva.\n\n Prevaranti često zahtijevaju tu vrstu radnje tijekom telefonskih razgovora, pa je ona blokirana radi vaše zaštite. Ako vas netko koga ne poznajete navodi na tu radnju, možda je riječ o prijevari."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Radnja se ne može dovršiti tijekom poziva"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Ta je postavka blokirana radi zaštite vašeg uređaja i podataka.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Prevaranti mogu pokušati instalirati štetne aplikacije tako da zatraže da instalirate nepoznate aplikacije iz novog izvora."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Prevaranti mogu pokušati preuzeti kontrolu nad vašim uređajem tako da zatraže da dopustite pristup uslugama pristupačnosti za aplikaciju."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Aplikaciji je odbijen pristup dopuštenju <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Aplikacija je zatražila pristup dopuštenju za osjetljive podatke koje može ugroziti vaše osobne i financijske podatke.<xliff:g id="ID_1"><br><br></xliff:g>Moguće je da aplikacija neće pravilno funkcionirati bez tog uskraćenog dopuštenja. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Saznajte kako omogućiti pristup</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Aplikaciji je uskraćeno da bude zadana <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-hu-v33/strings.xml b/PermissionController/res/values-hu-v33/strings.xml index ee454fc12..ede269016 100644 --- a/PermissionController/res/values-hu-v33/strings.xml +++ b/PermissionController/res/values-hu-v33/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="role_dialer_request_description" msgid="6188305064871543419">"Az alkalmazás engedélyt kap értesítések küldésére, és hozzáférhet majd a következőkhöz: Kamera, Névjegyek, Mikrofon, Telefon és SMS."</string> - <string name="role_sms_request_description" msgid="1506966389698625395">"Az alkalmazás engedélyt kap értesítések küldésére, és hozzáférhet majd a következőkhöz: Kamera, Címtár, Files, Mikrofon, Telefon és SMS."</string> + <string name="role_sms_request_description" msgid="1506966389698625395">"Az alkalmazás engedélyt kap értesítések küldésére, és hozzáférhet majd a következőkhöz: Kamera, Névjegyek, Fájlok, Mikrofon, Telefon és SMS."</string> <string name="permission_description_summary_storage" msgid="1917071243213043858">"Az ezzel az engedéllyel rendelkező alkalmazások hozzáférhetnek az ezen az eszközön lévő összes fájlhoz"</string> <string name="work_policy_title" msgid="832967780713677409">"Munkahelyi házirendekkel kapcsolatos adatok"</string> <string name="work_policy_summary" msgid="3886113358084963931">"A rendszergazda által kezelt beállítások"</string> @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Több értesítés"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Elvetett értesítések"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Ha kibontja, még egy értesítést láthat}other{Ha kibontja, még # értesítést láthat}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Összecsukás"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Figyelmeztetés. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Művelet befejezve"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Tekintse át a beállításokat, amelyek növelhetik eszköze védelmét"</string> diff --git a/PermissionController/res/values-hu/strings.xml b/PermissionController/res/values-hu/strings.xml index c1c8b3756..a387be47b 100644 --- a/PermissionController/res/values-hu/strings.xml +++ b/PermissionController/res/values-hu/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g> – hozzáférés az alkalmazás számára a(z) <xliff:g id="DEVICE_NAME">%2$s</xliff:g> eszközön"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"A(z) <xliff:g id="APP">%1$s</xliff:g> összes engedélyének megtekintése"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Az ezzel az engedéllyel rendelkező összes alkalmazás megtekintése"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Információ"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Beállítások"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Mikrofon Segéd általi használatának megjelenítése"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Nem használt alkalmazások beállításai"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Engedélyek eltávolítása, ha nem használja az alkalmazást"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Linkek megnyitása"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Munkahelyi alapértelmezett"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Alapértelmezett a magánterületnél"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Az eszközre optimalizálva"</string> + <string name="default_app_others" msgid="7793029848126079876">"Egyéb"</string> <string name="default_app_none" msgid="9084592086808194457">"Nincs"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Alapértelmezett)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Nincs alkalmazás"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> hibakeresési adatokat szeretne feltölteni."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Megosztja a hibakeresési adatokat?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"A rendszer problémát észlelt."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"A(z) <xliff:g id="APP_NAME_0">%1$s</xliff:g> hibajelentést szeretne feltölteni az eszközről (a jelentés létrehozásának időpontja: <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g>). A hibajelentések eszközre vonatkozó vagy alkalmazások által rögzített személyes adatokat tartalmazhatnak, például felhasználóneveket, helyadatokat, eszközazonosítókat és hálózati adatokat. Csak megbízható személyekkel és alkalmazásokkal osszon meg hibajelentéseket. Engedélyezi, hogy a(z) <xliff:g id="APP_NAME_1">%4$s</xliff:g> hibajelentést töltsön fel?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"A(z) <xliff:g id="APP_NAME_0">%1$s</xliff:g> hibajelentést szeretne feltölteni az eszközről (a jelentés létrehozásának időpontja: <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g>). A hibajelentések eszközre vonatkozó vagy alkalmazások által rögzített személyes adatokat tartalmazhatnak, például felhasználóneveket, helyadatokat, eszközazonosítókat és hálózati adatokat. Csak megbízható személyekkel és alkalmazásokkal osszon meg hibajelentéseket.\n\nEngedélyezi, hogy a(z) <xliff:g id="APP_NAME_1">%4$s</xliff:g> hibajelentést töltsön fel?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Hiba történt a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> alkalmazás hibajelentésének feldolgozásakor, ezért a rendszer megtagadta a részletes hibaelhárítási adatok megosztását. Elnézést a megszakításért."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Engedélyezés"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Elutasítás"</string> @@ -491,7 +495,7 @@ <string name="permgrouprequest_coarselocation_imagetext" msgid="8650605041483025297">"Hozzávetőleges"</string> <string name="permgrouprequest_calendar" msgid="1493150855673603806">"Engedélyezi a(z) <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> számára, hogy hozzáférjen a naptárhoz?"</string> <string name="permgrouprequest_device_aware_calendar" msgid="7161929851377463612">"Engedélyezi a(z) <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> számára, hogy hozzáférjen a naptárához ezen az eszközön: <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g>’s</b>?"</string> - <string name="permgrouprequest_sms" msgid="5672063688745420991">"Engedélyezi a(z) <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> számára, hogy SMS-eket küldhessen és tekinthessen meg?"</string> + <string name="permgrouprequest_sms" msgid="5672063688745420991">"Engedélyezi a(z) <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> számára SMS-ek küldését és megtekintését?"</string> <string name="permgrouprequest_device_aware_sms" msgid="6639977653040502291">"Engedélyezi a(z) <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> számára az SMS-ek küldését és megtekintését ezen az eszközön: <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>?"</string> <string name="permgrouprequest_storage" msgid="8717773092518621602">"Engedélyezi a(z) <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> számára, hogy hozzáférjen az eszközön tárolt fotókhoz, médiatartalmakhoz és fájlokhoz?"</string> <string name="permgrouprequest_device_aware_storage" msgid="6933251810928606636">"Engedélyezi a(z) <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> számára, hogy fotókhoz, médiatartalmakhoz és fájlokhoz férjen hozzá ezen az eszközön: <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>?"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Korlátozott beállítások engedélyezése"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Korlátozott beállítás"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Biztonsága érdekében ez a beállítás jelenleg nem használható."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"A művelet nem végezhető el telefonhívás közben"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Telefonhívás közben nem lehet engedélyezni, hogy alkalmazások más alkalmazásokat telepítsenek.\n\n A csalók gyakran kérik ilyen jellegű műveletek végrehajtását a telefonhívások során, ezért a rendszer az Ön védelme érdekében letiltja ezt a lehetőséget. Ha valaki, akit nem ismer, arra kéri, hogy végezze el ezt a műveletet, előfordulhat, hogy csalárd szándékkal teszi."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"A művelet nem végezhető el hívás közben"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Ez a beállítás le van tiltva az eszköz és az adatok védelme érdekében.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Csalók megpróbálhatnak kártékony alkalmazásokat telepíteni úgy, hogy arra kérik, telepítsen ismeretlen alkalmazásokat egy új forrásból."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Csalók megpróbálhatják átvenni az eszköz feletti irányítást úgy, hogy arra kérik, engedélyezze a kisegítő lehetőségekhez való hozzáférést egy alkalmazás számára."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Az app nem kapott hozzáférést a következőhöz: <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Az alkalmazás hozzáférési engedélyt kért a bizalmas adatokhoz, ami veszélybe sodorhatja az Ön személyes és pénzügyi adatait.<xliff:g id="ID_1"><br><br></xliff:g>Lehetséges, hogy az alkalmazás nem működik megfelelően enélkül a korlátozott engedély nélkül. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>További információ a hozzáférés megadásának módjáról.</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Az app nem kapott hozzáférést a következőhöz: alapértelmezett <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-hy-v33/strings.xml b/PermissionController/res/values-hy-v33/strings.xml index 6efb079ef..790addb16 100644 --- a/PermissionController/res/values-hy-v33/strings.xml +++ b/PermissionController/res/values-hy-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Այլ ծանուցումներ"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Անտեսված ծանուցումներ"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Ծավալել և տեսնել ևս մեկ զգուշացում}one{Ծավալել և տեսնել ևս # զգուշացում}other{Ծավալել և տեսնել ևս # զգուշացում}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Ծալել"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Ծանուցում։ <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Գործողությունն ավարտված է"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Ծանոթացեք կարգավորումներին, որոնց օգնությամբ կարող եք բարձրացնել ձեր սարքի անվտանգության մակարդակը"</string> diff --git a/PermissionController/res/values-hy/strings.xml b/PermissionController/res/values-hy/strings.xml index 91b3e5bb6..7b686e5fb 100644 --- a/PermissionController/res/values-hy/strings.xml +++ b/PermissionController/res/values-hy/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g>ն օգտագործելու թույլտվություն այս հավելվածի համար <xliff:g id="DEVICE_NAME">%2$s</xliff:g> սարքում"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Տեսնել «<xliff:g id="APP">%1$s</xliff:g>» հավելվածի բոլոր թույլտվությունները"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Դիտել այս թույլտվությունն ունեցող հավելվածների ցանկը"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Տեղեկություններ"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Կարգավորումներ"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Ցույց տալ օգնականի կողմից խոսափողի օգտագործման վիճակագրությունը"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Չօգտագործվող հավելվածների կարգավորումներ"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Հեռացնել թույլտվությունները, եթե հավելվածը չի օգտագործվում"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Հղումների բացում"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Կանխադրված՝ աշխատանքի համար"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Կանխադրված հավելվածներ մասնավոր տարածքի համար"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Սարքի համար օպտիմալացված"</string> + <string name="default_app_others" msgid="7793029848126079876">"Այլ"</string> <string name="default_app_none" msgid="9084592086808194457">"Չկա"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Համակարգի կանխադրված հավելված)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Հավելվածներ չկան"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ն ուզում է վերբեռնել վրիպազերծման տվյալները:"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Ուղարկե՞լ վրիպազերծման տվյալները"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Համակարգը խնդիր է հայտնաբերել"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g>-ը թույլտվություն է խնդրում՝ <xliff:g id="DATE">%2$s</xliff:g>, ժամը <xliff:g id="TIME">%3$s</xliff:g> ստեղծված վրիպակների հաշվետվությունն այս սարքից վերբեռնելու համար: Վրիպակների հաշվետվությունները ներառում են տվյալներ ձեր սարքի մասին կամ անձնական տվյալներ, որոնք գրանցվել են հավելվածների կողմից, օրինակ՝ օգտատերերի անուններ, տեղադրության մասին տվյալներ, սարքերի ID-ներ և ցանցի մասին տեղեկություններ: Վրիպակների հաշվետվություններով կիսվեք միայն այն մարդկանց ու հավելվածների հետ, որոնց կարող եք վստահել այս տեղեկությունները: Թույլատրե՞լ <xliff:g id="APP_NAME_1">%4$s</xliff:g>-ին վերբեռնել վրիպակների հաշվետվությունը:"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g>-ը թույլտվություն է խնդրում՝ <xliff:g id="DATE">%2$s</xliff:g>, ժամը <xliff:g id="TIME">%3$s</xliff:g> ստեղծված վրիպակների հաշվետվությունն այս սարքից վերբեռնելու համար։ Վրիպակների հաշվետվությունները ներառում են տվյալներ ձեր սարքի մասին կամ անձնական տվյալներ, որոնք գրանցվել են հավելվածների կողմից, օրինակ՝ օգտատերերի անուններ, տեղադրության մասին տվյալներ, սարքերի ID-ներ և ցանցի մասին տեղեկություններ։ Վրիպակների հաշվետվություններով կիսվեք միայն այն մարդկանց ու հավելվածների հետ, որոնց կարող եք վստահել այս տեղեկությունները։ \n\nԹույլատրե՞լ <xliff:g id="APP_NAME_1">%4$s</xliff:g> վերբեռնել վրիպակների մասին հաղորդումը։"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Չհաջողվեց մշակել <xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածում սխալի մասին տեղեկությունները։ Վրիպազերծման տվյալների ուղարկումը չեղարկվել է։ Հայցում ենք ձեր ներողամտությունը պատճառած անհարմարության համար:"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Թույլատրել"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Մերժել"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Թույլատրել սահմանափակ ռեժիմի կարգավորումները"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Սահմանափակումներով կարգավորում"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Անվտանգության նկատառումներից ելնելով՝ այս կարգավորումը ներկայումս անհասանելի է։"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Գործողությունը հասանելի չէ հեռախոսազանգի ժամանակ"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Հեռախոսազանգի ժամանակ հավելվածներին չի թույլատրվում տեղադրել այլ հավելվածներ։\n\n Խաբեբաները սովորաբար ցանկանում են այս տեսակի գործողություններն անել հեռախոսային զրույցների ժամանակ, ուստի դա արգելափակված է՝ ձեր անվտանգության նկատառումներից ելնելով։ Եթե որևէ անծանոթ մարդ ձեզանից խնդրել է նմանատիպ թույլտվություն, ամենայն հավանականությամբ դա խարդախություն է։"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Զանգի ընթացքում հնարավոր չէ կատարել գործողությունը"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>. այս կարգավորումն արգելափակված է՝ ձեր սարքի և տվյալների անվտանգության նկատառումներից դուրս գալով։"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Խաբեբաները կարող են փորձել վտանգավոր հավելվածներ տեղադրել ձեր սարքում՝ ձեզ խնդրելով, որ նոր աղբյուրից անհայտ հավելվածներ տեղադրեք։"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Խաբեբաները կարող են խնդրել ձեզ, որ տրամադրեք հավելվածների հատուկ գործառույթների հասանելիություն՝ փորձելով առգրավել ձեր սարքի կառավարումը։"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Հավելվածին մերժվել է <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>ի օգտագործման թույլտվությունը"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Հավելվածը հայցել է կոնֆիդենցիալ տեղեկությունների օգտագործման թույլտվություն, որը կարող է վտանգի ենթարկել ձեր անձնական և ֆինանսական տեղեկությունները։<xliff:g id="ID_1"><br><br></xliff:g>Հնարավոր է, որ առանց այս սահմանափակված թույլտվության՝ հավելվածը չաշխատի պատշաճ կերպով։ <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Ինչպես տրամադրել տվյալների օգտագործման թույլտվություն</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Հավելվածին մերժվել է «<xliff:g id="ROLE_NAME">%1$s</xliff:g>» կատեգորիայում կանխադրված լինելու թույլտվությունը"</string> diff --git a/PermissionController/res/values-in-v33/strings.xml b/PermissionController/res/values-in-v33/strings.xml index 90be234ea..32f0c44fe 100644 --- a/PermissionController/res/values-in-v33/strings.xml +++ b/PermissionController/res/values-in-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Peringatan lain"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Peringatan yang ditutup"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Luaskan untuk melihat satu peringatan lain}other{Luaskan untuk melihat # peringatan lain}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Ciutkan"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Peringatan. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Tindakan selesai"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Periksa setelan yang dapat menambahkan perlindungan ke perangkat Anda"</string> diff --git a/PermissionController/res/values-in/strings.xml b/PermissionController/res/values-in/strings.xml index 9ee6d5b8b..078e1804b 100644 --- a/PermissionController/res/values-in/strings.xml +++ b/PermissionController/res/values-in/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Akses <xliff:g id="PERM">%1$s</xliff:g> untuk aplikasi ini di <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Lihat semua izin <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Lihat semua aplikasi yang memiliki izin ini"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informasi"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Setelan"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Tampilkan penggunaan mikrofon Asisten"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Setelan aplikasi yang tidak digunakan"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Hapus izin jika aplikasi tidak digunakan"</string> @@ -355,7 +357,7 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"Aplikasi ini dapat menampilkan layar, tindakan, dan masukan Anda, melakukan tindakan, dan mengontrol tampilan."</string> <string name="role_assistant_label" msgid="4727586018198208128">"Aplikasi asisten digital default"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"Aplikasi asisten digital"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"Aplikasi bantuan dapat membantu Anda berdasarkan informasi dari layar yang sedang Anda lihat. Beberapa aplikasi mendukung peluncur dan layanan masukan suara untuk memberikan bantuan terintegrasi."</string> + <string name="role_assistant_description" msgid="6622458130459922952">"Aplikasi asisten dapat membantu Anda berdasarkan informasi dari layar yang sedang Anda lihat. Beberapa aplikasi mendukung layanan peluncur dan input suara untuk memberikan bantuan terintegrasi."</string> <string name="role_browser_label" msgid="2877796144554070207">"Aplikasi browser default"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"Aplikasi browser"</string> <string name="role_browser_description" msgid="3465253637499842671">"Aplikasi yang memberi Anda akses ke internet dan menampilkan link yang Anda ketuk"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Membuka link"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Default untuk kerja"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Default untuk ruang privasi"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Dioptimalkan untuk perangkat"</string> + <string name="default_app_others" msgid="7793029848126079876">"Lainnya"</string> <string name="default_app_none" msgid="9084592086808194457">"Tidak ada"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Default sistem)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Tidak ada aplikasi"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengupload informasi proses debug."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Bagikan data proses debug?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Sistem mendeteksi adanya masalah."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> meminta untuk mengupload laporan bug dari perangkat ini yang diambil pada <xliff:g id="DATE">%2$s</xliff:g> pukul <xliff:g id="TIME">%3$s</xliff:g>. Laporan bug mencakup informasi pribadi tentang perangkat Anda atau yang dicatat dalam log oleh aplikasi, misalnya, nama pengguna, data lokasi, ID perangkat, dan informasi jaringan. Bagikan laporan bug hanya kepada orang dan aplikasi yang Anda percayai dengan informasi ini. Izinkan <xliff:g id="APP_NAME_1">%4$s</xliff:g> mengupload laporan bug?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> meminta untuk mengupload laporan bug dari perangkat ini yang diambil pada <xliff:g id="DATE">%2$s</xliff:g> pukul <xliff:g id="TIME">%3$s</xliff:g>. Laporan bug mencakup informasi pribadi tentang perangkat Anda atau yang dicatat dalam log oleh aplikasi, misalnya, nama pengguna, data lokasi, ID perangkat, dan informasi jaringan. Bagikan laporan bug hanya kepada orang dan aplikasi yang Anda percayai untuk menggunakan informasi ini.\n\nIzinkan <xliff:g id="APP_NAME_1">%4$s</xliff:g> mengupload laporan bug?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Terjadi error saat memproses laporan bug untuk <xliff:g id="APP_NAME">%1$s</xliff:g>. Jadi, tindakan membagikan detail data proses debug telah ditolak. Mohon maaf atas gangguan ini."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Izinkan"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Tolak"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Izinkan setelan terbatas"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Setelan terbatas"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Demi keamanan Anda, setelan ini tidak tersedia untuk saat ini."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Tindakan tidak tersedia selama panggilan telepon"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Mengizinkan aplikasi menginstal aplikasi lain tidak diizinkan selama panggilan telepon berlangsung.\n\n Scammer sering meminta jenis tindakan ini selama percakapan panggilan telepon, jadi tindakan ini diblokir untuk melindungi Anda. Jika Anda diarahkan untuk melakukan tindakan ini oleh seseorang yang tidak Anda kenal, hal tersebut mungkin merupakan scam."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Tidak bisa selesaikan tindakan selama panggilan"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Setelan ini diblokir untuk melindungi perangkat dan data Anda.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Scammer mungkin mencoba menginstal aplikasi berbahaya dengan meminta Anda menginstal aplikasi tidak dikenal dari sumber baru."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Scammer mungkin mencoba mengambil kendali perangkat Anda dengan meminta Anda mengizinkan akses aksesibilitas untuk suatu aplikasi."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Aplikasi ditolak aksesnya ke <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Aplikasi meminta akses ke izin sensitif yang dapat membahayakan info pribadi dan keuangan Anda.<xliff:g id="ID_1"><br><br></xliff:g>Aplikasi mungkin tidak dapat berfungsi dengan baik tanpa izin terbatas ini. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>&gtPelajari cara mengizinkan akses</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Aplikasi ditolak aksesnya untuk menjadi <xliff:g id="ROLE_NAME">%1$s</xliff:g> default"</string> diff --git a/PermissionController/res/values-is-v33/strings.xml b/PermissionController/res/values-is-v33/strings.xml index 3f7695027..ae065f689 100644 --- a/PermissionController/res/values-is-v33/strings.xml +++ b/PermissionController/res/values-is-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Fleiri tilkynningar"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Hunsaðar viðvaranir"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Stækka og sjá eina viðvörun í viðbót}one{Stækka og sjá # viðvörun í viðbót}other{Stækka og sjá # viðvaranir í viðbót}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Minnka"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Viðvörun. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Aðgerð lokið"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Skoðunarstillingar sem geta bætt öryggi tækisins þíns"</string> diff --git a/PermissionController/res/values-is/strings.xml b/PermissionController/res/values-is/strings.xml index bd8d62dad..a4872c6b7 100644 --- a/PermissionController/res/values-is/strings.xml +++ b/PermissionController/res/values-is/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Aðgangur að <xliff:g id="PERM">%1$s</xliff:g> fyrir þetta forrit í <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Sjá allar heimildir fyrir „<xliff:g id="APP">%1$s</xliff:g>“"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Sjá öll forrit með þessa heimild"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Upplýsingar"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Stillingar"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Sýna hljóðnemanotkun hjálpara"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Ónotaðar forritastillingar"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Fjarlægja heimildir ef forrit er ekki notað"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Opnun tengla"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Sjálfgefið fyrir vinnu"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Sjálfgefið fyrir leynirými"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Fínstillt fyrir tæki"</string> + <string name="default_app_others" msgid="7793029848126079876">"Annað"</string> <string name="default_app_none" msgid="9084592086808194457">"Ekkert"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Sjálfgildi kerfis)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Engin forrit"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill hlaða inn upplýsingum um villuleit."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Viltu deila villuleitargögnum?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Kerfið greindi vandamál."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> biður um að hlaða inn villutilkynningu úr þessu tæki frá <xliff:g id="DATE">%2$s</xliff:g> kl. <xliff:g id="TIME">%3$s</xliff:g>. Villutilkynningar innihalda persónuupplýsingar um tækið eða upplýsingar sem forrit skrá, til dæmis notendanöfn, staðsetningargögn, auðkenni tækis og upplýsingar um netkerfi. Deildu aðeins villutilkynningum með fólki og forritum sem þú treystir fyrir þessum upplýsingum. Leyfa <xliff:g id="APP_NAME_1">%4$s</xliff:g> að hlaða inn villutilkynningu?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> biður um að fá að hlaða upp villutilkynningu úr þessu tæki sem skráð var þann <xliff:g id="DATE">%2$s</xliff:g> kl. <xliff:g id="TIME">%3$s</xliff:g>. Villutilkynningar innihalda persónuupplýsingar um tækið þitt eða sem forrit skrá, til dæmis notendanöfn, staðsetningargögn, auðkenni tækja og upplýsingar um netkerfi. Gættu þess að deila villutilkynningum eingöngu með fólki og forritum sem þú treystir fyrir þessum upplýsingum.\n\nLeyfa <xliff:g id="APP_NAME_1">%4$s</xliff:g> að hlaða upp villutilkynningu?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Villa kom upp við vinnslu villuskýrslu fyrir <xliff:g id="APP_NAME">%1$s</xliff:g> og því er ekki hægt að deila ítarlegum villuleitargögnum. Afsakaðu truflunina."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Leyfa"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Hafna"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Leyfa takmarkaðar stillingar"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Takmörkuð stilling"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Til að tryggja öryggi þitt er þessi stilling ekki tiltæk eins og er."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Aðgerð ekki í boði á meðan á símtali stendur"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Ekki er heimilt að leyfa forritum að setja önnur forrit upp á meðan á símtali stendur.\n\n Svikarar eiga það til að biðja notendur um að framkvæma aðgerðir á borð við þessa á meðan á samtali stendur. Þar af leiðandi er lokað á hana til að vernda þig. Ef einhver sem þú þekkir ekki bað þig um að framkvæma þessa aðgerð gæti verið um svik að ræða."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Ekki hægt að ljúka við aðgerð meðan á símtali stendur"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Lokað er á þessa stillingu til að gæta að öryggi tækisins þíns og gagna.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Svindlarar gætu reynt að setja upp skaðleg forrit með því að biðja þig um að setja upp óþekkt forrit af nýjum uppruna."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Svindlarar gætu reynt að ná stjórn yfir tækinu þínu með því að biðja um aðgang að aðgengi forrits."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Forritið fékk ekki aðgang að <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Forritið bað um aðgang að heimild fyrir viðkvæmu efni sem getur stofnað persónu- og fjármálaupplýsingum þínum í hættu.<xliff:g id="ID_1"><br><br></xliff:g>Forritið virkar hugsanlega ekki sem skyldi án þessarar takmörkuðu heimildar. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Kynntu þér hvernig þú leyfir aðgang</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Forritið fékk ekki aðgang að sjálfgefnu <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-it-v33/strings.xml b/PermissionController/res/values-it-v33/strings.xml index 9bea693c9..59eef5b89 100644 --- a/PermissionController/res/values-it-v33/strings.xml +++ b/PermissionController/res/values-it-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Altri avvisi"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Avvisi chiusi"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Espandi e visualizza un altro avviso}many{Espandi e visualizza altri # di avvisi}other{Espandi e visualizza altri # avvisi}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Comprimi"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Avviso. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Azione completata"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Controlla le impostazioni che possono proteggere meglio il tuo dispositivo"</string> diff --git a/PermissionController/res/values-it/strings.xml b/PermissionController/res/values-it/strings.xml index d2b42e28b..91404512f 100644 --- a/PermissionController/res/values-it/strings.xml +++ b/PermissionController/res/values-it/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g> accesso per questa app su <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Mostra tutte le autorizzazioni di <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Mostra tutte le app con questa autorizzazione"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informazioni"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Impostazioni"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Mostra utilizzo microfono dell\'assistente"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Impostazioni app inutilizzate"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Rimuovi autorizzazioni se non in uso"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Apertura link"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Predefinite per il lavoro"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Predefinite per lo spazio privato"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Ottimizzate per il dispositivo"</string> + <string name="default_app_others" msgid="7793029848126079876">"Altre"</string> <string name="default_app_none" msgid="9084592086808194457">"Nessuna"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Predefinita)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Nessuna app"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"L\'app <xliff:g id="APP_NAME">%1$s</xliff:g> vorrebbe caricare informazioni di debug."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Vuoi condividere i dati di debug?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Il sistema ha rilevato un problema."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"L\'app <xliff:g id="APP_NAME_0">%1$s</xliff:g> chiede di caricare una segnalazione di bug da questo dispositivo fatta il giorno <xliff:g id="DATE">%2$s</xliff:g> alle ore <xliff:g id="TIME">%3$s</xliff:g>. Le segnalazioni di bug includono informazioni personali relative al tuo dispositivo oppure registrate dalle app, ad esempio nomi utente, dati sulla posizione, identificatori dei dispositivi e informazioni sulle reti. Condividi le segnalazioni di bug solo con persone e app che ritieni affidabili. Consentire all\'app <xliff:g id="APP_NAME_1">%4$s</xliff:g> di caricare una segnalazione di bug?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"L\'app <xliff:g id="APP_NAME_0">%1$s</xliff:g> chiede di caricare una segnalazione di bug da questo dispositivo fatta il giorno <xliff:g id="DATE">%2$s</xliff:g> alle ore <xliff:g id="TIME">%3$s</xliff:g>. Le segnalazioni di bug includono informazioni personali relative al tuo dispositivo oppure registrate dalle app, ad esempio nomi utente, dati sulla posizione, identificatori dei dispositivi e informazioni sulle reti. Condividi le segnalazioni di bug solo con persone e app che ritieni affidabili.\n\nConsentire all\'app <xliff:g id="APP_NAME_1">%4$s</xliff:g> di caricare una segnalazione di bug?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Si è verificato un errore durante l\'elaborazione della segnalazione di bug per l\'app <xliff:g id="APP_NAME">%1$s</xliff:g>. Di conseguenza, la condivisione dei dati di debug dettagliati è stata negata. Siamo spiacenti per l\'interruzione."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Consenti"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Rifiuta"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Consenti impostazioni con limitazioni"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Impostazione con limitazioni"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Per la tua sicurezza, questa impostazione non è al momento disponibile."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Azione non disponibile durante una telefonata"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"È vietato consentire alle app di installare altre app durante una telefonata.\n\n I truffatori richiedono spesso questo tipo di azione durante le conversazioni telefoniche, quindi è bloccata per proteggerti. Se qualcuno che non conosci ti guida a compiere questa azione, potrebbe trattarsi di una truffa."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Impossibile completare l\'azione durante la chiamata"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Questa impostazione è bloccata per proteggere il tuo dispositivo e i tuoi dati.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>I truffatori potrebbero tentare di installare app dannose chiedendoti di installare app sconosciute da una nuova origine."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>I truffatori potrebbero tentare di prendere il controllo del tuo dispositivo chiedendoti di consentire l\'accesso ai servizi di accessibilità di un\'app."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"All\'app è stato negato l\'accesso a <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"L\'app ha richiesto l\'accesso a un\'autorizzazione sensibile che può mettere a rischio le tue informazioni finanziarie e personali.<xliff:g id="ID_1"><br><br></xliff:g>È possibile che l\'app non funzioni correttamente senza questa autorizzazione limitata. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Scopri di più su come consentire l\'accesso</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"All\'app è stato negato l\'accesso al ruolo <xliff:g id="ROLE_NAME">%1$s</xliff:g> predefinita"</string> diff --git a/PermissionController/res/values-iw-v33/strings.xml b/PermissionController/res/values-iw-v33/strings.xml index b94c5f360..b8ded1655 100644 --- a/PermissionController/res/values-iw-v33/strings.xml +++ b/PermissionController/res/values-iw-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"התראות נוספות"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"התראות שנסגרו"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{הרחבה וצפייה בהתראה נוספת אחת}one{הרחבה וצפייה ב-# התראות נוספות}two{הרחבה וצפייה ב-# התראות נוספות}other{הרחבה וצפייה ב-# התראות נוספות}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"כיווץ"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"התראה. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"הפעולה הושלמה"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"בדיקת ההגדרות שיכולות לשפר את ההגנה על המכשיר"</string> diff --git a/PermissionController/res/values-iw/strings.xml b/PermissionController/res/values-iw/strings.xml index be7a19ca0..e8fa30442 100644 --- a/PermissionController/res/values-iw/strings.xml +++ b/PermissionController/res/values-iw/strings.xml @@ -202,11 +202,13 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"גישה ל<xliff:g id="PERM">%1$s</xliff:g> לאפליקציה הזו ב<xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"הצגת כל ההרשאות של \'<xliff:g id="APP">%1$s</xliff:g>\'"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"אני רוצה לראות את כל האפליקציות עם ההרשאה הזו"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"מידע"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"הגדרות"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"השימוש במיקרופון של Assistant"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"הגדרות של אפליקציות שמזמן לא השתמשת בהן"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"הסרת ההרשאות כשלא בשימוש"</string> <string name="unused_apps_label" msgid="2595428768404901064">"הסרת הרשאות ופינוי מקום אחסון"</string> - <string name="unused_apps_label_v2" msgid="7058776770056517980">"השהיית הפעילות באפליקציה אם אין בה שימוש"</string> + <string name="unused_apps_label_v2" msgid="7058776770056517980">"השהיית האפליקציה אם מזמן לא נפתחה"</string> <string name="unused_apps_label_v3" msgid="693340578642156657">"הגבלת האפליקציה כשהיא לא בשימוש"</string> <string name="unused_apps_summary" msgid="8839466950318403115">"הסרת ההרשאות, מחיקה של הקבצים הזמניים, הפסקה של קבלת ההתראות"</string> <string name="unused_apps_summary_v2" msgid="5011313200815115802">"ההרשאות יוסרו, הקבצים הזמניים יימחקו, ההתראות יופסקו והאפליקציה תעבור לארכיון"</string> @@ -355,7 +357,7 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"האפליקציות האלה יכולות להציג את המסך, הפעולות והקלט שלך, וכן לבצע פעולות ולשלוט בתצוגה."</string> <string name="role_assistant_label" msgid="4727586018198208128">"עוזר דיגיטלי כברירת המחדל"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"אפליקציית עוזר דיגיטלי"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"אפליקציות עזרה יכולות לסייע על סמך המידע שמוצג לך במסך. אפליקציות מסוימות תומכות גם בשירותי מרכז אפליקציות וגם בקלט קולי כדי לספק סיוע משולב."</string> + <string name="role_assistant_description" msgid="6622458130459922952">"אפליקציות של עוזרים אישיים יכולות לסייע לפי המידע שמופיע על במסך. יש אפליקציות שתומכות גם בשירותי מרכז אפליקציות וגם בקלט קולי כדי לספק סיוע משולב."</string> <string name="role_browser_label" msgid="2877796144554070207">"אפליקציית ברירת מחדל לדפדפן"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"אפליקציית דפדפן"</string> <string name="role_browser_description" msgid="3465253637499842671">"אפליקציות שמספקות לך גישה לאינטרנט ומציגות קישורים ללחיצה"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"פתיחת קישורים"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"ברירת מחדל לעבודה"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"ברירת מחדל עבור המרחב הפרטי"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"מותאמות למכשיר"</string> + <string name="default_app_others" msgid="7793029848126079876">"אחרות"</string> <string name="default_app_none" msgid="9084592086808194457">"ללא"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(ברירת מחדל של המערכת)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"אין אפליקציות"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"האפליקציה <xliff:g id="APP_NAME">%1$s</xliff:g> מבקשת להעלות נתונים של ניפוי באגים."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"לשתף נתונים של ניפוי באגים?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"המערכת איתרה בעיה."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> מבקשת להעלות דוח על באגים מהמכשיר הזה, שנוצר בתאריך <xliff:g id="DATE">%2$s</xliff:g> בשעה <xliff:g id="TIME">%3$s</xliff:g>. דוחות על באגים כוללים מידע אישי על המכשיר או מידע אישי שנשמר באמצעות אפליקציות. למשל, שמות משתמשים, נתוני מיקום, מזהי מכשיר ופרטי רשת. יש לשתף דוחות על באגים רק עם אפליקציות ואנשים שאמינים בעיניך. לאפשר לאפליקציית <xliff:g id="APP_NAME_1">%4$s</xliff:g> להעלות דוח על באגים?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"אפליקציית <xliff:g id="APP_NAME_0">%1$s</xliff:g> מבקשת להעלות מהמכשיר הזה דוח איתור באגים, שנוצר בתאריך <xliff:g id="DATE">%2$s</xliff:g> בשעה <xliff:g id="TIME">%3$s</xliff:g>. דוחות של איתור באגים כוללים מידע אישי מהמכשיר או מידע כזה שנשמר באמצעות אפליקציות. למשל שמות משתמשים, נתוני מיקום, מזהי מכשיר ופרטי רשת. יש לשתף דוחות איתור באגים רק עם אפליקציות מהימנות ואנשים שסומכים עליהם.\n\nלאפשר לאפליקציית <xliff:g id="APP_NAME_1">%4$s</xliff:g> להעלות דוח איתור באגים?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"אירעה שגיאה בעיבוד הדוח על הבאג עבור <xliff:g id="APP_NAME">%1$s</xliff:g>. לכן, נדחה שיתוף הנתונים המפורטים לגבי ניפוי השגיאות. מצטערים על ההפרעה."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"כן, זה בסדר"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"אני לא מרשה"</string> @@ -471,7 +475,7 @@ <string name="permgrouprequest_device_aware_storage_isolated" msgid="6463062962458809752">"לתת לאפליקציה <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> הרשאת גישה לתמונות ולמדיה במכשיר <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>?"</string> <string name="permgrouprequest_contacts" msgid="8391550064551053695">"לתת לאפליקציה <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> הרשאת גישה לאנשי הקשר שלך?"</string> <string name="permgrouprequest_device_aware_contacts" msgid="731025863972535928">"לתת לאפליקציה <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> הרשאת גישה לאנשי הקשר במכשיר <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>?"</string> - <string name="permgrouprequest_location" msgid="6990232580121067883">"לתת לאפליקציה \'<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>\' הרשאת גישה למיקום המכשיר?"</string> + <string name="permgrouprequest_location" msgid="6990232580121067883">"לתת לאפליקציה \"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>\" הרשאת גישה למיקום המכשיר?"</string> <string name="permgrouprequest_device_aware_location" msgid="6075412127429878638">"לתת לאפליקציה <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> הרשאת גישה למיקום של <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>?"</string> <string name="permgrouprequestdetail_location" msgid="2635935335778429894">"לאפליקציה תהיה גישה אל נתוני המיקום רק בזמן השימוש בה"</string> <string name="permgroupbackgroundrequest_location" msgid="1085680897265734809">"לתת לאפליקציה <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> הרשאת גישה למיקום המכשיר?"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"הרשאה להגדרות מוגבלות"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"הגדרה מוגבלת"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"מטעמי אבטחה, ההגדרה הזו לא זמינה כרגע."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"הפעולה לא זמינה במהלך שיחת טלפון"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"אי אפשר לתת לאפליקציות הרשאה להתקין אפליקציות אחרות במהלך שיחת טלפון.\n\n לרוב, אנשים שמבצעים תרמיות מבקשים לבצע פעולות מהסוג הזה במהלך שיחות טלפון, לכן הפעולה הזו חסומה כדי להגן עליך. אם מישהו לא מוכר מנחה אותך לבצע את הפעולה הזו, יכול להיות שמדובר בתרמית."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"אי אפשר להשלים את הפעולה במהלך שיחה"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"ההגדרה הזו חסומה כדי להגן על המכשיר ועל הנתונים שלך.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>רמאים שינסו לגרום לך להתקין אפליקציות מזיקות יבקשו ממך להתקין אפליקציות לא ידועות ממקור חדש."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>רמאים שירצו להשתלט על המכשיר שלך יבקשו ממך לתת לאפליקציה גישה לשירות הנגישות."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"בקשת הגישה של האפליקציה ל<xliff:g id="PERMISSION_NAME">%1$s</xliff:g> נדחתה"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"האפליקציה ביקשה הרשאת גישה למידע רגיש שעלולה לסכן את המידע האישי והפיננסי שלך.<xliff:g id="ID_1"><br><br></xliff:g>יכול להיות שהאפליקציה לא תעבוד כמו שצריך ללא ההרשאה המוגבלת הזו. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>מידע נוסף על מתן גישה להרשאות</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"בקשת הגישה של האפליקציה לשמש כברירת המחדל של <xliff:g id="ROLE_NAME">%1$s</xliff:g> נדחתה"</string> diff --git a/PermissionController/res/values-ja-v33/strings.xml b/PermissionController/res/values-ja-v33/strings.xml index 0669bd15d..b988e30c8 100644 --- a/PermissionController/res/values-ja-v33/strings.xml +++ b/PermissionController/res/values-ja-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"その他のアラート"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"削除されたアラート"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{1 個以上のアラートを開いて表示する}other{# 個以上のアラートを開いて表示する}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"閉じる"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"アラート: <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"操作が完了しました"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"デバイスの保護を強化できる設定をご確認ください"</string> diff --git a/PermissionController/res/values-ja/strings.xml b/PermissionController/res/values-ja/strings.xml index 99c927b67..4b3ad4ac1 100644 --- a/PermissionController/res/values-ja/strings.xml +++ b/PermissionController/res/values-ja/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> でこのアプリに <xliff:g id="PERM">%1$s</xliff:g> へのアクセス権が付与されています"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"「<xliff:g id="APP">%1$s</xliff:g>」アプリの権限をすべて表示"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"この権限があるアプリをすべて表示"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"情報"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"設定"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"アシスタントのマイクの使用を表示"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"使用していないアプリの設定"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"アプリが使用されていない場合に権限を削除"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"リンクを開く"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"デフォルトの仕事用アプリ"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"プライベート スペースのデフォルト"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"デバイス向けに最適化"</string> + <string name="default_app_others" msgid="7793029848126079876">"その他"</string> <string name="default_app_none" msgid="9084592086808194457">"なし"</string> <string name="default_app_system_default" msgid="6218386768175513760">"（システムのデフォルト）"</string> <string name="default_app_no_apps" msgid="115720991680586885">"アプリなし"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> がデバッグ情報のアップロードをリクエストしています。"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"デバッグデータを共有しますか？"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"システムで問題が検出されました。"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> が、<xliff:g id="DATE">%2$s</xliff:g>、<xliff:g id="TIME">%3$s</xliff:g>にこのデバイスから取得したバグレポートのアップロードをリクエストしています。バグレポートには、ユーザー名、位置情報、デバイスの識別情報、ネットワーク情報など、デバイスに関する個人情報やアプリで記録された個人情報が含まれます。この情報を含むバグレポートは、信頼できる人やアプリとのみ共有してください。<xliff:g id="APP_NAME_1">%4$s</xliff:g> にバグレポートのアップロードを許可しますか？"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> が、<xliff:g id="DATE">%2$s</xliff:g>の<xliff:g id="TIME">%3$s</xliff:g>にこのデバイスから取得したバグレポートのアップロードをリクエストしています。バグレポートには、ユーザー名、位置情報、デバイスの識別情報、ネットワーク情報など、デバイスに関する個人情報やアプリで記録された個人情報が含まれます。この情報を含むバグレポートは、信頼できる人やアプリとのみ共有してください。\n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g> にバグレポートのアップロードを許可しますか？"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> のバグレポートの処理中にエラーが発生しました。詳細なデバッグデータの共有が許可されませんでした。ご不便をおかけして申し訳ありません。"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"許可"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"許可しない"</string> @@ -487,8 +491,8 @@ <string name="permgrouprequest_device_aware_fineupgrade" msgid="4453775952305587571">"<b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>の位置情報に対する <b><xliff:g id="APP_NAME"><b>%1$s</b></xliff:g></b> のアクセス権を「おおよそ」から「正確」に変更しますか？"</string> <string name="permgrouprequest_coarselocation" msgid="7244605063736425232">"このデバイスのおおよその位置情報へのアクセスを <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> に許可しますか？"</string> <string name="permgrouprequest_device_aware_coarselocation" msgid="8367540370912066757">"<b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>のおおよその位置情報へのアクセスを <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> に許可しますか？"</string> - <string name="permgrouprequest_finelocation_imagetext" msgid="1313062433398914334">"正確"</string> - <string name="permgrouprequest_coarselocation_imagetext" msgid="8650605041483025297">"おおよそ"</string> + <string name="permgrouprequest_finelocation_imagetext" msgid="1313062433398914334">"正確な位置"</string> + <string name="permgrouprequest_coarselocation_imagetext" msgid="8650605041483025297">"おおよその位置"</string> <string name="permgrouprequest_calendar" msgid="1493150855673603806">"カレンダーへのアクセスを「<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>」に許可しますか？"</string> <string name="permgrouprequest_device_aware_calendar" msgid="7161929851377463612">"<b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>内のカレンダーへのアクセスを <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> に許可しますか？"</string> <string name="permgrouprequest_sms" msgid="5672063688745420991">"SMS メッセージの送信と表示を「<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>」に許可しますか？"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"制限付き設定を許可"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"制限付き設定"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"セキュリティ保護のため、この設定は現在利用できません。"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"この操作は通話中はできません"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"通話中にアプリが他のアプリをインストールすることはできません。\n\n このような操作は、詐欺師が電話での会話中に要求することが多いため、ユーザー保護を目的に禁止されています。知らない相手からこのような操作を求められた場合は、詐欺の可能性があります。"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"通話中は操作を完了できません"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"デバイスとデータを保護するため、この設定はブロックされています。<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>詐欺師が新しいソースから不明なアプリをインストールするようユーザーに持ちかけ、有害なアプリをインストールしようとする可能性があります。"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>詐欺師が、ユーザー補助機能へのアクセスをアプリに許可するようユーザーに依頼して、デバイスを操作しようとする可能性があります。"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"アプリは<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>へのアクセスを拒否されました"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"機密情報に関わる権限へのアクセスをアプリがリクエストしました。この権限へのアクセスは、あなたの個人情報や財務情報を危険にさらす恐れがあります。<xliff:g id="ID_1"><br><br></xliff:g>この制限付きの権限がないとアプリは正しく動作しない可能性があります。<a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>アクセスを許可する方法の詳細</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"アプリはデフォルトの<xliff:g id="ROLE_NAME">%1$s</xliff:g>としてのアクセスを拒否されました"</string> diff --git a/PermissionController/res/values-ka-v33/strings.xml b/PermissionController/res/values-ka-v33/strings.xml index f92c9ebe8..e44d2bce7 100644 --- a/PermissionController/res/values-ka-v33/strings.xml +++ b/PermissionController/res/values-ka-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"სხვა გაფრთხილებები"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"დახურული გაფრთხილებები"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{გააფართოვეთ და ნახეთ კიდევ ერთი გაფრთხილება}other{გააფართოვეთ და იხილეთ კიდევ # გაფრთხილება}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"ჩაკეცვა"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"გაფრთხილება. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"მოქმედება დასრულებულია"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"შეამოწმეთ პარამეტრები თქვენი მოწყობილობის უსაფრთხოების გასაძლიერებლად"</string> diff --git a/PermissionController/res/values-ka/strings.xml b/PermissionController/res/values-ka/strings.xml index ec1b1bb3a..5023926dd 100644 --- a/PermissionController/res/values-ka/strings.xml +++ b/PermissionController/res/values-ka/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"(<xliff:g id="PERM">%1$s</xliff:g>) წვდომა ამ აპისთვის <xliff:g id="DEVICE_NAME">%2$s</xliff:g>-ზე"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"ყველა ნებართვის ნახვა: <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"ამ ნებართვის მქონე ყველა აპის ნახვა"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"ინფორმაცია"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"პარამეტრები"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"ასისტენტის მიკროფონის გამოყენების ჩვენება"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"გამოუყენებელი აპის პარამეტრები"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"ნებართვების ამოშლა აპის გამოუყენებლობის შემთხვევაში."</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"ბმულების გახსნა"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"ნაგულისხმევი სამსახურისთვის"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"კერძო სივრცისთვის ნაგულისხმევი აპები"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"ოპტიმიზებულია მოწყობილობისთვის"</string> + <string name="default_app_others" msgid="7793029848126079876">"სხვა"</string> <string name="default_app_none" msgid="9084592086808194457">"არცერთი"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(სისტემის ნაგულისხმევი)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"აპები არ არის"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> ითხოვს გამართვის ინფორმაციის ატვირთვას."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"გააზიარებთ შეცდომების გამართვის მონაცემებს?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"სისტემამ აღმოაჩინა პრობლემა."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ითხოვს ამ მოწყობილობიდან ხარვეზების ანგარიშის ატვირთვას, რომლის შექმნის თარიღია <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g>. ხარვეზების ანგარიშები მოიცავს პერსონალურ ინფორმაციას თქვენი მოწყობილობის შესახებ ან აპების ჟურნალებში დაფიქსირებულ მონაცემებს, მაგალითად, მომხმარებლის სახელებს, მდებარეობის მონაცემებს, მოწყობილობების იდენტიფიკატორებსა და ქსელის ინფორმაციას. გირჩევთ, ხარვეზების ანგარიშები გაუზიაროთ მხოლოდ იმ ადამიანებსა და აპებს, რომლებსაც შეგიძლიათ ანდოთ ეს ინფორმაცია. გსურთ, <xliff:g id="APP_NAME_1">%4$s</xliff:g>-მა ატვირთოს ხარვეზების ანგარიში?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ითხოვს ამ მოწყობილობიდან სისტემის ხარვეზების ანგარიშის ატვირთვას, რომლის შექმნის თარიღია <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g>.სისტემის ხარვეზების ანგარიშები მოიცავს პერსონალურ ინფორმაციას თქვენი მოწყობილობის შესახებ ან აპების ჟურნალებში დაფიქსირებულ მონაცემებს, მაგალითად, მომხმარებლის სახელებს, მდებარეობის მონაცემებს, მოწყობილობების იდენტიფიკატორებსა და ქსელის ინფორმაციას. გირჩევთ, სისტემის ხარვეზების ანგარიშები გაუზიაროთ მხოლოდ იმ ადამიანებსა და აპებს, რომლებსაც შეგიძლიათ ანდოთ ეს ინფორმაცია.\n\nგსურთ, <xliff:g id="APP_NAME_1">%4$s</xliff:g>-მა ატვირთოს სისტემის ხარვეზების ანგარიში?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ისთვის სისტემის ხარვეზის ანგარიშის დამუშავებისას შეცდომა დაფიქსირდა. ამიტომ შეცდომების გამართვის დეტალური მონაცემების გაზიარება უარყოფილია. ბოდიშს გიხდით წყვეტის გამო."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"დაშვება"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"უარყოფა"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"შეზღუდული პარამეტრების დაშვება"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"შეზღუდული პარამეტრი"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"თქვენივე უსაფრთხოებისთვის ეს პარამეტრი ამჟამად მიუწვდომელია."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"სატელეფონო ზარისას მოქმედება არ არის ხელმისაწვდომი"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"აპებისთვის სხვა აპების ინსტალაციის დაშვება არ არის ნებადართული ტელეფონზე ზარის დროს.\n\n თაღლითები ხშირად ითხოვენ ამ ტიპის ქმედებას ტელეფონზე საუბრისას, შესაბამისად, აღნიშნული ქმედება დაიბლოკა თქვენი უსაფრთხოებისთვის. თუ ვინმემ, ვისაც არ იცნობთ, მიგითითათ ამ ქმედების განხორციელებისკენ, ეს შესაძლოა იყოს თაღლითური სქემა."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"ზარის დროს მოქმედების დასრულება შეუძლებელია"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"ეს პარამეტრი დაბლოკილია თქვენი მოწყობილობისა და მონაცემების დასაცავად.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>თაღლითებმა შეიძლება ცადონ მავნე აპების ინსტალაცია ახალი წყაროდან უცნობი აპების დაყენების მოთხოვნით."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>თაღლითებმა შეიძლება ცადონ თქვენი მოწყობილობის მართვა აპისთვის წვდომის დაშვების მოთხოვნით."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"აპისთვის უარყოფილია ნებართვაზე წვდომა: <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"აპმა სენსიტიურ ინფორმაციაზე წვდომა მოითხოვა, რაც თქვენს პირად და ფინანსურ ინფორმაციას საფრთხის ქვეშ აყენებს.<xliff:g id="ID_1"><br><br></xliff:g>შესაძლოა აპმა ამ შეზღუდული ნებართვის გარეშე სათანადოდ ვერ იმუშაოს. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>შეიტყვეთ მეტი ნებართვის დაშვების შესახებ</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"აპისთვის ნაგულისხმევ როლზე (<xliff:g id="ROLE_NAME">%1$s</xliff:g>) წვდომა უარყოფილია"</string> diff --git a/PermissionController/res/values-kk-v33/strings.xml b/PermissionController/res/values-kk-v33/strings.xml index 9538c1503..18b4ba1d6 100644 --- a/PermissionController/res/values-kk-v33/strings.xml +++ b/PermissionController/res/values-kk-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Басқа хабарландырулар"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Жабылған хабарландырулар"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Тағы бір хабарландыруды жаю және көру}other{Тағы # хабарландыруды жаю және көру}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Жию"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Ескерту. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Әрекет аяқталды."</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Құрығыңыздың қауіпсіздігін арттыратын параметрлерді тексеріңіз."</string> diff --git a/PermissionController/res/values-kk/strings.xml b/PermissionController/res/values-kk/strings.xml index a5680c1e5..219f29bdf 100644 --- a/PermissionController/res/values-kk/strings.xml +++ b/PermissionController/res/values-kk/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Құрылғыдағы (<xliff:g id="DEVICE_NAME">%2$s</xliff:g>) осы қолданбаның рұқсаты: <xliff:g id="PERM">%1$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Барлық <xliff:g id="APP">%1$s</xliff:g> рұқсаттарын көру"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Осы рұқсатқа ие барлық қолданбаларды көру"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Ақпарат"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Параметрлер"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Assistant микрофонының пайдаланылуын көрсету"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Пайдаланылмайтын қолданба параметрлері"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Қолданба пайдаланылмаса, рұқсаттарды өшіру"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Сілтемелер ашу"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Жұмыс үшін әдепкі қолданба"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Құпия кеңістікке арналған әдепкі қолданбалар"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Құрылғы үшін оңтайландырылған"</string> + <string name="default_app_others" msgid="7793029848126079876">"Басқа"</string> <string name="default_app_none" msgid="9084592086808194457">"Жоқ"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(жүйенің әдепкі қолданбасы)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Қолданба жоқ"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасы түзету туралы ақпаратты жүктеп салғысы келеді."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Түзету туралы деректер бөлісілсін бе?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Жүйе мәселені анықтады."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> қолданбасы осы құрылғыдан <xliff:g id="DATE">%2$s</xliff:g> күні <xliff:g id="TIME">%3$s</xliff:g> кезінде алынған қате туралы есепті жүктеп салуды сұрауда. Мұндай есептерге құрылғыңыз туралы немесе қолданбалар арқылы тіркелген жеке ақпарат (пайдаланушы аттары, геодерек, құрылғы идентификаторлары және желі туралы ақпарат) кіреді. Қате туралы есептерді тек сенімді адамдармен және қолданбалармен бөлісіңіз. <xliff:g id="APP_NAME_1">%4$s</xliff:g> қолданбасына қате туралы есепті жүктеп салуға рұқсат етілсін бе?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> қолданбасы осы құрылғыдан <xliff:g id="DATE">%2$s</xliff:g> күні <xliff:g id="TIME">%3$s</xliff:g> кезінде алынған қате туралы есепті жүктеп салуды сұрап тұр. Мұндай есептерге құрылғыңыз туралы немесе қолданбалар арқылы тіркелген жеке ақпарат (пайдаланушы аттары, геодерек, құрылғы идентификаторлары және желі туралы ақпарат) кіреді. Қате туралы есептерді тек сенімді адамдармен және қолданбалармен бөлісіңіз.\n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g> қолданбасына қате туралы есепті жүктеп салуға рұқсат етілсін бе?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасының қате туралы есебін өңдеу кезінде қате шықты. Түзету туралы толық деректерді бөлісуден бас тартылды. Кедергі келтіргеніміз үшін кешірім сұраймыз."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Рұқсат беру"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Тыйым салу"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Шектелген параметрлерге рұқсат беру"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Шектелген параметр"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Қауіпсіздік мақсатында бұл параметрді қазір пайдалану мүмкін емес."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Телефон қоңырауы кезінде бұл әрекет мүмкін емес"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Телефон қоңырауы кезінде қолданбаларға басқа қолданбаларды орнатуға тыйым салынады.\n\n Алаяқтар телефонмен сөйлесу кезінде көбіне осындай әрекеттерді жасауды сұрайды, сондықтан сізді қорғау үшін бұл әрекет блокталған. Таныс емес адам осылай әрекет етуге нұсқау берсе, бұл алаяқтық болуы мүмкін."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Қоңырау кезінде әрекетті аяқтау мүмкін емес"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Бұл параметр құрылғы мен деректерді қорғау үшін блокталған.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Алаяқтар жаңа дереккөзден белгісіз қолданбалар орнатуыңызды сұрап, зиянды қолданбалар орнатқысы келуі мүмкін."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Алаяқтар қолданбаның арнайы мүмкіндіктерін пайдалануға рұқсат беруіңізді сұрап, құрылғыңызды басқарғысы келуі мүмкін."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Қолданбаға <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> рұқсаты берілмеді"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Қолданба жеке және қаржылық ақпаратыңызға қауіп төндіруі мүмкін құпия ақпарат рұқсатын сұрады.<xliff:g id="ID_1"><br><br></xliff:g>Қолданба бұл шектеулі рұқсатсыз дұрыс жұмыс істемеуі мүмкін. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Рұқсат беру туралы ақпарат</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Қолданбаға әдепкі <xliff:g id="ROLE_NAME">%1$s</xliff:g> болу рұқсаты берілмеді"</string> diff --git a/PermissionController/res/values-km-v33/strings.xml b/PermissionController/res/values-km-v33/strings.xml index 9926d9664..8536da5c1 100644 --- a/PermissionController/res/values-km-v33/strings.xml +++ b/PermissionController/res/values-km-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"ការជូនដំណឹងច្រើនទៀត"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"ការជូនដំណឹងដែលបានច្រានចោល"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{ពង្រីកដើម្បីមើលការជូនដំណឹងមួយទៀត}other{ពង្រីកដើម្បីមើលការជូនដំណឹង # ទៀត}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"បង្រួម"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"ការជូនដំណឹង <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"សកម្មភាពបានបញ្ចប់"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"ពិនិត្យការកំណត់ដែលអាចបន្ថែមការការពារទៅដល់ឧបករណ៍របស់អ្នក"</string> diff --git a/PermissionController/res/values-km/strings.xml b/PermissionController/res/values-km/strings.xml index 3712f99ac..cf7a5e6d2 100644 --- a/PermissionController/res/values-km/strings.xml +++ b/PermissionController/res/values-km/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"សិទ្ធិចូលប្រើ <xliff:g id="PERM">%1$s</xliff:g> សម្រាប់កម្មវិធីនេះនៅលើ <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"មើលការអនុញ្ញាតទាំងអស់ឱ្យទៅ <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"មើលកម្មវិធីទាំងអស់ដែលមានការអនុញ្ញាតនេះ"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"ព័ត៌មាន"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"ការកំណត់"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"បង្ហាញការប្រើប្រាស់មីក្រូហ្វូនរបស់ជំនួយការ"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"ការកំណត់កម្មវិធីដែលមិនប្រើ"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"ដកការអនុញ្ញាតចេញ ប្រសិនបើមិនប្រើប្រាស់កម្មវិធី"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"ការបើកតំណ"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"លំនាំដើមសម្រាប់ការងារ"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"លំនាំដើមសម្រាប់លំហឯកជន"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"បានបង្កើនប្រសិទ្ធភាពសម្រាប់ឧបករណ៍"</string> + <string name="default_app_others" msgid="7793029848126079876">"ផ្សេងទៀត"</string> <string name="default_app_none" msgid="9084592086808194457">"គ្មាន"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(លំនាំដើមប្រព័ន្ធ)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"គ្មានកម្មវិធីទេ"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> ចង់បង្ហោះព័ត៌មាននៃការជួសជុល។"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"ចែករំលែកទិន្នន័យនៃការជួសជុលឬ?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"ប្រព័ន្ធបានរកឃើញបញ្ហាមួយ។"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> កំពុងស្នើសុំបង្ហោះរបាយការណ៍អំពីបញ្ហាពីឧបករណ៍នេះ ដែលបានធ្វើឡើងនៅថ្ងៃទី <xliff:g id="DATE">%2$s</xliff:g> នៅម៉ោង <xliff:g id="TIME">%3$s</xliff:g>។ របាយការណ៍អំពីបញ្ហារួមមានព័ត៌មានផ្ទាល់ខ្លួនអំពីឧបករណ៍របស់អ្នក ឬដែលបានកត់ត្រាដោយកម្មវិធីដូចជា ឈ្មោះអ្នកប្រើប្រាស់ ទិន្នន័យទីតាំង ព័ត៌មានសម្គាល់ឧបករណ៍ និងព័ត៌មានបណ្ដាញជាដើម។ ចែករំលែករបាយការណ៍អំពីបញ្ហាជាមួយកម្មវិធី និងមនុស្សដែលអ្នកទុកចិត្តប៉ុណ្ណោះ ពាក់ព័ន្ធនឹងព័ត៌មាននេះ។ អនុញ្ញាតឱ្យ <xliff:g id="APP_NAME_1">%4$s</xliff:g> បង្ហោះរបាយការណ៍អំពីបញ្ហាទេ?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> កំពុងស្នើសុំបង្ហោះរបាយការណ៍អំពីបញ្ហាពីឧបករណ៍នេះ ដែលបានធ្វើឡើងនៅថ្ងៃទី <xliff:g id="DATE">%2$s</xliff:g> នៅម៉ោង <xliff:g id="TIME">%3$s</xliff:g>។ របាយការណ៍អំពីបញ្ហារួមមានព័ត៌មានផ្ទាល់ខ្លួនអំពីឧបករណ៍របស់អ្នក ឬដែលបានកត់ត្រាដោយកម្មវិធីដូចជា ឈ្មោះអ្នកប្រើប្រាស់ ទិន្នន័យទីតាំង លេខកូដសម្គាល់ឧបករណ៍ និងព័ត៌មានបណ្ដាញជាដើម។ ចែករំលែករបាយការណ៍អំពីបញ្ហាជាមួយមនុស្ស និងកម្មវិធីដែលអ្នកទុកចិត្តតែប៉ុណ្ណោះ ពាក់ព័ន្ធនឹងព័ត៌មាននេះ។\n\nអនុញ្ញាតឱ្យ <xliff:g id="APP_NAME_1">%4$s</xliff:g> បង្ហោះរបាយការណ៍អំពីបញ្ហាដែរទេ?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"មានបញ្ហាក្នុងការដំណើរការរបាយការណ៍អំពីបញ្ហាសម្រាប់ <xliff:g id="APP_NAME">%1$s</xliff:g> ។ ដូច្នេះ ការចែករំលែកទិន្នន័យជួសជុលលម្អិតត្រូវបានបដិសេធ។ សូមអភ័យទោសចំពោះការរំខាន។"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"អនុញ្ញាត"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"បដិសេធ"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"អនុញ្ញាតការកំណត់ដែលបានដាក់កំហិត"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"ការកំណត់ដែលបានដាក់កំហិត"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"ដើម្បីសុវត្ថិភាពរបស់អ្នក បច្ចុប្បន្នមិនអាចប្រើការកំណត់នេះបានទេ។"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"មិនអាចធ្វើសកម្មភាពបានទេ ពេលកំពុងហៅទូរសព្ទ"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"ការអនុញ្ញាតឱ្យកម្មវិធីដំឡើងកម្មវិធីផ្សេងទៀតមិនត្រូវបានអនុញ្ញាតអំឡុងពេលហៅទូរសព្ទទេ។\n\n ជារឿយៗ ជនឆបោកស្នើសុំសកម្មភាពប្រភេទនេះអំឡុងពេលសន្ទនាតាមទូរសព្ទ ដូច្នេះសកម្មភាពនេះត្រូវបានទប់ស្កាត់ដើម្បីការពារអ្នក។ ប្រសិនបើអ្នកត្រូវបានណែនាំឱ្យធ្វើសកម្មភាពនេះដោយនរណាម្នាក់ដែលអ្នកមិនស្គាល់ វាអាចជាការឆបោក។"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"មិនអាចបញ្ចប់សកម្មភាពក្នុងអំឡុងពេលហៅទូរសព្ទបានទេ"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"ការកំណត់នេះត្រូវបានទប់ស្កាត់ ដើម្បីការពារឧបករណ៍ និងទិន្នន័យរបស់អ្នក។<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>ជនឆបោកអាចនឹងព្យាយាមដំឡើងកម្មវិធីបង្កគ្រោះថ្នាក់ ដោយស្នើសុំឱ្យអ្នកដំឡើងកម្មវិធីមិនស្គាល់ពីប្រភពថ្មី។"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>ជនឆបោកអាចនឹងព្យាយាមគ្រប់គ្រងឧបករណ៍របស់អ្នក ដោយស្នើសុំឱ្យអ្នកអនុញ្ញាតសិទ្ធិចូលប្រើប្រាស់មុខងារភាពងាយស្រួលសម្រាប់កម្មវិធី។"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"កម្មវិធីត្រូវបានបដិសេធមិនឱ្យចូលប្រើ<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"កម្មវិធីបានស្នើសុំសិទ្ធិចូលប្រើការអនុញ្ញាតដែលមានលក្ខណៈរសើប ដែលអាចធ្វើឱ្យព័ត៌មានហិរញ្ញវត្ថុ និងព័ត៌មានផ្ទាល់ខ្លួនរបស់អ្នកប្រឈមនឹងហានិភ័យ។<xliff:g id="ID_1"><br><br></xliff:g>កម្មវិធីអាចនឹងមិនដំណើរការបានត្រឹមត្រូវទេ ប្រសិនបើគ្មានការអនុញ្ញាតដែលមានការរឹតបន្តឹងនេះ។ <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>ស្វែងយល់អំពីរបៀបផ្ដល់សិទ្ធិចូលប្រើ</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"កម្មវិធីត្រូវបានបដិសេធមិនឱ្យចូលប្រើជា<xliff:g id="ROLE_NAME">%1$s</xliff:g>លំនាំដើម"</string> diff --git a/PermissionController/res/values-kn-v33/strings.xml b/PermissionController/res/values-kn-v33/strings.xml index f4d39d7ac..f12f9cb86 100644 --- a/PermissionController/res/values-kn-v33/strings.xml +++ b/PermissionController/res/values-kn-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"ಇನ್ನಷ್ಟು ಎಚ್ಚರಿಕೆಗಳು"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"ವಜಾಗೊಳಿಸಿದ ಎಚ್ಚರಿಕೆಗಳು"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{ವಿಸ್ತರಿಸಿ ಮತ್ತು ಇನ್ನೊಂದು ಎಚ್ಚರಿಕೆಯನ್ನು ನೋಡಿ}one{ವಿಸ್ತರಿಸಿ ಮತ್ತು # ಹೆಚ್ಚಿನ ಎಚ್ಚರಿಕೆಗಳನ್ನು ನೋಡಿ}other{ವಿಸ್ತರಿಸಿ ಮತ್ತು # ಹೆಚ್ಚಿನ ಎಚ್ಚರಿಕೆಗಳನ್ನು ನೋಡಿ}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"ಕುಗ್ಗಿಸಿ"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"ಅಲರ್ಟ್. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"ಆ್ಯಕ್ಷನ್ ಪೂರ್ಣಗೊಂಡಿದೆ"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"ನಿಮ್ಮ ಸಾಧನಕ್ಕೆ ರಕ್ಷಣೆಯನ್ನು ಸೇರಿಸಬಹುದಾದ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಪರಿಶೀಲಿಸಿ"</string> diff --git a/PermissionController/res/values-kn/strings.xml b/PermissionController/res/values-kn/strings.xml index 86f93bc4c..7d3c0ebb1 100644 --- a/PermissionController/res/values-kn/strings.xml +++ b/PermissionController/res/values-kn/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> ನಲ್ಲಿ ಈ ಆ್ಯಪ್ಗಾಗಿ <xliff:g id="PERM">%1$s</xliff:g> ಆ್ಯಕ್ಸೆಸ್"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"ಎಲ್ಲಾ <xliff:g id="APP">%1$s</xliff:g> ಅನುಮತಿಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"ಈ ಅನುಮತಿಯನ್ನು ಹೊಂದಿರುವ ಎಲ್ಲಾ ಆ್ಯಪ್ಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"ಮಾಹಿತಿ"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"ಅಸಿಸ್ಟೆಂಟ್ನ ಮೈಕ್ರೋಫೋನ್ ಬಳಕೆಯನ್ನು ತೋರಿಸಿ"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"ಬಳಕೆಯಾಗದಿರುವ ಆ್ಯಪ್ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"ಆ್ಯಪ್ ಬಳಸದಿದ್ದರೆ ಅನುಮತಿಗಳನ್ನು ತೆಗೆದುಹಾಕಿ"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"ಲಿಂಕ್ಗಳನ್ನು ತೆರೆಯುವುದು"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"ಕೆಲಸದ ಕುರಿತಾದ ಡೀಫಾಲ್ಟ್ ಆ್ಯಪ್"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ನ ಡೀಫಾಲ್ಟ್"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"ಸಾಧನಕ್ಕಾಗಿ ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗಿದೆ"</string> + <string name="default_app_others" msgid="7793029848126079876">"ಇತರೆ"</string> <string name="default_app_none" msgid="9084592086808194457">"ಯಾವುದೂ ಬೇಡ"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(ಸಿಸ್ಟಂ ಡಿಫಾಲ್ಟ್)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"ಯಾವುದೇ ಆ್ಯಪ್ಗಳು ಇಲ್ಲ"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಆ್ಯಪ್, ಡೀಬಗ್ ಮಾಡುವಿಕೆಯ ಮಾಹಿತಿಯನ್ನು ಅಪ್ಲೋಡ್ ಮಾಡಲು ಬಯಸುತ್ತದೆ."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"ಡೀಬಗ್ ಮಾಡುವಿಕೆ ಡೇಟಾವನ್ನು ಹಂಚಿಕೊಳ್ಳಬೇಕೆ?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"ಸಮಸ್ಯೆಯೊಂದನ್ನು ಸಿಸ್ಟಮ್ ಪತ್ತೆಹಚ್ಚಿದೆ."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="DATE">%2$s</xliff:g> ದಿನಾಂಕದಂದು <xliff:g id="TIME">%3$s</xliff:g> ಸಮಯಕ್ಕೆ ತೆಗೆದುಕೊಂಡ ಬಗ್ ವರದಿಯನ್ನು ಈ ಸಾಧನದಿಂದ ಅಪ್ಲೋಡ್ ಮಾಡುವಂತೆ <xliff:g id="APP_NAME_0">%1$s</xliff:g> ಆ್ಯಪ್ ವಿನಂತಿಸುತ್ತಿದೆ. ಬಗ್ ವರದಿಗಳು, ನಿಮ್ಮ ಸಾಧನ ಅಥವಾ ಆ್ಯಪ್ಗಳ ಮೂಲಕ ಲಾಗ್ ಮಾಡಿದ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿಯನ್ನು, ಉದಾಹರಣೆಗೆ ಬಳಕೆದಾರರ ಹೆಸರುಗಳು, ಸ್ಥಳದ ಡೇಟಾ, ಸಾಧನ ಗುರುತಿಸುವಿಕೆಗಳು ಮತ್ತು ನೆಟ್ವರ್ಕ್ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಿದೆ. ಈ ಮಾಹಿತಿ ಒಳಗೊಂಡಂತೆ, ನೀವು ನಂಬುವ ಜನರು ಮತ್ತು ಆ್ಯಪ್ಗಳ ಜೊತೆಗೆ ಮಾತ್ರ ಬಗ್ ವರದಿಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ. ಬಗ್ ವರದಿಯನ್ನು ಅಪ್ಲೋಡ್ ಮಾಡಲು <xliff:g id="APP_NAME_1">%4$s</xliff:g> ಆ್ಯಪ್ಗೆ ಅನುಮತಿಸುವುದೇ?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="DATE">%2$s</xliff:g> ದಿನಾಂಕದಂದು <xliff:g id="TIME">%3$s</xliff:g> ಸಮಯಕ್ಕೆ ತೆಗೆದುಕೊಂಡ ಬಗ್ ವರದಿಯನ್ನು ಈ ಸಾಧನದಿಂದ ಅಪ್ಲೋಡ್ ಮಾಡುವಂತೆ <xliff:g id="APP_NAME_0">%1$s</xliff:g> ಆ್ಯಪ್ ವಿನಂತಿಸುತ್ತಿದೆ. ಬಗ್ ವರದಿಗಳು, ನಿಮ್ಮ ಸಾಧನ ಅಥವಾ ಆ್ಯಪ್ಗಳ ಮೂಲಕ ಲಾಗ್ ಮಾಡಿದ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿಯನ್ನು, ಉದಾಹರಣೆಗೆ ಬಳಕೆದಾರರ ಹೆಸರುಗಳು, ಸ್ಥಳದ ಡೇಟಾ, ಸಾಧನ ಗುರುತಿಸುವಿಕೆಗಳು ಮತ್ತು ನೆಟ್ವರ್ಕ್ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಿದೆ. ಈ ಮಾಹಿತಿ ಒಳಗೊಂಡಂತೆ, ನೀವು ನಂಬುವ ಜನರು ಮತ್ತು ಆ್ಯಪ್ಗಳ ಜೊತೆಗೆ ಮಾತ್ರ ಬಗ್ ವರದಿಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ.\n\nಬಗ್ ವರದಿಯನ್ನು ಅಪ್ಲೋಡ್ ಮಾಡಲು <xliff:g id="APP_NAME_1">%4$s</xliff:g> ಆ್ಯಪ್ಗೆ ಅನುಮತಿಸಬೇಕೇ?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಗಾಗಿ ಬಗ್ ವರದಿ ಪ್ರಕ್ರಿಯೆಗೊಳಿಸುವಾಗ ದೋಷ ಕಂಡುಬಂದಿದೆ. ಆದ್ದರಿಂದ, ವಿವರವಾದ ದೋಷ ಡೀಬಗ್ ಮಾಡುವಿಕೆಯ ಡೇಟಾ ಹಂಚಿಕೊಳ್ಳುವುದನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ. ಅಡಚಣೆಗಾಗಿ ಕ್ಷಮಿಸಿ."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"ಅನುಮತಿಸಿ"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"ನಿರಾಕರಿಸಿ"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"ನಿರ್ಬಂಧಿಸಲಾದ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಅನುಮತಿಸಿ"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"ನಿರ್ಬಂಧಿಸಲಾದ ಸೆಟ್ಟಿಂಗ್"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"ನಿಮ್ಮ ಸುರಕ್ಷತೆಗಾಗಿ, ಈ ಸೆಟ್ಟಿಂಗ್ ಪ್ರಸ್ತುತ ಲಭ್ಯವಿಲ್ಲ."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"ಫೋನ್ ಕರೆಯಲ್ಲಿರುವಾಗ ಕ್ರಿಯೆ ಲಭ್ಯವಿರುವುದಿಲ್ಲ"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"ಫೋನ್ ಕರೆಯ ಸಮಯದಲ್ಲಿ ಇತರ ಆ್ಯಪ್ಗಳನ್ನು ಸ್ಥಾಪಿಸಲು ಆ್ಯಪ್ಗಳನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.\n\n ಫೋನ್ ಕರೆ ಸಂಭಾಷಣೆಯ ಸಮಯದಲ್ಲಿ ಸ್ಕ್ಯಾಮರ್ಗಳು ಆಗಾಗ್ಗೆ ಈ ರೀತಿಯ ಕ್ರಿಯೆಯನ್ನು ವಿನಂತಿಸುತ್ತಾರೆ, ಆದ್ದರಿಂದ ನಿಮ್ಮನ್ನು ರಕ್ಷಿಸಲು ಇದನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗುತ್ತದೆ. ನಿಮಗೆ ಪರಿಚಯವಿಲ್ಲದ ಯಾರಾದರೂ ಈ ಕ್ರಮವನ್ನು ತೆಗೆದುಕೊಳ್ಳಲು ನಿಮಗೆ ಮಾರ್ಗದರ್ಶನ ನೀಡುತ್ತಿದ್ದರೆ, ಅದು ಸ್ಕ್ಯಾಮ್ ಆಗಿರಬಹುದು."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"ಕರೆಯ ಸಮಯದಲ್ಲಿ ಕ್ರಿಯೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"ನಿಮ್ಮ ಸಾಧನ ಮತ್ತು ಡೇಟಾವನ್ನು ರಕ್ಷಿಸಲು ಈ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>ಹೊಸ ಮೂಲದಿಂದ ಅಪರಿಚಿತ ಆ್ಯಪ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡಲು ಕೇಳುವ ಮೂಲಕ ಸ್ಕ್ಯಾಮರ್ಗಳು ಹಾನಿಕಾರಕ ಆ್ಯಪ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಬಹುದು."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>ಆ್ಯಪ್ಗೆ ಆ್ಯಕ್ಸೆಸ್ಸಿಬಿಲಿಟಿ ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ಅನುಮತಿಸುವಂತೆ ಕೇಳುವ ಮೂಲಕ ಸ್ಕ್ಯಾಮರ್ಗಳು ನಿಮ್ಮ ಸಾಧನವನ್ನು ನಿಯಂತ್ರಿಸಲು ಪ್ರಯತ್ನಿಸಬಹುದು."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"<xliff:g id="PERMISSION_NAME">%1$s</xliff:g> ಅನ್ನು ಆ್ಯಕ್ಸೆಸ್ ಮಾಡಲು ಆ್ಯಪ್ಗೆ ನಿರಾಕರಿಸಲಾಗಿದೆ"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಮತ್ತು ಹಣಕಾಸಿನ ಮಾಹಿತಿಯನ್ನು ಅಪಾಯಕ್ಕೆ ಸಿಲುಕಿಸಬಹುದಾದ ಸೂಕ್ಷ್ಮ ಅನುಮತಿಗೆ ಆ್ಯಪ್ ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ವಿನಂತಿಸಿದೆ.<xliff:g id="ID_1"><br><br></xliff:g>.ಈ ನಿರ್ಬಂಧಿತ ಅನುಮತಿಯಿಲ್ಲದೆ ಆ್ಯಪ್ ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರುವ ಸಾಧ್ಯತೆಯಿದೆ. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ಹೇಗೆ ಅನುಮತಿಸುವುದು ಎಂಬುದನ್ನು ತಿಳಿಯಿರಿ</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"ಡೀಫಾಲ್ಟ್ <xliff:g id="ROLE_NAME">%1$s</xliff:g> ಆಗಿರಲು ಆ್ಯಪ್ಗೆ ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ"</string> diff --git a/PermissionController/res/values-ko-v33/strings.xml b/PermissionController/res/values-ko-v33/strings.xml index 87bd343e9..f5c440762 100644 --- a/PermissionController/res/values-ko-v33/strings.xml +++ b/PermissionController/res/values-ko-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"알림 더보기"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"닫은 알림"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{펼쳐서 알림 1개 더보기}other{펼쳐서 알림 #개 더보기}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"접기"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"주의. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"작업 완료"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"기기 보안을 강화할 수 있는 설정 확인"</string> diff --git a/PermissionController/res/values-ko/strings.xml b/PermissionController/res/values-ko/strings.xml index 35269a437..db11b5a4e 100644 --- a/PermissionController/res/values-ko/strings.xml +++ b/PermissionController/res/values-ko/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"이 앱의 <xliff:g id="DEVICE_NAME">%2$s</xliff:g> <xliff:g id="PERM">%1$s</xliff:g> 액세스 권한"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"<xliff:g id="APP">%1$s</xliff:g> 권한 모두 보기"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"이 권한이 있는 앱 모두 보기"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"정보"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"설정"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"어시스턴트 마이크 사용 표시"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"사용하지 않는 앱 설정"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"앱이 사용되지 않는 경우 권한 삭제"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"링크 열기"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"직장용 기본 앱"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"비공개 스페이스의 기본값"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"기기에 최적화된 앱"</string> + <string name="default_app_others" msgid="7793029848126079876">"기타"</string> <string name="default_app_none" msgid="9084592086808194457">"없음"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(시스템 기본값)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"앱 없음"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 디버깅 정보를 업로드하려고 합니다."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"디버깅 데이터를 공유하시겠습니까?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"시스템에 문제가 감지되었습니다"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g>이(가) 이 기기에서 <xliff:g id="DATE">%2$s</xliff:g> <xliff:g id="TIME">%3$s</xliff:g>에 만들어진 버그 신고를 업로드하려고 합니다. 버그 신고에는 기기에 관한 개인정보나 앱이 기록한 개인정보(예: 사용자 이름, 위치 데이터, 기기 식별자, 네트워크 정보)가 포함됩니다. 이 정보는 신뢰할 수 있는 사람 또는 앱에 한해 공유해야 합니다. <xliff:g id="APP_NAME_1">%4$s</xliff:g>에서 버그 신고를 업로드하도록 허용할까요?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> 앱이 이 기기에서 <xliff:g id="DATE">%2$s</xliff:g> <xliff:g id="TIME">%3$s</xliff:g>에 만들어진 버그 신고를 업로드하도록 요청합니다. 버그 신고에는 기기에 관한 개인 정보나 앱이 기록한 개인 정보(예: 사용자 이름, 위치 데이터, 기기 식별자, 네트워크 정보)가 포함됩니다. 이 정보는 신뢰할 수 있는 사용자 또는 앱과만 공유해야 합니다.\n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g> 앱에서 버그 신고를 업로드하도록 허용하시겠습니까?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g>에 관한 버그 신고를 처리하는 중에 오류가 발생했습니다. 따라서 상세한 디버깅 데이터 공유가 거부되었습니다. 불편을 끼쳐 드려 죄송합니다."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"허용"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"거부"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"제한된 설정 허용"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"제한된 설정"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"보안을 위해 이 설정은 현재 사용할 수 없습니다."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"통화 중에 수행할 수 없는 작업입니다"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"통화 중에는 앱이 다른 앱을 설치하도록 허용할 수 없습니다.\n\n 사기범은 전화 통화 중에 종종 이러한 유형의 작업을 요청하므로, 사용자를 보호하기 위해 이러한 작업은 차단됩니다. 모르는 사람이 이 작업을 수행하도록 안내하는 경우 사기일 수도 있습니다."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"통화 중에는 작업을 완료할 수 없습니다"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"기기 및 데이터 보호를 위해 이 설정이 차단되었습니다.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>사기범이 새로운 소스에서 알 수 없는 앱을 설치하도록 요청하여 유해한 앱을 설치하려고 할 수 있습니다."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>사기범이 앱에 대한 접근성 액세스를 허용해 달라고 요청하여 기기를 제어하려고 할 수 있습니다."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>에 대한 앱의 액세스가 거부됨"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"앱에서 개인 정보 및 금융 정보가 위험에 노출될 수 있는 민감한 권한에 대한 액세스를 요청했습니다.<xliff:g id="ID_1"><br><br></xliff:g>이 제한된 권한 없이는 앱이 제대로 작동하지 않을 수 있습니다. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>액세스 허용 방법 알아보기</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"앱을 기본 <xliff:g id="ROLE_NAME">%1$s</xliff:g>으로 사용하기 위한 액세스가 거부됨"</string> diff --git a/PermissionController/res/values-ky-v33/strings.xml b/PermissionController/res/values-ky-v33/strings.xml index 3f2e12a3d..410ecd42e 100644 --- a/PermissionController/res/values-ky-v33/strings.xml +++ b/PermissionController/res/values-ky-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Дагы эскертүүлөр"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Жабылган эскертүүлөр"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Дагы бир эскертүүнү көрүү үчүн жайып көрсөтүү}other{Дагы # эскертүүнү көрүү үчүн жайып көрсөтүү}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Жыйыштыруу"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Эскертүү. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Аракет аткарылды"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Түзмөгүңүздүн коопсуздугун бекемдей турган параметрлерди текшериңиз"</string> diff --git a/PermissionController/res/values-ky/strings.xml b/PermissionController/res/values-ky/strings.xml index e1baac159..aff6ed8d5 100644 --- a/PermissionController/res/values-ky/strings.xml +++ b/PermissionController/res/values-ky/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> түзмөгүндө бул колдонмо үчүн <xliff:g id="PERM">%1$s</xliff:g> уруксаты"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Бардык <xliff:g id="APP">%1$s</xliff:g> уруксаттарын көрүү"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Ушундай уруксат берилген бардык колдонмолорду көрүү"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Маалымат"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Параметрлер"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Кошумча микрофондун иштешин көрсөтүү"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Колдонулбаган колдонмолордун параметрлери"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Эгер колдонмо пайдаланылбаса, уруксаттар өчүрүлсүн"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Шилтемелерди ачуу"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Жумуш үчүн демейки жөндөөлөр"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Жеке мейкиндик үчүн демейки колдонмолор"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Түзмөккө оптималдаштырылды"</string> + <string name="default_app_others" msgid="7793029848126079876">"Башкалар"</string> <string name="default_app_none" msgid="9084592086808194457">"Жок"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Демейки тутум)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Бир да колдонмо жок"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> мүчүлүштүктөрдү оңдоо маалыматын жүктөп бергиси келет."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Мүчүлүштүктөр тууралуу кабарлансынбы?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Система бир мүчүлүштүктү аныктады."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"\"<xliff:g id="APP_NAME_0">%1$s</xliff:g>\" колдонмосу ушул түзмөктөн <xliff:g id="DATE">%2$s</xliff:g>, саат <xliff:g id="TIME">%3$s</xliff:g> түзүлгөн мүчүлүштүктөр тууралуу отчетту жүктөөгө уруксат сурап жатат. Отчетто колдонуучулардын аттары, жүргөн жерлери, түзмөктүн идентификаторлору жана тармактын дайын-даректери сыяктуу түзмөгүңүздөгү же колдонмолоруңуздагы жеке маалымат камтылышы мүмкүн. Андыктан мүчүлүштүктөр тууралуу отчетту ишенимдүү адамдар жана колдонмолор менен гана бөлүшүңүз. \"<xliff:g id="APP_NAME_1">%4$s</xliff:g>\" колдонмосу мүчүлүштүк тууралуу отчетту жүктөй берсинби?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ушул түзмөктөн <xliff:g id="DATE">%2$s</xliff:g> күнү саат <xliff:g id="TIME">%3$s</xliff:g> түзүлгөн мүчүлүштүк тууралуу отчётту жүктөөгө уруксат сурап жатат. Отчеттордо колдонуучулардын аттары, жүргөн жерлери, түзмөктүн идентификаторлору жана тармак тууралуу маалымат сыяктуу түзмөгүңүздөгү же колдонмолоруңуздагы жеке маалымат камтылышы мүмкүн. Андыктан мүчүлүштүктөр тууралуу отчетторду ишенимдүү адамдар жана колдонмолор менен гана бөлүшүңүз.\n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g> колдонмосу мүчүлүштүк тууралуу отчетту жүктөй берсинби?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосундагы мүчүлүштүк тууралуу кабарды иштетүүдө ката кетти. Мүчүлүштүктөрдү аныктоо тууралуу кеңири маалыматтарды бөлүшүү сурамы четке кагылды. Ыңгайсыздык үчүн кечирим сурайбыз."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Уруксат берүү"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Тыюу салынат"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Чектелген параметрлерге уруксат берүү"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Чектелген функция"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Коопсуздук максатында бул параметр азырынча иштебейт."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Телефон чалуу учурунда аракет жеткиликсиз"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Телефон чалуу учурунда колдонмолорго башка колдонмолорду орнотууга уруксат берүүгө болбойт.\n\n Телефон чалуу аркылуу сүйлөшүп жатканда шылуундар көбүнчө ушул сыяктуу аракетти аткарууну суранышат, андыктан коопсуздугуңузду коргоо үчүн бул нерсе бөгөттөлдү. Эгер сиз тааныбаган адам мындай аракетти аткарууну айтса, ал кесепчилик болушу мүмкүн."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Чалуу учурунда эч нерсе кыла албайсыз"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Түзмөгүңүздү жана андагы нерселерди коргоо үчүн бул параметр бөгөттөлдү.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Шылуундар жаңы булактан белгисиз колдонмолорду орнотууну суранып, зыяндуу колдонмолорду орнотууга аракет кылышы мүмкүн."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Шылуундар колдонмого атайын мүмкүнчүлүктөрдү берүүнү суранып, түзмөгүңүздү көзөмөлдөөгө аракет кылышы мүмкүн."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Колдонмого <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> параметрин колдонууга тыюу салынды"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Колдонмо жеке жана каржы маалыматыңызга коркунуч жаратышы мүмкүн болгон купуя маалыматты көрүүгө уруксат сурады.<xliff:g id="ID_1"><br><br></xliff:g>Мындай уруксатсыз колдонмо ойдогудай иштебей коюшу мүмкүн. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Мүмкүнчүлүк берүү жөнүндө кеңири маалымат</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Колдонмого демейки <xliff:g id="ROLE_NAME">%1$s</xliff:g> ролуна тыюу салынды"</string> diff --git a/tests/utils/safetycenter/res/values/styles.xml b/PermissionController/res/values-ldrtl/integers.xml index ce54568ed..ca998ad16 100644 --- a/tests/utils/safetycenter/res/values/styles.xml +++ b/PermissionController/res/values-ldrtl/integers.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2024 The Android Open Source Project +<!-- Copyright (C) 2025 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. @@ -13,12 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- - TODO(b/309578419): Make activities handle insets properly and then remove this. - --> - <style name="OptOutEdgeToEdgeEnforcement"> - <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item> - </style> +<resources> + <integer name="mirror_x_scale">-1</integer> </resources> diff --git a/PermissionController/res/values-lo-v33/strings.xml b/PermissionController/res/values-lo-v33/strings.xml index 743a5bec9..16b913cec 100644 --- a/PermissionController/res/values-lo-v33/strings.xml +++ b/PermissionController/res/values-lo-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"ແຈ້ງເຕືອນເພີ່ມເຕີມ"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"ປິດການແຈ້ງເຕືອນແລ້ວ"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{ຂະຫຍາຍ ແລະ ເບິ່ງແຈ້ງເຕືອນເພີ່ມອີກ 1 ລາຍການ}other{ຂະຫຍາຍ ແລະ ເບິ່ງແຈ້ງເຕືອນເພີ່ມອີກ # ລາຍການ}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"ຫຍໍ້ລົງ"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"ແຈ້ງເຕືອນ. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"ຄຳສັ່ງສຳເລັດ"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"ກວດເບິ່ງການຕັ້ງຄ່າທີ່ສາມາດເພີ່ມການປ້ອງກັນໃຫ້ກັບອຸປະກອນຂອງທ່ານ"</string> diff --git a/PermissionController/res/values-lo/strings.xml b/PermissionController/res/values-lo/strings.xml index d3fe288a3..63a157593 100644 --- a/PermissionController/res/values-lo/strings.xml +++ b/PermissionController/res/values-lo/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g> ເຂົ້າເຖິງແອັບນີ້ຢູ່ <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"ເບິ່ງສິດອະນຸຍາດ <xliff:g id="APP">%1$s</xliff:g> ທັງໝົດ"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"ເບິ່ງແອັບທັງໝົດທີ່ມີສິດອະນຸຍາດນີ້"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"ຂໍ້ມູນ"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"ການຕັ້ງຄ່າ"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"ສະແດງການໃຊ້ໄມໂຄຣໂຟນຂອງຜູ້ຊ່ວຍ"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"ການຕັ້ງຄ່າແອັບທີ່ບໍ່ໄດ້ໃຊ້"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"ລຶບສິດອະນຸຍາດຫາກບໍ່ໄດ້ໃຊ້ແອັບ"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"ການເປີດລິ້ງ"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"ຄ່າເລີ່ມຕົ້ນສຳລັບບ່ອນເຮັດວຽກ"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"ຄ່າເລີ່ມຕົ້ນສຳລັບພື້ນທີ່ສ່ວນບຸກຄົນ"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"ໄດ້ຮັບການເພີ່ມປະສິດທິພາບສຳລັບອຸປະກອນ"</string> + <string name="default_app_others" msgid="7793029848126079876">"ອື່ນໆ"</string> <string name="default_app_none" msgid="9084592086808194457">"ບໍ່ມີ"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(ຄ່າເລີ່ມຕົ້ນຂອງລະບົບ)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"ບໍ່ມີແອັບ"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການອັບໂຫລດຂໍ້ມູນການດີບັກ."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"ແບ່ງປັນຂໍ້ມູນການດີບັກບໍ?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"ລະບົບກວດພົບບັນຫາ."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ກຳລັງຮ້ອງຂໍໃຫ້ອັບໂຫລດລາຍງານຂໍ້ຜິດພາດຈາກອຸປະກອນນີ້ຖືກບັນທຶກມາເມື່ອ <xliff:g id="DATE">%2$s</xliff:g> ເວລາ <xliff:g id="TIME">%3$s</xliff:g>. ລາຍງານຂໍ້ຜິດພາດຕ່າງໆຈະຮວມເອົາຂໍ້ມູນສ່ວນຕົວກ່ຽວກັບອຸປະກອນຂອງທ່ານ ຫຼື ຂໍ້ມູນທີ່ຈັດເກັບໄວ້ໂດຍແອັບ, ຕົວຢ່າງ ເຊັ່ນ: ຊື່ຜູ້ໃຊ້, ຂໍ້ມູນສະຖານທີ່, ຕົວລະບຸອຸປະກອນ ແລະ ຂໍ້ມູນເຄືອຂ່າຍ. ກະລຸນາແບ່ງປັນລາຍງານຂໍ້ຜິດພາດໃຫ້ສະເພາະຄົນ ແລະ ແອັບທີ່ທ່ານເຊື່ອຖືໃຫ້ເຂົ້າເຖິງຂໍ້ມູນນີ້ໄດ້ເທົ່ານັ້ນ. ອະນຸຍາດໃຫ້ <xliff:g id="APP_NAME_1">%4$s</xliff:g> ອັບໂຫລດລາຍງານຂໍ້ຜິດພາດບໍ?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ກຳລັງຮ້ອງຂໍໃຫ້ອັບໂຫຼດລາຍງານຂໍ້ຜິດພາດຈາກອຸປະກອນນີ້ທີ່ບັນທຶກໃນວັນທີ <xliff:g id="DATE">%2$s</xliff:g> ເວລາ <xliff:g id="TIME">%3$s</xliff:g>. ລາຍງານຂໍ້ຜິດພາດຕ່າງໆຈະຮວມເອົາຂໍ້ມູນສ່ວນຕົວກ່ຽວກັບອຸປະກອນຂອງທ່ານ ຫຼື ຂໍ້ມູນທີ່ບັນທຶກໄວ້ໂດຍແອັບ, ຕົວຢ່າງ: ຊື່ຜູ້ໃຊ້, ຂໍ້ມູນສະຖານທີ່, ຕົວລະບຸອຸປະກອນ ແລະ ຂໍ້ມູນເຄືອຂ່າຍ. ໃຫ້ແບ່ງປັນລາຍງານຂໍ້ຜິດພາດກັບຄົນ ແລະ ແອັບທີ່ທ່ານເຊື່ອຖືດ້ວຍຂໍ້ມູນນີ້ໄດ້ເທົ່ານັ້ນ. \n\nອະນຸຍາດໃຫ້ <xliff:g id="APP_NAME_1">%4$s</xliff:g> ອັບໂຫຼດລາຍງານຂໍ້ຜິດພາດບໍ?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"ເກີດບັນຫາໃນການປະມວນຜົນລາຍງານຂໍ້ຜິດພາດສຳລັບ <xliff:g id="APP_NAME">%1$s</xliff:g>. ດັ່ງນັ້ນການແບ່ງປັນຂໍ້ມູນການດີບັກແບບລະອຽດຈຶ່ງຖືກປະຕິເສດ. ຂໍອະໄພສຳລັບການລົບກວນດັ່ງກ່າວ."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"ອະນຸຍາດ"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"ປະຕິເສດ"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"ອະນຸຍາດການຕັ້ງຄ່າທີ່ຈຳກັດ"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"ການຕັ້ງຄ່າທີ່ຈຳກັດ"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"ເພື່ອຄວາມປອດໄພຂອງທ່ານ, ຕອນນີ້ຈຶ່ງບໍ່ສາມາດໃຊ້ການຕັ້ງຄ່ານີ້ໄດ້."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"ການດຳເນີນການບໍ່ພ້ອມນຳໃຊ້ໃນຂະນະທີ່ກຳລັງໂທລະສັບ"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"ບໍ່ອະນຸຍາດໃຫ້ແອັບຕິດຕັ້ງແອັບອື່ນໆໃນລະຫວ່າງການໂທ.\n\n ສະແກມເມີມັກຈະຮ້ອງຂໍການດຳເນີນການປະເພດນີ້ໃນລະຫວ່າງການສົນທະນາທາງໂທລະສັບ, ດັ່ງນັ້ນລະບົບຈຶ່ງບລັອກໄວ້ເພື່ອປົກປ້ອງທ່ານ. ຫາກມີຄົນທີ່ທ່ານບໍ່ຮູ້ຈັກບອກໃຫ້ທ່ານດຳເນີນການດັ່ງກ່າວ, ນັ້ນອາດເປັນສະແກມ."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"ບໍ່ສາມາດດຳເນີນການໃຫ້ສຳເລັດໄດ້ໃນລະຫວ່າງການໂທ"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"ການຕັ້ງຄ່ານີ້ຖືກບລັອກເພື່ອປົກປ້ອງອຸປະກອນ ແລະ ຂໍ້ມູນຂອງທ່ານ.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>ສະແກມເມີອາດຈະພະຍາຍາມຕິດຕັ້ງແອັບທີ່ເປັນອັນຕະລາຍໂດຍການຂໍໃຫ້ທ່ານຕິດຕັ້ງແອັບທີ່ບໍ່ຮູ້ຈັກຈາກແຫຼ່ງໃໝ່."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>ສະແກມເມີອາດຈະພະຍາຍາມຄວບຄຸມອຸປະກອນຂອງທ່ານໂດຍການຂໍໃຫ້ທ່ານອະນຸຍາດສິດເຂົ້າເຖິງສໍາລັບແອັບ."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"ແອັບຖືກປະຕິເສດສິດເຂົ້າເຖິງຫາ <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"ແອັບໄດ້ຮ້ອງຂໍການສິດເຖິງການອະນຸຍາດທີ່ລະອຽດອ່ອນ ເຊິ່ງສາມາດເຮັດໃຫ້ຂໍ້ມູນສ່ວນຕົວ ແລະ ຂໍ້ມູນການເງິນຂອງທ່ານມີຄວາມສ່ຽງ.<xliff:g id="ID_1"><br><br></xliff:g>ມັນເປັນໄປໄດ້ວ່າແອັບດັ່ງກ່າວຈະບໍ່ເຮັດວຽກຢ່າງຖືກຕ້ອງໂດຍບໍ່ມີການອະນຸຍາດທີ່ຖືກຈຳກັດໄວ້ນີ້. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>ສຶກສາວິທີອະນຸຍາດສິດເຂົ້າເຖິງ</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"ແອັບຖືກປະຕິເສດສິດເຂົ້າເຖິງໃຫ້ເປັນ <xliff:g id="ROLE_NAME">%1$s</xliff:g> ຄ່າເລີ່ມຕົ້ນ"</string> diff --git a/PermissionController/res/values-lt-v33/strings.xml b/PermissionController/res/values-lt-v33/strings.xml index 41c3bdc9f..86876c5e9 100644 --- a/PermissionController/res/values-lt-v33/strings.xml +++ b/PermissionController/res/values-lt-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Daugiau įspėjimų"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Atsisakyta įspėjimų"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Išskleiskite ir peržiūrėkite dar vieną įspėjimą}one{Išskleiskite ir peržiūrėkite dar # įspėjimą}few{Išskleiskite ir peržiūrėkite dar # įspėjimus}many{Išskleiskite ir peržiūrėkite dar # įspėjimo}other{Išskleiskite ir peržiūrėkite dar # įspėjimų}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Sutraukti"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Įspėjimas. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Veiksmas atliktas"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Patikrinkite nustatymus, kuriuos taikant galima užtikrinti papildomą įrenginio apsaugą"</string> diff --git a/PermissionController/res/values-lt/strings.xml b/PermissionController/res/values-lt/strings.xml index 12718ca65..0000f2c11 100644 --- a/PermissionController/res/values-lt/strings.xml +++ b/PermissionController/res/values-lt/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g> prieiga šiai programai „<xliff:g id="DEVICE_NAME">%2$s</xliff:g>“"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Žr. visus „<xliff:g id="APP">%1$s</xliff:g>“ leidimus"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Žr. visas programas, kurioms suteiktas šis leidimas"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informacija"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Nustatymai"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Rodyti Padėjėjo mikrofono naudojimą"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Nenaudojamos programos nustatymai"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Pašalinti leidimus, jei programa nenaudojama"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Nuorodų atidarymas"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Numatytosios darbo programos"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Privačios erdvės numatytosios programos"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimizuota pagal įrenginį"</string> + <string name="default_app_others" msgid="7793029848126079876">"Kita"</string> <string name="default_app_none" msgid="9084592086808194457">"Nėra"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Sistemos numatytoji programa)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Nėra programų"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"Programa „<xliff:g id="APP_NAME">%1$s</xliff:g>“ norėtų įkelti derinimo informaciją."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Bendrinti derinimo duomenis?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Sistemoje aptikta problema."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"Programa „<xliff:g id="APP_NAME_0">%1$s</xliff:g>“ prašo iš šio įrenginio įkelti pranešimą apie riktą, užfiksuotą <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g>. Į pranešimus apie riktus įtraukiama asmens informacija apie įrenginį arba programų į žurnalą įrašyta informacija, pavyzdžiui, naudotojų vardai, vietovių duomenys, įrenginių identifikatoriai ir tinklo informacija. Pranešimus apie riktus bendrinkite tik su tais žmonėmis ir programomis, kuriais pasitikite ir kuriems galite patikėti šią informaciją. Leisti programai „<xliff:g id="APP_NAME_1">%4$s</xliff:g>“ įkelti pranešimą apie riktą?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"Programa „<xliff:g id="APP_NAME_0">%1$s</xliff:g>“ prašo iš šio įrenginio įkelti pranešimą apie riktą, užfiksuotą <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g>. Į pranešimus apie riktus įtraukiama asmens informacija apie įrenginį arba programų į žurnalą įrašyta informacija, pavyzdžiui, naudotojų vardai, vietovių duomenys, įrenginių identifikatoriai ir tinklo informacija. Pranešimus apie riktus bendrinkite tik su tais žmonėmis ir programomis, kuriais pasitikite ir kuriems galite patikėti šią informaciją.\n\n Leisti programai „<xliff:g id="APP_NAME_1">%4$s</xliff:g>“ įkelti pranešimą apie riktą?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Apdorojant „<xliff:g id="APP_NAME">%1$s</xliff:g>“ pranešimą apie riktą įvyko klaida, todėl išsamių derinimo duomenų bendrinimas buvo atmestas. Atsiprašome už nepatogumus."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Leisti"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Atmesti"</string> @@ -584,7 +588,7 @@ <string name="privacy_controls_qs" msgid="5780144882040591169">"Jūsų privatumo valdikliai"</string> <string name="security_settings_button_label_qs" msgid="8280343822465962330">"Daugiau nustatymų"</string> <string name="camera_toggle_label_qs" msgid="3880261453066157285">"Prieiga prie fotoaparato"</string> - <string name="microphone_toggle_label_qs" msgid="8132912469813396552">"Prieiga prie mikrofono"</string> + <string name="microphone_toggle_label_qs" msgid="8132912469813396552">"Mikrofonas"</string> <string name="permissions_removed_qs" msgid="8957319130625294572">"Leidimas pašalintas"</string> <string name="camera_usage_qs" msgid="4394233566086665994">"Žr. pastarąjį vaizdo kameros naudojimą"</string> <string name="microphone_usage_qs" msgid="8527666682168170417">"Žr. pastarąjį mikrofono naudojimą"</string> @@ -625,7 +629,7 @@ <string name="safety_center_background_location_access_revoked" msgid="6972274943343442213">"Prieiga pakeista"</string> <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"Žr. pastarąjį vietovės nustatymo funkcijos naudojimą"</string> <string name="privacy_controls_title" msgid="7605929972256835199">"Privatumo valdikliai"</string> - <string name="camera_toggle_title" msgid="1251201397431837666">"Prieiga prie fotoaparato"</string> + <string name="camera_toggle_title" msgid="1251201397431837666">"Fotoaparatas"</string> <string name="mic_toggle_title" msgid="2649991093496110162">"Prieiga prie mikrofono"</string> <string name="perm_toggle_description" msgid="7801326363741451379">"Skirta programoms ir paslaugoms"</string> <string name="mic_toggle_description" msgid="9163104307990677157">"Skirta programoms ir paslaugoms. Jei šis nustatymas išjungtas, mikrofono duomenys vis tiek gali būti bendrinami, skambinant pagalbos numeriu."</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Leisti apribotus nustatymus"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Apribotas nustatymas"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Šis nustatymas šiuo metu nepasiekiamas dėl jūsų saugumo."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Veiksmas nepasiekiamas vykstant pokalbiui telefonu"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Leidimas programoms įdiegti kitas programas neveikia vykstant pokalbiui telefonu.\n\n Sukčiai dažnai prašo atlikti tokio tipo veiksmus vykstant pokalbiui telefonu, todėl šis veiksmas blokuojamas siekiant jus apsaugoti. Jei nepažįstamas asmuo prašo atlikti šį veiksmą, tai gali būti sukčiavimas."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Nepavyko atlikti veiksmo per skambutį"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Šis nustatymas užblokuotas siekiant apsaugoti įrenginį ir duomenis.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Aferistai gali bandyti įdiegti žalingų programų, prašydami įdiegti nežinomų programų iš naujo šaltinio."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Aferistai gali bandyti perimti jūsų įrenginio valdymą, prašydami suteikti galimybę pasiekti programą."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Programai prieiga nesuteikta:<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Programa pateikė leidimo pasiekti neskelbtiną informaciją, dėl kurio gali kilti pavojus jūsų asmens ir finansinei informacijai, užklausą.<xliff:g id="ID_1"><br><br></xliff:g>Gali būti, kad be šio apriboto leidimo programa neveiks tinkamai. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Sužinokite, kaip suteikti prieigą</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Programai nesuteikta prieiga kaip numatytojo šio vaidmens: <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-lv-v33/strings.xml b/PermissionController/res/values-lv-v33/strings.xml index 825ac7aec..315b2da06 100644 --- a/PermissionController/res/values-lv-v33/strings.xml +++ b/PermissionController/res/values-lv-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Citi brīdinājumi"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Noraidītie brīdinājumi"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Izvērsiet un skatiet vēl vienu brīdinājumu.}zero{Izvērsiet un skatiet vēl # brīdinājumus.}one{Izvērsiet un skatiet vēl # brīdinājumu.}other{Izvērsiet un skatiet vēl # brīdinājumus.}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Sakļaut"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Brīdinājums. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Darbība ir pabeigta"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Pārbaudiet iestatījumus, kas var uzlabot ierīces aizsardzību"</string> diff --git a/PermissionController/res/values-lv/strings.xml b/PermissionController/res/values-lv/strings.xml index 131aeff27..81a68f06f 100644 --- a/PermissionController/res/values-lv/strings.xml +++ b/PermissionController/res/values-lv/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Šai lietotnei ir piešķirta piekļuves atļauja “<xliff:g id="PERM">%1$s</xliff:g>” šajā ierīcē: <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Skatīt visas lietotnei <xliff:g id="APP">%1$s</xliff:g> piešķirtās atļaujas"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Skatīt visas lietotnes, kam ir šī atļauja"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informācija"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Iestatījumi"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Rādīt Asistenta mikrofona lietojumu"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Neizmantoto lietotņu iestatījumi"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Noņemt atļaujas, ja lietotne netiek izmantota"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Saišu atvēršana"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Noklusējuma iestatījums darbam"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Noklusējums privātajai telpai"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimizētas ierīcei"</string> + <string name="default_app_others" msgid="7793029848126079876">"Citas"</string> <string name="default_app_none" msgid="9084592086808194457">"Nav"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Sistēmas noklusējums)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Nav lietotņu"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> vēlas augšupielādēt atkļūdošanas informāciju."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Vai kopīgot atkļūdošanas datus?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Sistēmā tika konstatēta problēma."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> pieprasa augšupielādēt kļūdas pārskatu no šīs ierīces, kas veikts: <xliff:g id="DATE">%2$s</xliff:g> plkst. <xliff:g id="TIME">%3$s</xliff:g>. Kļūdu pārskatos ir ietverta personas informācija par jūsu ierīci vai lietotnēs reģistrēta informācija, piemēram, lietotājvārdi, atrašanās vietas dati, ierīču identifikatori un tīkla informācija. Kopīgojiet kļūdu pārskatus tikai ar lietotājiem un lietotnēm, kuriem uzticat šo informāciju. Vai atļaut <xliff:g id="APP_NAME_1">%4$s</xliff:g> augšupielādēt kļūdas pārskatu?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"Lietotne <xliff:g id="APP_NAME_0">%1$s</xliff:g> pieprasa augšupielādēt kļūdas pārskatu no šīs ierīces, kas izveidots šajā datumā: <xliff:g id="DATE">%2$s</xliff:g>, plkst. <xliff:g id="TIME">%3$s</xliff:g>. Kļūdu pārskatos ir ietverta personas informācija, kas saistīta ar jūsu ierīci, vai lietotnēs reģistrēta informācija, piemēram, lietotājvārdi, atrašanās vietas dati, ierīču identifikatori un tīkla informācija. Kopīgojiet kļūdu pārskatus tikai ar uzticamiem lietotājiem un lietotnēm.\n\nVai atļaut lietotnei <xliff:g id="APP_NAME_1">%4$s</xliff:g> augšupielādēt kļūdas pārskatu?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Apstrādājot lietotnes <xliff:g id="APP_NAME">%1$s</xliff:g> kļūdas pārskatu, radās problēma. Tāpēc detalizēto atkļūdošanas datu kopīgošana tika liegta. Atvainojiet par traucējumu!"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Atļaut"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Neatļaut"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Atļaut ierobežotos iestatījumus"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Ierobežots iestatījums"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Drošības apsvērumu dēļ šis iestatījums pašlaik nav pieejams."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Darbība nav pieejama tālruņa zvana laikā"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Tālruņa zvana laikā lietotnēm nav atļauts instalēt citas lietotnes.\n\n Šāda veida darbību tālruņa zvana laikā bieži pieprasa krāpnieki, tāpēc šī iespēja ir bloķēta, lai jūs aizsargātu. Ja jums nepazīstama persona jums iesaka veikt šo darbību, tas var būt krāpniecības mēģinājums."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Nevar pabeigt darbību zvana laikā"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Šis iestatījums ir bloķēts, lai aizsargātu jūsu ierīci un datus.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Krāpnieki var mēģināt instalēt kaitīgas lietotnes, lūdzot jums instalēt nezināmas lietotnes no jauna avota."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Krāpnieki var mēģināt pārņemt kontroli pār jūsu ierīci, lūdzot jums atļaut piekļuvi pieejamības funkcijām lietotnē."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Lietotnes piekļuve atļaujai “<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>” tika liegta"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Lietotne ir pieprasījusi piekļuvi sensitīvai atļaujai, kas var apdraudēt jūsu personas un finanšu informāciju.<xliff:g id="ID_1"><br><br></xliff:g>Iespējams, lietotne nedarbosies pareizi bez šīs ierobežotās atļaujas. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Uzziniet, kā piešķirt piekļuvi.</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Lietotnes piekļuve noklusējuma lomai “<xliff:g id="ROLE_NAME">%1$s</xliff:g>” tika liegta"</string> diff --git a/PermissionController/res/values-mk-v33/strings.xml b/PermissionController/res/values-mk-v33/strings.xml index 95896fb8e..2852ec7e1 100644 --- a/PermissionController/res/values-mk-v33/strings.xml +++ b/PermissionController/res/values-mk-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Повеќе предупредувања"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Отфрлени известувања"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Проширете и видете уште едно предупредување}one{Проширете и видете уште # предупредување}other{Проширете и видете уште # предупредувањa}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Собери"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Предупредување. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Дејството е завршено"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Прегледајте ги поставките со кои може дополнително да го заштитите уредот"</string> diff --git a/PermissionController/res/values-mk/strings.xml b/PermissionController/res/values-mk/strings.xml index 2f10498c5..c1c1662a2 100644 --- a/PermissionController/res/values-mk/strings.xml +++ b/PermissionController/res/values-mk/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Пристап до <xliff:g id="PERM">%1$s</xliff:g> за апликацијава на <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Прикажи ги сите дозволи за <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Прикажи ги сите апликации со оваа дозвола"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Информации"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Поставки"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Прикажи го користењето на микрофонот на „Помошникот“"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Поставки за некористени апликации"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Отстрани ги дозволите ако апликацијата не се користи"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"За отворање линкови"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Стандардно за работа"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Стандардно за „Приватен простор“"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Оптимизирано за уредот"</string> + <string name="default_app_others" msgid="7793029848126079876">"Други"</string> <string name="default_app_none" msgid="9084592086808194457">"Нема"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Стандардно за системот)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Нема апликации"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> сака да прикачи информации за отстранување грешки."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Да се споделат податоци за отстранување грешки?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Системот откри проблем."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> бара да прикачи извештај за грешка од уредов снимен на <xliff:g id="DATE">%2$s</xliff:g> во <xliff:g id="TIME">%3$s</xliff:g>. Извештаите за грешки вклучуваат лични податоци за вашиот уред или пак податоци евидентирани од апликациите, на пр., кориснички имиња, податоци за локацијата, идентификатори на уредот и податоци за мрежата. Споделувајте извештаи за грешки само со луѓе и апликации во кои имате доверба кога станува збор за овие податоци. Да ѝ се дозволи на <xliff:g id="APP_NAME_1">%4$s</xliff:g> да прикачи извештај за грешка?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> бара да прикачи извештај за грешка од уредов создаден на <xliff:g id="DATE">%2$s</xliff:g> во <xliff:g id="TIME">%3$s</xliff:g>. Извештаите за грешки опфаќаат лични податоци за вашиот уред или пак податоци евидентирани од апликациите, на пр., кориснички имиња, податоци за локацијата, идентификатори на уредот и податоци за мрежата. Споделувајте извештаи за грешки само со луѓе и апликации во кои имате доверба кога станува збор за овие податоци.\n\nДа се дозволи <xliff:g id="APP_NAME_1">%4$s</xliff:g> да прикачи извештај за грешка?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Настана грешка при обработката на извештајот за грешки за <xliff:g id="APP_NAME">%1$s</xliff:g>. Затоа е одбиено споделувањето на податоците за отстранување грешки. Се извинуваме за прекинот."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Дозволи"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Одбиј"</string> @@ -624,7 +628,7 @@ <string name="safety_center_background_location_access_reminder_summary" msgid="7431657777510537658">"Апликацијава може секогаш да пристапува до вашата локација, дури и кога е затворена.\n\nНа одредени апликации за безбедност и итни случаи им е потребен пристап до вашата локација во заднината за правилно да функционираат."</string> <string name="safety_center_background_location_access_revoked" msgid="6972274943343442213">"Пристапот е променет"</string> <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"Погледнете го неодамнешното користење на локацијата"</string> - <string name="privacy_controls_title" msgid="7605929972256835199">"Контроли на приватноста"</string> + <string name="privacy_controls_title" msgid="7605929972256835199">"Контроли за приватност"</string> <string name="camera_toggle_title" msgid="1251201397431837666">"Пристап до камерата"</string> <string name="mic_toggle_title" msgid="2649991093496110162">"Пристап до микрофонот"</string> <string name="perm_toggle_description" msgid="7801326363741451379">"За апликации и услуги"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Дозволете ограничени поставки"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Ограничена поставка"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"За ваша безбедност, поставкава е недостапна во моментов."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Дејството не е достапно при телефонски повик"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Дозволувањето апликациите да инсталираат други апликации е оневозможено при телефонски повик.\n\n Измамниците често бараат ваков тип дејства при телефонските разговори, па блокирано е за да ве заштити. Ако некој што не го познавате ве води да го преземете дејствово, тоа може да биде измама."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Дејството не може да се заврши во тек на повик"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g> Поставкава е блокирана за да ги заштити вашиот уред и податоци."</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Измамниците може да се обидат да инсталираат штетни апликации барајќи од вас да инсталирате непознати апликации од нов извор."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Измамниците може да се обидат да ја преземат контролата врз вашиот уред барајќи од вас да дозволите пристап до пристапноста за некоја апликација."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Барањето за пристап на апликацијата до <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> е одбиено"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Апликацијата побара пристап до дозвола за чувствителни податоци што може да ја загрози безбедноста на вашите лични и финансиски податоци.<xliff:g id="ID_1"><br><br></xliff:g>Можно е апликацијата да не функционира правилно без ограниченава дозвола. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Дознајте како да дозволите пристап</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Барањето на апликацијата да биде стандарднa <xliff:g id="ROLE_NAME">%1$s</xliff:g> е одбиено"</string> diff --git a/PermissionController/res/values-ml-v33/strings.xml b/PermissionController/res/values-ml-v33/strings.xml index a4cc0190e..2f09237ef 100644 --- a/PermissionController/res/values-ml-v33/strings.xml +++ b/PermissionController/res/values-ml-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"കൂടുതൽ മുന്നറിയിപ്പുകൾ"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"ഡിസ്മിസ് ചെയ്ത മുന്നറിയിപ്പുകൾ"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{വികസിപ്പിച്ച് ഒരു മുന്നറിയിപ്പ് കൂടി കാണുക}other{വികസിപ്പിച്ച് # മുന്നറിയിപ്പ് കൂടി കാണുക}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"ചുരുക്കുക"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"മുന്നറിയിപ്പ്. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"പ്രവർത്തനം പൂർത്തിയായി"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"നിങ്ങളുടെ ഉപകരണത്തിന് കൂടുതൽ പരിരക്ഷ നൽകാനാകുന്ന ക്രമീകരണങ്ങൾ പരിശോധിക്കുക"</string> diff --git a/PermissionController/res/values-ml/strings.xml b/PermissionController/res/values-ml/strings.xml index e7ff97ea7..86a1ed680 100644 --- a/PermissionController/res/values-ml/strings.xml +++ b/PermissionController/res/values-ml/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> എന്നതിലെ ഈ ആപ്പിനുള്ള <xliff:g id="PERM">%1$s</xliff:g> ആക്സസ്"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"എല്ലാ <xliff:g id="APP">%1$s</xliff:g> അനുമതികളും കാണുക"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"ഈ അനുമതിയുള്ള എല്ലാ ആപ്പുകളും കാണുക"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"വിവരങ്ങൾ"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"ക്രമീകരണം"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"സഹായ മൈക്രോഫോൺ ഉപയോഗം കാണിക്കുക"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"ഉപയോഗിക്കാത്ത ആപ്പ് ക്രമീകരണം"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"ഉപയോഗിക്കാത്ത ആപ്പാണെങ്കിൽ അനുമതികൾ നീക്കം ചെയ്യുക"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"ലിങ്കുകൾ തുറക്കൽ"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"ജോലി ആവശ്യങ്ങൾക്ക് ഡിഫോൾട്ട്"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"സ്വകാര്യ സ്പേസിനായുള്ള ഡിഫോൾട്ട്"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"ഉപകരണത്തിനായി ഒപ്റ്റിമൈസ് ചെയ്തു"</string> + <string name="default_app_others" msgid="7793029848126079876">"മറ്റുള്ളവ"</string> <string name="default_app_none" msgid="9084592086808194457">"ഒന്നുമില്ല"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(സിസ്റ്റം ഡിഫോൾട്ട്)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"ആപ്പുകൾ ഒന്നുമില്ല"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"ഡീബഗ്ഗ് ചെയ്യൽ വിവരങ്ങൾ അപ്ലോഡ് ചെയ്യാൻ <xliff:g id="APP_NAME">%1$s</xliff:g> താൽപ്പര്യപ്പെടുന്നു."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"ഡീബഗ്ഗ് ചെയ്യൽ ഡാറ്റ പങ്കിടണോ?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"സിസ്റ്റം ഒരു പ്രശ്നം കണ്ടെത്തി."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"ഈ ഉപകരണത്തിൽ നിന്ന് <xliff:g id="DATE">%2$s</xliff:g>-ന് <xliff:g id="TIME">%3$s</xliff:g>-ന് എടുത്ത ഒരു ബഗ് റിപ്പോർട്ട് അപ്ലോഡ് ചെയ്യാൻ <xliff:g id="APP_NAME_0">%1$s</xliff:g> അഭ്യർത്ഥിക്കുന്നു. നിങ്ങളുടെ ഉപകരണത്തെക്കുറിച്ചുള്ള വ്യക്തിപരമായ വിവരങ്ങളോ ആപ്പുകൾ ലോഗ് ചെയ്യുമ്പോൾ നൽകുന്ന വിവരമോ, ഉദാഹരണത്തിന് നെറ്റ്വർക്ക് വിവരങ്ങൾ, ഉപകരണ ഐഡന്റിഫയറുകൾ, ലൊക്കേഷൻ ഡാറ്റ, ഉപയോക്തൃനാമങ്ങൾ എന്നിവ ബഗ് റിപ്പോർട്ടുകളിൽ ഉൾപ്പെടുന്നു. ഈ വിവരം ഉപയോഗിച്ച് നിങ്ങൾ വിശ്വസിക്കുന്ന ആപ്പുകൾക്കും ആളുകൾക്കും മാത്രം ബഗ് റിപ്പോർട്ടുകൾ പങ്കിടുക. <xliff:g id="APP_NAME_1">%4$s</xliff:g> എന്നതിനെ ഒരു ബഗ് റിപ്പോർട്ട് അപ്ലോഡ് ചെയ്യാൻ അനുവദിക്കണോ?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g>-ന് എടുത്ത ഈ ഉപകരണത്തിൽ നിന്ന് ഒരു ബഗ് റിപ്പോർട്ട് അപ്ലോഡ് ചെയ്യാൻ <xliff:g id="APP_NAME_0">%1$s</xliff:g> അഭ്യർത്ഥിക്കുന്നു. നിങ്ങളുടെ ഉപകരണത്തെക്കുറിച്ചുള്ള വ്യക്തിപരമായ വിവരങ്ങളോ ആപ്പുകൾ ലോഗ് ചെയ്യുമ്പോൾ നൽകുന്ന വിവരമോ, ഉദാഹരണത്തിന് നെറ്റ്വർക്ക് വിവരങ്ങൾ, ഉപകരണ ഐഡന്റിഫയറുകൾ, ലൊക്കേഷൻ ഡാറ്റ, ഉപയോക്തൃനാമങ്ങൾ എന്നിവ ബഗ് റിപ്പോർട്ടുകളിൽ ഉൾപ്പെടുന്നു. ഈ വിവരം ഉപയോഗിച്ച് നിങ്ങൾ വിശ്വസിക്കുന്ന ആപ്പുകൾക്കും ആളുകൾക്കും മാത്രം ബഗ് റിപ്പോർട്ടുകൾ പങ്കിടുക. \n\n <xliff:g id="APP_NAME_1">%4$s</xliff:g> എന്നതിനെ ഒരു ബഗ് റിപ്പോർട്ട് അപ്ലോഡ് ചെയ്യാൻ അനുവദിക്കണോ?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> എന്ന ആപ്പിൻ്റെ ബഗ് റിപ്പോർട്ട് പ്രോസസ് ചെയ്യുന്നതിൽ ഒരു പിശകുണ്ടായി. അതിനാൽ വിശദമായ ഡീബഗ്ഗ് ചെയ്യൽ ഡാറ്റ പങ്കിടുന്നത് തടഞ്ഞു. തടസ്സം നേരിട്ടതിൽ ഖേദിക്കുന്നു."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"അനുവദിക്കുക"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"നിരസിക്കുക"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"നിയന്ത്രിത ക്രമീകരണം അനുവദിക്കുക"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"നിയന്ത്രിത ക്രമീകരണം"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"നിങ്ങളുടെ സുരക്ഷയ്ക്ക്, ഈ ക്രമീകരണം നിലവിൽ ലഭ്യമല്ല."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"ഫോൺ കോളിനിടെ പ്രവർത്തനം ലഭ്യമല്ല"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"ഫോൺ കോളിനിടെ മറ്റ് ആപ്പുകൾ ഇൻസ്റ്റാൾ ചെയ്യാനുള്ള അനുവാദം ആപ്പുകൾക്കില്ല.\n\n ഫോൺ കോൾ സംഭാഷണത്തിനിടെ സ്കാമർമാർ പലപ്പോഴും ഇത്തരത്തിലുള്ള പ്രവർത്തനം അഭ്യർത്ഥിക്കാറുണ്ട്, അതിനാൽ നിങ്ങളെ പരിരക്ഷിക്കുന്നതിനായി ഇത് ബ്ലോക്ക് ചെയ്തിരിക്കുന്നു. പരിചയമില്ലാത്ത ആരെങ്കിലുമാണ് ഈ പ്രവർത്തനം നിങ്ങളോട് നിർദ്ദേശിക്കുന്നതെങ്കിൽ, അതൊരു സ്കാം ആയേക്കാം."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"കോളിനിടെ പ്രവർത്തനം പൂർത്തിയാക്കാനാവില്ല"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"നിങ്ങളുടെ ഉപകരണവും ഡാറ്റയും പരിരക്ഷിക്കാൻ ഈ ക്രമീകരണം ബ്ലോക്ക് ചെയ്തിരിക്കുന്നു.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>പുതിയൊരു ഉറവിടത്തിൽ നിന്നുള്ള അജ്ഞാതമായ ആപ്പുകൾ ഇൻസ്റ്റാൾ ചെയ്യാൻ നിങ്ങളോട് അവശ്യപ്പെട്ടുകൊണ്ട് സ്കാമർമാർ ദോഷകരമായ ആപ്പുകൾ ഇൻസ്റ്റാൾ ചെയ്യാൻ ശ്രമിച്ചേക്കാം."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>ഒരു ആപ്പിനായുള്ള ഉപയോഗസഹായി ആക്സസ് അനുവദിക്കാൻ നിങ്ങളോട് ആവശ്യപ്പെട്ടുകൊണ്ട് സ്കാമർമാർ നിങ്ങളുടെ ഉപകരണത്തിന്റെ നിയന്ത്രണം ഏറ്റെടുക്കാൻ ശ്രമിച്ചേക്കാം."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"ആപ്പിന് <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> എന്നതിലേക്കുള്ള ആക്സസ് നിരസിച്ചു"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"ആപ്പ് സെൻസിറ്റീവ് വിവരങ്ങൾക്കുള്ള അനുമതിയിലേക്ക് ആക്സസ് അഭ്യർത്ഥിച്ചു, ഇത് നിങ്ങളുടെ വ്യക്തിപരവും സാമ്പത്തികവുമായ വിവരങ്ങളെ അപകടത്തിലാക്കിയേക്കാം.<xliff:g id="ID_1"><br><br></xliff:g>ഈ നിയന്ത്രിത അനുമതിയില്ലാതെ ആപ്പ് ശരിയായി പ്രവർത്തിച്ചേക്കില്ല. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>ആക്സസ് എങ്ങനെ അനുവദിക്കുന്നുവെന്നറിയുക</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"ആപ്പിന് ഡിഫോൾട്ട് <xliff:g id="ROLE_NAME">%1$s</xliff:g> ആകാനുള്ള ആക്സസ് നിരസിച്ചു"</string> diff --git a/PermissionController/res/values-mn-v33/strings.xml b/PermissionController/res/values-mn-v33/strings.xml index 327723433..dd8a7b570 100644 --- a/PermissionController/res/values-mn-v33/strings.xml +++ b/PermissionController/res/values-mn-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Бусад сэрэмжлүүлэг"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Сэрэмжлүүлгийг хаасан"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Дэлгээд дахин нэг анхааруулга харах}other{Дэлгээд дахин # анхааруулга харах}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Хураах"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Сэрэмжлүүлэг. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Үйлдэл дууссан"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Таны төхөөрөмжид хамгаалалт нэмэх боломжтой тохиргоог шалгана уу"</string> diff --git a/PermissionController/res/values-mn/strings.xml b/PermissionController/res/values-mn/strings.xml index 0330dc6d2..07501a5f0 100644 --- a/PermissionController/res/values-mn/strings.xml +++ b/PermissionController/res/values-mn/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> дээрх энэ аппын <xliff:g id="PERM">%1$s</xliff:g>-д хандах эрх"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"<xliff:g id="APP">%1$s</xliff:g>-н бүх зөвшөөрлийг харах"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Энэ зөвшөөрөлтэй бүх аппыг харах"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Мэдээлэл"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Тохиргоо"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Туслах микрофон ашиглалтыг харуулах"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Ашиглаагүй аппын тохиргоо"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Аппыг ашигладаггүй бол зөвшөөрлийг нь хасах"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Холбоосыг нээх сонголт"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Ажлын өгөгдмөл апп"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Хаалттай орон зайн өгөгдмөл"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Төхөөрөмжид зориулж оновчилсон"</string> + <string name="default_app_others" msgid="7793029848126079876">"Бусад"</string> <string name="default_app_none" msgid="9084592086808194457">"Тохируулсан апп алга"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Системийн өгөгдмөл)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Апп алга"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> алдаа засах мэдээллийг байршуулах хүсэлтэй байна."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Дебаг хийх өгөгдлийг хуваалцах уу?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Систем асуудал илрүүллээ."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> энэ төхөөрөмжөөс <xliff:g id="DATE">%2$s</xliff:g>-н <xliff:g id="TIME">%3$s</xliff:g>-д авсан алдааны мэдээг байршуулах хүсэлт тавьж байна. Алдааны мэдээнд таны төхөөрөмжийн талаарх эсвэл хэрэглэгчийн нэр, байршлын өгөгдөл, төхөөрөмжийн танигч болон сүлжээний мэдээлэл зэрэг аппуудын бүртгэсэн хувийн мэдээллийг агуулна. Та алдааны мэдээг зөвхөн энэ мэдээллийг хуваалцахдаа итгэлтэй байгаа хүмүүс болон аппуудтай хуваалцана уу. <xliff:g id="APP_NAME_1">%4$s</xliff:g>-д алдааны мэдээг байршуулахыг зөвшөөрөх үү?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> энэ төхөөрөмжөөс <xliff:g id="DATE">%2$s</xliff:g>-ны <xliff:g id="TIME">%3$s</xliff:g>-нд авсан алдааны мэдээг байршуулахыг хүсэж байна. Алдааны мэдээнд таны төхөөрөмж болон хэрэглэгчийн нэр, байршлын өгөгдөл, төхөөрөмж танигч, сүлжээний мэдээлэл зэрэг аппын бүртгэсэн хувийн мэдээлэл багтдаг. Та алдааны мэдээг зөвхөн итгэдэг хүн, апптайгаа хуваалцаарай.\n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g>-д алдааны мэдээ байршуулахыг зөвшөөрөх үү?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g>-н алдааны мэдээг боловсруулахад алдаа гарсан тул алдаа засах дэлгэрэнгүй өгөгдлийг хуваалцахаас татгалзлаа. Төвөг удсанд хүлцэл өчье."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Зөвшөөрөх"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Татгалзах"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Хязгаарлагдсан тохиргоог зөвшөөрөх"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Хязгаарлагдсан тохиргоо"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Таны аюулгүй байдлын үүднээс энэ тохиргоо одоогоор боломжгүй байна."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Утасны дуудлага хийж байхад үйлдэл хийх боломжгүй"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Утасны дуудлагын үеэр аппуудад бусад апп суулгахыг зөвшөөрдөггүй.\n\n Залилагчид утасны дуудлагын харилцан ярианы үеэр ийм төрлийн үйлдлийг ихэвчлэн хүсдэг тул таныг хамгаалахаар уг үйлдлийг блоклосон. Хэрэв таны танихгүй хүн ийм үйлдэл хийлгэхээр таныг чиглүүлж байгаа бол энэ нь заль мэх байж болно."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Дуудлагын үеэр үйлдэл гүйцэтгэх боломжгүй"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Таны төхөөрөмж, өгөгдлийг хамгаалахын тулд энэ тохиргоог блоклосон.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Залилагч танаас шинэ эх сурвалжаас тодорхойгүй апп суулгахыг хүсэж хор хөнөөлтэй апп суулгахаар оролдож магадгүй."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Залилагч танаас аппын хандалтын эрхийг зөвшөөрөхийг хүсэж таны төхөөрөмжийн хяналтыг гартаа авахаар оролдож магадгүй."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Аппад <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>-д хандах эрх олгохоос татгалзсан"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Апп нь таны хувийн болон санхүүгийн мэдээллийг эрсдэлд оруулж болох эмзэг зөвшөөрөлд хандах эрх хүссэн.<xliff:g id="ID_1"><br><br></xliff:g>Энэ хязгаарлагдмал зөвшөөрөлгүйгээр уг апп зохих ёсоор ажиллахгүй байх боломжтой. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Хандах эрхийг хэрхэн зөвшөөрөх талаар мэдэж авах</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Аппад өгөгдмөл <xliff:g id="ROLE_NAME">%1$s</xliff:g> болох эрх олгохоос татгалзсан"</string> diff --git a/PermissionController/res/values-mr-television/strings.xml b/PermissionController/res/values-mr-television/strings.xml index 4d6abe830..7184f2b1e 100644 --- a/PermissionController/res/values-mr-television/strings.xml +++ b/PermissionController/res/values-mr-television/strings.xml @@ -19,7 +19,7 @@ <string name="grant_dialog_button_deny_dont_ask_again" msgid="747769682501286250">"नकार द्या आणि पुन्हा विचारू नका"</string> <string name="grant_dialog_how_to_change" msgid="997462845048160559">"तुम्ही हे नंतर सेटिंग्ज आणि अॅप्स मध्ये बदलू शकता"</string> <string name="current_permission_template" msgid="6240787325714651204">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="preference_show_system_apps" msgid="4262140518693221093">"सिस्टम अॅप्स दाखवा"</string> + <string name="preference_show_system_apps" msgid="4262140518693221093">"सिस्टीम ॲप्स दाखवा"</string> <string name="app_permissions_decor_title" msgid="7438716722786036814">"अॅप परवानग्या"</string> <string name="manage_permissions_decor_title" msgid="4138423885439613577">"अॅप परवानग्या"</string> <string name="permission_apps_decor_title" msgid="2811550489429789828">"<xliff:g id="PERMISSION">%1$s</xliff:g> परवानग्या"</string> diff --git a/PermissionController/res/values-mr-v33/strings.xml b/PermissionController/res/values-mr-v33/strings.xml index cea91a4b2..ceeb2332a 100644 --- a/PermissionController/res/values-mr-v33/strings.xml +++ b/PermissionController/res/values-mr-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"आणखी सूचना"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"डिसमिस केलेल्या सूचना"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{विस्तार करा आणि आणखी एक सूचना पहा}other{विस्तार करा आणि आणखी # सूचना पहा}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"कोलॅप्स करा"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"इशारा. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"कृती पूर्ण झाली आहे"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"तुमच्या डिव्हाइसला संरक्षण जोडू शकतील अशी सेटिंग्ज तपासा"</string> diff --git a/PermissionController/res/values-mr-watch/strings.xml b/PermissionController/res/values-mr-watch/strings.xml index 77d7ee44a..261296356 100644 --- a/PermissionController/res/values-mr-watch/strings.xml +++ b/PermissionController/res/values-mr-watch/strings.xml @@ -18,7 +18,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="grant_dialog_button_deny_dont_ask_again" msgid="5709879604352260492">"नकार द्या, पुन्हा विचारू नका"</string> <string name="current_permission_template" msgid="6634462553790549887">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="preference_show_system_apps" msgid="1055740303992024300">"सिस्टम अॅप्स दाखवा"</string> + <string name="preference_show_system_apps" msgid="1055740303992024300">"सिस्टीम ॲप्स दाखवा"</string> <string name="permission_summary_enforced_by_policy" msgid="2352478756952948019">"बदलू शकत नाही"</string> <string name="generic_yes" msgid="2489207724988649846">"होय"</string> <string name="generic_cancel" msgid="2631708607129269698">"रद्द करा"</string> diff --git a/PermissionController/res/values-mr/strings.xml b/PermissionController/res/values-mr/strings.xml index 8f8172131..383308ed8 100644 --- a/PermissionController/res/values-mr/strings.xml +++ b/PermissionController/res/values-mr/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"या अॅपसाठी <xliff:g id="DEVICE_NAME">%2$s</xliff:g> वरील <xliff:g id="PERM">%1$s</xliff:g> चा अॅक्सेस"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"सर्व <xliff:g id="APP">%1$s</xliff:g> परवानग्या पहा"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"ही परवानगी असलेली सर्व अॅप्स पहा"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"माहिती"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"सेटिंग्ज"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Assistant ने मायक्रोफोनचा केलेला वापर दाखवा"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"न वापरलेली ॲप सेटिंग्ज"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"अॅप वापरले नसल्यास, परवानग्या काढून टाका"</string> @@ -418,9 +420,9 @@ <string name="phone_call_uses_microphone" msgid="233569591461187177">"मायक्रोफोन <b>फोन कॉल</b> मध्ये वापरत आहे"</string> <string name="phone_call_uses_microphone_and_camera" msgid="6291898755681748189">"कॅमेरा आणि मायक्रोफोन <b>व्हिडिओ कॉल</b> मध्ये वापरत आहे"</string> <string name="phone_call_uses_camera" msgid="2048417022147857418">"कॅमेरा <b>व्हिडिओ कॉल</b> मध्ये वापरत आहे"</string> - <string name="system_uses_microphone" msgid="576672130318877143">"सिस्टम सेवा वापरून मायक्रोफोन ॲक्सेस करत आहे"</string> - <string name="system_uses_microphone_and_camera" msgid="5124478304275138804">"सिस्टम सेवा वापरून कॅमेरा आणि मायक्रोफोन ॲक्सेस करत आहे"</string> - <string name="system_uses_camera" msgid="1911223105234441470">"सिस्टम सेवा वापरून कॅमेरा ॲक्सेस करत आहे"</string> + <string name="system_uses_microphone" msgid="576672130318877143">"सिस्टीम सेवा वापरून मायक्रोफोन ॲक्सेस करत आहे"</string> + <string name="system_uses_microphone_and_camera" msgid="5124478304275138804">"सिस्टीम सेवा वापरून कॅमेरा आणि मायक्रोफोन ॲक्सेस करत आहे"</string> + <string name="system_uses_camera" msgid="1911223105234441470">"सिस्टीम सेवा वापरून कॅमेरा ॲक्सेस करत आहे"</string> <string name="other_use" msgid="6564855051022776692">"इतर वापर:"</string> <string name="ongoing_usage_dialog_ok" msgid="103556809118460072">"समजले"</string> <string name="ongoing_usage_dialog_title" msgid="683836493556628569">"<xliff:g id="TYPES_LIST">%s</xliff:g> चा अलीकडील वापर"</string> @@ -438,8 +440,10 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"उघडणार्या लिंक"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"कार्यासाठी डीफॉल्ट"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"खाजगी स्पेससाठी डीफॉल्ट"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"ऑप्टिमाइझ केलेले डिव्हाइस"</string> + <string name="default_app_others" msgid="7793029848126079876">"इतर"</string> <string name="default_app_none" msgid="9084592086808194457">"काहीही नाही"</string> - <string name="default_app_system_default" msgid="6218386768175513760">"(सिस्टम डीफॉल्ट)"</string> + <string name="default_app_system_default" msgid="6218386768175513760">"(सिस्टीम डीफॉल्ट)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"अॅप्स नाहीत"</string> <string name="default_payment_app_other_nfc_services" msgid="5957633798695758917">"इतर NFC सेवा"</string> <string name="car_default_app_selected" msgid="5416420830430644174">"निवडले"</string> @@ -456,14 +460,14 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> ला डीबगिंग माहिती अपलोड करायला आवडेल."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"डीबगिंग डेटा शेअर करायचा आहे का?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"सिस्टममध्ये समस्या आली"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> <xliff:g id="DATE">%2$s</xliff:g> रोजी <xliff:g id="TIME">%3$s</xliff:g> वाजता घेतलेल्या या डिव्हाइसमधून बग रिपोर्ट अपलोड करण्याची विनंती करत आहे. बग रिपोर्टमध्ये तुमच्या डिव्हाइसविषयीच्या किंवा अॅप्सने लॉग केलेल्या वैयक्तिक माहितीचा समावेश अहे, उदाहरणार्थ वापरकर्ता नावे, स्थान डेटा, डिव्हाइस आयडेंटिफायर आणि नेटवर्क माहिती. या माहितीसह फक्त तुम्हाला विश्वास असलेल्या लोकांसह आणि अॅप्ससह बग रिपोर्ट शेअर करा. <xliff:g id="APP_NAME_1">%4$s</xliff:g> ला बग रिपोर्ट अपलोड करण्याची अनुमती द्यायची का?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> हे <xliff:g id="DATE">%2$s</xliff:g> रोजी <xliff:g id="TIME">%3$s</xliff:g> वाजता या डिव्हाइसमधून घेतलेला बग रिपोर्ट अपलोड करण्याची विनंती करत आहे. बग रिपोर्टमध्ये तुमच्या डिव्हाइसविषयीच्या किंवा अॅप्सने लॉग केलेल्या वैयक्तिक माहितीचा समावेश आहे, उदाहरणार्थ वापरकर्ता नावे, स्थान डेटा, डिव्हाइस आयडेंटिफायर आणि नेटवर्क माहिती. ही माहिती वापरून फक्त तुम्हाला विश्वास असलेल्या लोकांसोबत आणि अॅप्ससोबत बग रिपोर्ट शेअर करा.\n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g> ला बग रिपोर्ट अपलोड करण्याची अनुमती द्यायची आहे का?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> च्या बग रिपोर्टवर प्रक्रिया करताना एरर आली. त्यामुळे तपशीलवार डीबगिंग डेटा शेअर करणे नाकारले गेले आहे. व्यत्ययाबद्दल क्षमस्व."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"अनुमती द्या"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"नकार द्या"</string> <string name="adjust_user_sensitive_title" msgid="4196724451314280527">"प्रगत सेटिंग्ज"</string> <string name="menu_adjust_user_sensitive" msgid="6497923610654425780">"प्रगत सेटिंग्ज"</string> - <string name="adjust_user_sensitive_globally_title" msgid="8649190949066029174">"सिस्टम अॅपचा वापर दाखवा"</string> - <string name="adjust_user_sensitive_globally_summary" msgid="129467818433773912">"स्टेटस बार, डॅशबोर्ड आणि इतरत्र परवानग्यांसाठी सिस्टम अॅपचा वापर दाखवा"</string> + <string name="adjust_user_sensitive_globally_title" msgid="8649190949066029174">"सिस्टीम ॲपचा वापर दाखवा"</string> + <string name="adjust_user_sensitive_globally_summary" msgid="129467818433773912">"स्टेटस बार, डॅशबोर्ड आणि इतरत्र परवानग्यांसाठी सिस्टीम ॲपचा वापर दाखवा"</string> <string name="adjust_user_sensitive_per_app_header" msgid="4543506440989005648">"पुढील गोष्टींचा वापर ठळक करा"</string> <string name="assistant_record_audio_user_sensitive_title" msgid="5532123360322362378">"असिस्टंट ट्रिगर डिटेक्शन दाखवा"</string> <string name="assistant_record_audio_user_sensitive_summary" msgid="6482937591816401619">"व्हॉइस असिस्टंट अॅक्टिव्हेट करण्यासाठी मायक्रोफोन वापरला जाईल तेव्हा स्टेटस बारमध्ये आयकन दाखवा"</string> @@ -542,7 +546,7 @@ <string name="auto_granted_permission_notification_body" msgid="5040234389205471318">"तुमची संस्था <xliff:g id="APP_NAME">%1$s</xliff:g> ला तुमचे स्थान अॅक्सेस करण्याची अनुमती देते"</string> <string name="other_permissions_label" msgid="8986184335503271992">"इतर परवानग्या"</string> <string name="not_used_permissions_label" msgid="3939839426115141264">"सिस्टमद्वारे वापरल्या जाणाऱ्या परवानग्या"</string> - <string name="not_used_permissions_description" msgid="7595514824169388718">"फक्त सिस्टम ॲप्लिकेशनद्वारे वापरल्या जाणाऱ्या परवानग्या."</string> + <string name="not_used_permissions_description" msgid="7595514824169388718">"फक्त सिस्टीम ॲप्लिकेशनद्वारे वापरल्या जाणाऱ्या परवानग्या."</string> <string name="additional_permissions_label" msgid="7693557637462569046">"अतिरिक्त परवानग्या"</string> <string name="additional_permissions_description" msgid="2186611950890732112">"अॅप्लिकेशनद्वारे परिभाषित केलेल्या परवानग्या."</string> <string name="privdash_label_camera" msgid="1426440033626198096">"कॅमेरा"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"प्रतिबंधित सेटिंग्जना अनुमती द्या"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"प्रतिबंधित सेटिंग"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"तुमच्या सुरक्षेसाठी, हे सेटिंग सध्या उपलब्ध नाही."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"फोन कॉलवर असताना कृती उपलब्ध नाही"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"फोन कॉलदरम्यान ॲप्सना इतर ॲप्स इंस्टॉल करण्याची अनुमती नाही.\n\n घोटाळेबाज व्यक्ती फोन कॉल संभाषणांदरम्यान, याप्रकारच्या कृतीची विनंती करतात, यामुळे तुमचे संरक्षण करण्यासाठी ती ब्लॉक केली आहे. तुम्ही ओळखत नसलेल्या एखाद्या व्यक्तीने ही कारवाई करण्यासाठी तुम्हाला मार्गदर्शन केले जात असल्यास, हा घोटाळा असू शकतो."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"कॉलदरम्यान कृती पूर्ण करू शकत नाही"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"तुमच्या डिव्हाइसचे आणि डेटाचे संरक्षण करण्यासाठी हे सेटिंग ब्लॉक केले आहे.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>घोटाळेबाज व्यक्ती तुम्हाला नवीन स्रोतामधून अज्ञात अॅप्स इंस्टॉल करण्यास सांगून हानिकारक अॅप्स इंस्टॉल करण्याचा प्रयत्न करू शकतात."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>घोटाळेबाज व्यक्ती तुम्हाला अॅपसाठी अॅक्सेसिबिलिटी अॅक्सेसची अनुमती देण्यास सांगून तुमच्या डिव्हाइसचे नियंत्रण मिळवण्याचा प्रयत्न करू शकतात."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"अॅपचा <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> साठीचा अॅक्सेस नाकारला गेला आहे"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"ॲपने संवेदनशील परवानगीसाठी अॅक्सेसची विनंती केली आहे, ज्यामुळे तुमची वैयक्तिक आणि आर्थिक माहिती धोक्यात येऊ शकते.<xliff:g id="ID_1"><br><br></xliff:g>या प्रतिबंधित परवानगीशिवाय ॲप कदाचित योग्यरीत्या काम करणार नाही. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>अॅक्सेसला अनुमती कशी द्यावी हे जाणून घ्या</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"अॅपचा डीफॉल्ट <xliff:g id="ROLE_NAME">%1$s</xliff:g> असण्यासाठीचा अॅक्सेस नाकारला गेला आहे"</string> diff --git a/PermissionController/res/values-ms-v33/strings.xml b/PermissionController/res/values-ms-v33/strings.xml index d5540a429..12507e50c 100644 --- a/PermissionController/res/values-ms-v33/strings.xml +++ b/PermissionController/res/values-ms-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Lagi makluman"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Makluman yang diketepikan"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Kembangkan dan lihat satu makluman lagi}other{Kembangkan dan lihat # makluman lagi}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Kuncupkan"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Amaran. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Tindakan selesai"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Semak tetapan yang boleh menambah perlindungan pada peranti anda"</string> diff --git a/PermissionController/res/values-ms/strings.xml b/PermissionController/res/values-ms/strings.xml index 420e6244c..ec7338497 100644 --- a/PermissionController/res/values-ms/strings.xml +++ b/PermissionController/res/values-ms/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"akses <xliff:g id="PERM">%1$s</xliff:g> untuk apl ini pada <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Lihat semua kebenaran <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Lihat semua apl dengan kebenaran ini"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Maklumat"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Tetapan"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Tunjukkan penggunaan mikrofon pembantu"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Tetapan apl yang tidak digunakan"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Alih keluar kebenaran jika apl tidak digunakan"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Membuka pautan"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Lalai untuk kerja"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Lalai untuk ruang privasi"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Dioptimumkan untuk peranti"</string> + <string name="default_app_others" msgid="7793029848126079876">"Lain-lain"</string> <string name="default_app_none" msgid="9084592086808194457">"Tiada"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Ciri lalai sistem)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Tiada apl"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> mahu memuat naik maklumat penyahpepijatan."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Kongsi data penyahpepijatan?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Sistem telah mengesan masalah."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> mahu memuat naik laporan pepijat daripada peranti ini yang diambil pada <xliff:g id="DATE">%2$s</xliff:g> pada <xliff:g id="TIME">%3$s</xliff:g>. Laporan pepijat termasuk maklumat peribadi tentang peranti anda atau yang dilog oleh apl, contohnya, nama pengguna, data lokasi, pengecam peranti dan maklumat rangkaian. Kongsi laporan pepijat dengan orang dan apl yang anda percayai sahaja berhubung maklumat ini. Benarkan <xliff:g id="APP_NAME_1">%4$s</xliff:g> memuat naik laporan pepijat?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> meminta untuk memuat naik laporan pepijat daripada peranti ini yang diambil pada <xliff:g id="DATE">%2$s</xliff:g> pada pukul <xliff:g id="TIME">%3$s</xliff:g>. Laporan pepijat termasuk maklumat peribadi tentang peranti anda atau yang dilog oleh apl, contohnya, nama pengguna, data lokasi, pengecam peranti dan maklumat rangkaian. Hanya kongsi laporan pepijat ini dengan orang dan apl yang anda percayai dengan maklumat ini.\n\nBenarkan <xliff:g id="APP_NAME_1">%4$s</xliff:g> untuk memuat naik laporan pepijat?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Ralat telah berlaku semasa memproses laporan pepijat untuk <xliff:g id="APP_NAME">%1$s</xliff:g>. Oleh sebab itu, perkongsian data penyahpepijatan yang terperinci telah ditolak. Kami memohon maaf kerana gangguan ini."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Benarkan"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Tolak"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Benarkan tetapan terhad"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Tetapan terhad"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Untuk keselamatan anda, tetapan ini tidak tersedia pada masa ini."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Tindakan tidak tersedia semasa panggilan telefon"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Tindakan membenarkan apl memasang apl lain adalah tidak dibenarkan semasa panggilan telefon.\n\n Penipu sering meminta jenis tindakan ini semasa perbualan panggilan telefon, maka tindakan ini disekat untuk melindungi anda. Jika anda dibimbing untuk mengambil tindakan ini oleh seseorang yang anda tidak kenali, perkara ini mungkin merupakan komplot."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Tidak dapat melengkapkan tindakan semasa panggilan"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Tetapan ini disekat untuk melindungi peranti dan data anda.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Penipu mungkin cuba memasang apl berbahaya dengan meminta anda memasang apl yang tidak diketahui daripada sumber baharu."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Penipu mungkin cuba mengawal peranti anda dengan meminta anda membenarkan akses kebolehaksesan untuk apl."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Akses apl kepada <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> telah ditolak"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Apl meminta akses kepada kebenaran sensitif yang boleh mengakibatkan risiko terhadap maklumat peribadi dan kewangan anda.<xliff:g id="ID_1"><br><br></xliff:g>Apl tersebut mungkin tidak dapat berfungsi dengan betul tanpa kebenaran terhad ini. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Ketahui cara membenarkan akses</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Akses apl untuk menjadi <xliff:g id="ROLE_NAME">%1$s</xliff:g> lalai telah ditolak"</string> diff --git a/PermissionController/res/values-my-v33/strings.xml b/PermissionController/res/values-my-v33/strings.xml index 33237070b..6487f5647 100644 --- a/PermissionController/res/values-my-v33/strings.xml +++ b/PermissionController/res/values-my-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"နောက်ထပ် သတိပေးချက်များ"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"ပယ်ထားသော သတိပေးချက်များ"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{ချဲ့ပြီး သတိပေးချက်နောက်တစ်ခု ကြည့်ရန်}other{ချဲ့ပြီး သတိပေးချက်နောက် # ခု ကြည့်ရန်}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"လျှော့ပြပါ"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"သတိပေးချက်။ <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"လုပ်ဆောင်ချက် ပြီးပြီ"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"သင့်စက်တွင် အကာအကွယ်ထည့်သွင်းနိုင်သည့် ဆက်တင်များကို ကြည့်နိုင်သည်"</string> diff --git a/PermissionController/res/values-my/strings.xml b/PermissionController/res/values-my/strings.xml index df6541f42..f91150823 100644 --- a/PermissionController/res/values-my/strings.xml +++ b/PermissionController/res/values-my/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> တွင် ဤအက်ပ်အတွက် <xliff:g id="PERM">%1$s</xliff:g> သုံးခွင့်"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"<xliff:g id="APP">%1$s</xliff:g> ခွင့်ပြုချက်အားလုံး ကြည့်ရန်"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"ဤခွင့်ပြုချက်ရှိသော အက်ပ်အားလုံးကို ကြည့်ရန်"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"အချက်အလက်"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"ဆက်တင်များ"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Assistant မိုက်ကရိုဖုန်း အသုံးပြုမှုကို ပြပါ"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"အသုံးမပြုသော အက်ပ်ဆက်တင်များ"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"အက်ပ်ကိုအသုံးမပြုလျှင် ခွင့်ပြုချက်များ ဖယ်ရှားရန်"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"လင့်ခ်များကို ဖွင့်ခြင်း"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"အလုပ်အတွက် မူရင်း"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"သီးသန့်နေရာအတွက် မူလအက်ပ်များ"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"စက်အတွက် အကောင်းဆုံးပြင်ထားသည်"</string> + <string name="default_app_others" msgid="7793029848126079876">"အခြား"</string> <string name="default_app_none" msgid="9084592086808194457">"မရှိ"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(စနစ်မူရင်း)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"အက်ပ် မရှိပါ"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> က အမှားရှာပြင်သည့် အချက်အလက်ကို အပ်လုဒ်လုပ်လိုသည်။"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"အမှားရှာပြင်သည့် ဒေတာ မျှဝေမှာလား။"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"စနစ်သည် ပြဿနာတစ်ခု တွေ့ရှိထားသည်။"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> သည် ဤကိရိယာက <xliff:g id="DATE">%2$s</xliff:g> <xliff:g id="TIME">%3$s</xliff:g> တွင် ရယူထားသည့် ချွတ်ယွင်းမှု အစီရင်ခံစာကို အပ်လုဒ်လုပ်ရန် တောင်းဆိုနေသည်။ ချွတ်ယွင်းမှု အစီရင်ခံစာတွင် သင့်ကိရိယာ သို့မဟုတ် အက်ပ်များဖြင့် အကောင့်ဝင်ရောက်ထားသည့် အသုံးပြုသူအမည်၊ တည်နေရာဒေတာ၊ ကိရိယာ သတ်မှတ်မှုစနစ်များနှင့် ကွန်ရက်အချက်အလက်တို့ကဲ့သို့ ကိုယ်ရေးကိုယ်တာအချက်လက်များ ပါဝင်သည်။ ဤအချက်အလက်နှင့် ပတ်သက်ပြီး သင်ယုံကြည်ရသည့် လူ၊ အက်ပ်များနှင့်သာ ချွတ်ယွင်းမှု အစီရင်ခံစာကို မျှဝေပါ။ <xliff:g id="APP_NAME_1">%4$s</xliff:g> ကို ချွတ်ယွင်းမှု အစီရင်ခံစာ အပ်လုဒ်လုပ်ခွင့်ပေးမလား။"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> သည် <xliff:g id="DATE">%2$s</xliff:g>၊ <xliff:g id="TIME">%3$s</xliff:g> တွင် ဤစက်မှ ရယူထားသည့် ချွတ်ယွင်းချက်အစီရင်ခံစာကို အပ်လုဒ်လုပ်ရန် တောင်းဆိုနေသည်။ ချွတ်ယွင်းချက်အစီရင်ခံစာများတွင် အသုံးပြုသူအမည်၊ တည်နေရာဒေတာ၊ စက်သတ်မှတ်မှုစနစ်နှင့် ကွန်ရက်အချက်အလက်ကဲ့သို့သော သင့်စက်နှင့်ပတ်သက်သည့် (သို့) အက်ပ်များက မှတ်တမ်းတင်ထားသည့် ကိုယ်ရေးအချက်အလက်များ ပါဝင်သည်။ ဤအချက်အလက်နှင့် ပတ်သက်ပြီး သင်ယုံကြည်ရသော လူ၊ အက်ပ်များနှင့်သာ ချွတ်ယွင်းချက်အစီရင်ခံစာကို မျှဝေပါ။\n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g> ကို ချွတ်ယွင်းချက်အစီရင်ခံစာ အပ်လုဒ်လုပ်ခွင့်ပြုမလား။"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> အတွက် ချွတ်ယွင်းမှု အစီရင်ခံစာ လုပ်ဆောင်ရာတွင် အမှားဖြစ်သွားသည်။ ထို့ကြောင့် အသေးစိတ် အမှားရှာပြင်သည့် ဒေတာ မျှဝေခြင်းကို ငြင်းဆိုထားပါသည်။ အနှောင့်အယှက်ဖြစ်သွားသည့်အတွက် ဝမ်းနည်းပါသည်။"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"ခွင့်ပြုရန်"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"ငြင်းပယ်ရန်"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"ကန့်သတ်ဆက်တင်များ ခွင့်ပြုရန်"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"ကန့်သတ်ဆက်တင်"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"သင့်လုံခြုံရေးအတွက် ဤဆက်တင်ကို လောလောဆယ် မရနိုင်ပါ။"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"ဖုန်းခေါ်နေစဉ်အတွင်း လုပ်ဆောင်ချက်များ မရနိုင်ပါ"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"ဖုန်းခေါ်နေစဉ်အတွင်း အခြားအက်ပ်များ ထည့်သွင်းရန် အက်ပ်များအား ခွင့်ပြုခြင်းကို လုပ်ခွင့်မပြုပါ။\n\n လူလိမ်များသည် ဤကဲ့သို့ လုပ်ဆောင်ချက်ကို ဖုန်းပြောဆိုနေစဉ်အတွင်း တောင်းဆိုလေ့ရှိကြသောကြောင့် သင့်အား ကာကွယ်ပေးရန် ၎င်းကိုပိတ်ထားသည်။ သင်မသိသော ပုဂ္ဂိုလ်တစ်ဦးဦးက ဤလုပ်ဆောင်ချက်ကို ဆောင်ရွက်ရန် သင့်အားပြောဆိုနေပါက လိမ်လည်မှုဖြစ်နိုင်သည်။"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"ခေါ်ဆိုနေစဉ် လုပ်ဆောင်ချက်ကို အပြီးသတ်၍မရပါ"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"သင့်စက်နှင့် ဒေတာကို ကာကွယ်ရန်အတွက် ဤဆက်တင်ကို ပိတ်ထားသည်။ <xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>လူလိမ်များသည် အရင်းအမြစ်အသစ်မှ အမျိုးအမည်မသိအက်ပ်များကို သင့်အား ထည့်သွင်းခိုင်းခြင်းဖြင့် အန္တရာယ်အက်ပ်များ ထည့်သွင်းရန် ကြိုးပမ်းနိုင်သည်။"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>လူလိမ်များသည် အက်ပ်အတွက် အများသုံးနိုင်ခွင့်ပြုရန် တောင်းဆိုခြင်းဖြင့် သင့်စက်ကို ထိန်းချုပ်ရန် ကြိုးပမ်းနိုင်သည်။"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"အက်ပ်ကို <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> သုံးခွင့် ငြင်းပယ်ထားသည်"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"အက်ပ်သည် သင်၏ ပုဂ္ဂိုလ်ရေးနှင့် ငွေကြေးဆိုင်ရာ အချက်အလက်များကို အန္တရာယ်ဖြစ်စေနိုင်သော သတိထားရမည့် ခွင့်ပြုချက်သုံးရန် တောင်းဆိုထားသည်။<xliff:g id="ID_1"><br><br></xliff:g>အက်ပ်သည် ဤကန့်သတ်ထားသော ခွင့်ပြုချက်မရှိပါက ကောင်းစွာမလုပ်ဆောင်ခြင်း ဖြစ်နိုင်သည်။ <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>သုံးခွင့်ပြုနည်းကို လေ့လာရန်</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"အက်ပ်အား မူရင်း <xliff:g id="ROLE_NAME">%1$s</xliff:g> အဖြစ် လုပ်ဆောင်ခွင့် ငြင်းပယ်ထားသည်"</string> diff --git a/PermissionController/res/values-nb-v33/strings.xml b/PermissionController/res/values-nb-v33/strings.xml index 570e99d27..9f4910da2 100644 --- a/PermissionController/res/values-nb-v33/strings.xml +++ b/PermissionController/res/values-nb-v33/strings.xml @@ -30,9 +30,10 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Flere varsler"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Avviste varsler"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Dobbelttrykk for å se et varsel til}other{Dobbelttrykk for å se # varsler til}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Skjul"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Varsel. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Handlingen er fullført"</string> - <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Sjekk innstillinger som kan øke beskyttelsen til enheten"</string> + <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Sjekk innstillinger som kan gi enheten bedre beskyttelse"</string> <string name="safety_center_qs_page_landing" msgid="1717368301679228128">"Hurtiginnstillinger for sikkerhet og personvern"</string> <string name="safety_center_qs_close_button" msgid="1352313308176244599">"Lukk"</string> <string name="safety_center_qs_expand_action" msgid="2193190557696484169">"Vis alternativer"</string> diff --git a/PermissionController/res/values-nb/strings.xml b/PermissionController/res/values-nb/strings.xml index 26f134e5d..6a4cc5536 100644 --- a/PermissionController/res/values-nb/strings.xml +++ b/PermissionController/res/values-nb/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g>-tilgang for denne appen på <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Se alle tillatelsene <xliff:g id="APP">%1$s</xliff:g> har"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Se alle apper med denne tillatelsen"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informasjon"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Innstillinger"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Vis bruk av assistentmikrofonen"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Innstillinger for ubrukte apper"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Fjern tillatelser hvis appen ikke brukes"</string> @@ -438,8 +440,10 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Åpning av linker"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Jobbstandard"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Standard for privat område"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimalisert for enheten"</string> + <string name="default_app_others" msgid="7793029848126079876">"Andre"</string> <string name="default_app_none" msgid="9084592086808194457">"Ingen"</string> - <string name="default_app_system_default" msgid="6218386768175513760">"(System-&shy;standard)"</string> + <string name="default_app_system_default" msgid="6218386768175513760">"(System-&#173;standard)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Ingen apper"</string> <string name="default_payment_app_other_nfc_services" msgid="5957633798695758917">"Andre NFC-tjenester"</string> <string name="car_default_app_selected" msgid="5416420830430644174">"Valgt"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> vil laste opp feilsøkingsinformasjon."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Vil du dele feilsøkingsdata?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Systemet har oppdaget et problem."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ber om å laste opp en feilrapport fra denne enheten fra <xliff:g id="DATE">%2$s</xliff:g> klokken <xliff:g id="TIME">%3$s</xliff:g>. Feilrapporter inkluderer personopplysninger om enheten eller opplysninger som er loggført av apper, for eksempel brukernavn, posisjonsdata, enhetsidentifikatorer og nettverksinformasjon. Du bør bare dele feilrapporter med personer og apper du stoler på. Vil du gi <xliff:g id="APP_NAME_1">%4$s</xliff:g> tillatelse til å laste opp en feilrapport?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ber om å laste opp en feilrapport fra denne enheten fra <xliff:g id="DATE">%2$s</xliff:g> klokken <xliff:g id="TIME">%3$s</xliff:g>. Feilrapporter inkluderer personopplysninger om enheten eller opplysninger som er loggført av apper, for eksempel brukernavn, posisjonsdata, enhetsidentifikatorer og nettverksinformasjon. Du bør bare dele feilrapporter med personer og apper du stoler på.\n\nVil du gi <xliff:g id="APP_NAME_1">%4$s</xliff:g> tillatelse til å laste opp en feilrapport?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Det oppsto en feil under behandling av feilrapporten for <xliff:g id="APP_NAME">%1$s</xliff:g>. Derfor har deling av de detaljerte feilsøkingsdataene blitt avvist. Vi beklager avbrytelsen."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Tillat"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Avvis"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Tillat begrensede innstillinger"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Begrenset innstilling"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Av sikkerhetshensyn er denne innstillingen utilgjengelig for øyeblikket."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Handlingen er utilgjengelig under telefonsamtaler"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Det er ikke tillatt å la apper installere andre apper under telefonsamtaler.\n\n Svindlere ber ofte om slike handlinger under telefonsamtaler, så det er blokkert for å beskytte deg. Hvis noen du ikke kjenner, ber deg om å gjøre dette, kan det være svindel."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Kan ikke fullføre handlingen under samtaler"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Denne innstillingen er blokkert for å beskytte enheten din og dataene dine.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Svindlere kan prøve å installere skadelige apper ved å be deg om å installere ukjente apper fra en ny kilde."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Svindlere kan prøve å ta kontroll over enheten din ved å be deg om å gi en app tilgang til tilgjengelighetsfunksjoner."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Appens tilgang til <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> ble avvist"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Appen ba om tilgang til en sensitiv tillatelse som kan utsette den personlige og økonomiske informasjonen din for fare.<xliff:g id="ID_1"><br><br></xliff:g>Det kan hende at appen ikke fungerer skikkelig uten denne begrensede tillatelsen. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Finn ut hvordan du gir tilgang</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Appen fikk ikke tillatelse til å være standard <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-ne-v33/strings.xml b/PermissionController/res/values-ne-v33/strings.xml index b16622bd0..b41931d2a 100644 --- a/PermissionController/res/values-ne-v33/strings.xml +++ b/PermissionController/res/values-ne-v33/strings.xml @@ -30,9 +30,10 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"थप अलर्टहरू"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"खारेज गरिएका अलर्टहरू"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{एक्स्पान्ड गरेर थप एउटा अलर्ट हेर्नुहोस्}other{एक्स्पान्ड गरेर थप # वटा अलर्ट हेर्नुहोस्}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"कोल्याप्स गर्नुहोस्"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"सतर्कता अपनाउनुहोस्। <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"यो कार्य पूरा भएको छ"</string> - <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"तपाईंको डिभाइस थप सुरक्षित गर्न सक्ने सेटिङ जाँच्नुहोस्"</string> + <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"तपाईंको डिभाइसलाई थप सुरक्षित राख्न सक्ने सेटिङ जाँच्नुहोस्"</string> <string name="safety_center_qs_page_landing" msgid="1717368301679228128">"सुरक्षा तथा गोपनीयतासम्बन्धी द्रुत सेटिङ"</string> <string name="safety_center_qs_close_button" msgid="1352313308176244599">"बन्द गर्नुहोस्"</string> <string name="safety_center_qs_expand_action" msgid="2193190557696484169">"एक्स्पान्ड गर्नुहोस् र विकल्पहरू देखाउनुहोस्"</string> diff --git a/PermissionController/res/values-ne/strings.xml b/PermissionController/res/values-ne/strings.xml index b7fb710fd..fab3fd50a 100644 --- a/PermissionController/res/values-ne/strings.xml +++ b/PermissionController/res/values-ne/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"यो एपलाई <xliff:g id="DEVICE_NAME">%2$s</xliff:g> को <xliff:g id="PERM">%1$s</xliff:g> प्रयोग गर्ने अनुमति"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"<xliff:g id="APP">%1$s</xliff:g> सँग भएका सबै अनुमति हेर्नुहोस्"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"यो अनुमति पाएका सबै एपहरू हेर्नुहोस्"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"जानकारी"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"सेटिङ"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"सहायकको माइक्रोफोन प्रयोगसम्बन्धी डेटा देखाउनुहोस्"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"प्रयोग नगरिएको एपसम्बन्धी सेटिङ"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"यो एप प्रयोग नहुँदा यसलाई दिइएका अनुमतिहरू रद्द गर्नुहोस्"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"लिंकहरू खोल्दा"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"कार्यका लागि डिफल्ट"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"निजी स्पेसका लागि डिफल्ट एपहरू"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"यो डिभाइसका लागि अप्टिमाइज गरिएका"</string> + <string name="default_app_others" msgid="7793029848126079876">"अन्य"</string> <string name="default_app_none" msgid="9084592086808194457">"कुनै पनि होइन"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(सिस्टम डिफल्ट)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"कुनै पनि एप छैन"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> डिबग प्रक्रियासम्बन्धी जानकारी अपलोड गर्न चाहन्छ।"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"डिबग प्रक्रियासम्बन्धी डेटा सेयर गर्ने हो?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"प्रणालीले कुनै समस्या फेला पारेको छ"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ले <xliff:g id="DATE">%2$s</xliff:g> <xliff:g id="TIME">%3$s</xliff:g> मा यो डिभाइसबाट लिएको बगको रिपोर्ट अपलोड गर्ने अनुरोध गर्दै छ। बग रिपोर्टमा प्रयोगकर्ताका नाम, लोकेसन डेटा, डिभाइसका पहिचानकर्ता र नेटवर्कसम्बन्धी जानकारी जस्ता तपाईंको डिभाइसको व्यक्तिगत जानकारी वा एपले लग गरेको जानकारी समावेश छ। तपाईंलाई यो जानकारी दिँदा फरक पर्दैन जस्तो लाग्ने विश्वसनीय मान्छे वा एपसँग मात्र बग रिपोर्टहरू सेयर गर्नुहोस्। <xliff:g id="APP_NAME_1">%4$s</xliff:g> लाई बग रिपोर्ट अपलोड गर्न दिने हो?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ले <xliff:g id="DATE">%2$s</xliff:g> का दिन <xliff:g id="TIME">%3$s</xliff:g> मा यो डिभाइसबाट लिइएको त्रुटिसम्बन्धी रिपोर्ट अपलोड गर्न अनुरोध गर्दै छ। त्रुटिसम्बन्धी रिपोर्टमा तपाईंको डिभाइसका बारेमा वा एपहरूले लग गरेका युजरनेम, लोकेसन डेटा, डिभाइस आइडेन्टिफायर र नेटवर्कसम्बन्धी जानकारीलगायतका व्यक्तिगत जानकारी समावेश हुन्छन्। तपाईंलाई यो जानकारी दिँदा फरक पर्दैन जस्तो लाग्ने विश्वसनीय मान्छे र एपहरूसँग मात्र त्रुटिसम्बन्धी रिपोर्टहरू सेयर गर्नुहोस्।\n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g> लाई त्रुटिसम्बन्धी रिपोर्ट अपलोड गर्न दिने हो?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> को बगसम्बन्धी रिपोर्ट प्रक्रियामा लैजाने क्रममा त्रुटि भयो। त्यस कारण विस्तृत डिबग प्रक्रियासम्बन्धी डेटा आदान प्रदान गर्ने कार्य अस्वीकार गरिएको छ। व्यवधानका लागि क्षमा गर्नुहोला।"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"अनुमति दिनुहोस्"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"अनुमति नदिनुहोस्"</string> @@ -471,10 +475,10 @@ <string name="permgrouprequest_device_aware_storage_isolated" msgid="6463062962458809752">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> लाई <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b> मा भएका फोटो तथा मिडिया एक्सेस गर्ने अनुमति दिने हो?"</string> <string name="permgrouprequest_contacts" msgid="8391550064551053695">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> लाई तपाईंका कन्ट्याक्टहरू एक्सेस गर्ने अनुमति दिने हो?"</string> <string name="permgrouprequest_device_aware_contacts" msgid="731025863972535928">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> लाई <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b> मा भएका तपाईंका कन्ट्याक्ट एक्सेस गर्ने अनुमति दिने हो?"</string> - <string name="permgrouprequest_location" msgid="6990232580121067883">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> लाई यो डिभाइसको लोकेसन प्रयोग दिने हो?"</string> + <string name="permgrouprequest_location" msgid="6990232580121067883">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> लाई यो डिभाइसको लोकेसन प्रयोग गर्न दिने हो?"</string> <string name="permgrouprequest_device_aware_location" msgid="6075412127429878638">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> लाई <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g> को</b> लोकेसन एक्सेस गर्ने अनुमति दिने हो?"</string> <string name="permgrouprequestdetail_location" msgid="2635935335778429894">"तपाईंले एप प्रयोग गरिरहेका बेला मात्र उक्त एपले स्थानमाथि पहुँच राख्न सक्ने छ"</string> - <string name="permgroupbackgroundrequest_location" msgid="1085680897265734809">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> लाई यो डिभाइसको लोकेसन प्रयोग दिने हो?"</string> + <string name="permgroupbackgroundrequest_location" msgid="1085680897265734809">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> लाई यो डिभाइसको लोकेसन प्रयोग गर्न दिने हो?"</string> <string name="permgroupbackgroundrequest_device_aware_location" msgid="1264484517831380016">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> लाई <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g> को</b> लोकेसन एक्सेस गर्ने अनुमति दिने हो?"</string> <string name="permgroupbackgroundrequestdetail_location" msgid="8021219324989662957">"तपाईं उक्त एप प्रयोग नगरिरहेका बेलामा लगायत जुनसुकै समयमा यो एपले तपाईंको स्थानमाथि पहुँच राख्न सक्छ। "<annotation id="link">"सेटिङमा गई अनुमति दिनुहोस्।"</annotation></string> <string name="permgroupupgraderequest_location" msgid="8328408946822691636">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> का लागि स्थानसम्बन्धी पहुँच परिवर्तन गर्ने हो?"</string> @@ -580,10 +584,10 @@ <string name="security_settings" msgid="3808106921175271317">"सुरक्षासम्बन्धी सेटिङ"</string> <string name="sensor_permissions_qs" msgid="1022267900031317472">"अनुमति"</string> <string name="safety_privacy_qs_tile_title" msgid="727301867710374052">"सुरक्षा तथा गोपनीयता"</string> - <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"स्थिति जाँच गर्नुहोस्"</string> + <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"स्थिति जाँच्नुहोस्"</string> <string name="privacy_controls_qs" msgid="5780144882040591169">"तपाईंका गोपनीयतासम्बन्धी सेटिङ"</string> <string name="security_settings_button_label_qs" msgid="8280343822465962330">"थप सेटिङ"</string> - <string name="camera_toggle_label_qs" msgid="3880261453066157285">"क्यामेरा प्रयोग गर्ने अनुमति"</string> + <string name="camera_toggle_label_qs" msgid="3880261453066157285">"क्यामेरा एक्सेस"</string> <string name="microphone_toggle_label_qs" msgid="8132912469813396552">"माइक एक्सेस"</string> <string name="permissions_removed_qs" msgid="8957319130625294572">"अनुमति हटाइएको छ"</string> <string name="camera_usage_qs" msgid="4394233566086665994">"हालसालै गरिएको क्यामेराको प्रयोगसम्बन्धी जानकारी हेर्नुहोस्"</string> @@ -625,7 +629,7 @@ <string name="safety_center_background_location_access_revoked" msgid="6972274943343442213">"अनुमति बदलियो"</string> <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"हालसालै कहिले लोकेसनसम्बन्धी प्रयोग गरिएको थियो हेर्नुहोस्"</string> <string name="privacy_controls_title" msgid="7605929972256835199">"गोपनीयतासम्बन्धी सेटिङ"</string> - <string name="camera_toggle_title" msgid="1251201397431837666">"क्यामेरा प्रयोग गर्ने अनुमति"</string> + <string name="camera_toggle_title" msgid="1251201397431837666">"क्यामेरा एक्सेस"</string> <string name="mic_toggle_title" msgid="2649991093496110162">"माइक्रोफोन प्रयोग गर्ने अनुमति"</string> <string name="perm_toggle_description" msgid="7801326363741451379">"एप तथा सेवाहरूका हकमा"</string> <string name="mic_toggle_description" msgid="9163104307990677157">"एप तथा सेवाहरूका हकमा। यो सेटिङ अफ गरिएको अवस्थामा तपाईंले आपत्कालीन नम्बरमा कल गर्नुभयो भने माइक्रोफोनसम्बन्धी डेटा अझै पनि सेयर गरिन सक्छ।"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"प्रतिबन्ध लगाइएका सेटिङ अनलक गर्नुहोस्"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"प्रतिबन्ध लगाइएका सेटिङ"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"तपाईंको खाताको सुरक्षार्थ यो सेटिङ हाल उपलब्ध छैन।"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"फोन कल चलिरहेका बेला यो कारबाही गर्न मिल्दैन"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"फोन कल चलिरहेका बेला एपहरूलाई अन्य एप इन्स्टल गर्ने अनुमति दिन मिल्दैन।\n\n स्क्याम गर्ने व्यक्तिले फोन कलका क्रममा प्रायः यस प्रकारको कारबाही गर्न अनुरोध गर्ने भएकाले तपाईंको सुरक्षार्थ यो कारबाही गर्न रोक लगाइएको हो। तपाईंलाई कुनै अपरिचित व्यक्तिले यो कारबाही गर्ने मार्गदर्शन गर्दै छ भने त्यो जालसाजी हुन सक्छ।"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"कल भइरहेका बेला यो कारबाही पूरा गर्न सकिँदैन"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"तपाईंको डिभाइस र जानकारी सुरक्षित राख्न यो सेटिङ ब्लक गरिएको छ।<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>स्क्याम गर्ने व्यक्तिहरू तपाईंलाई कुनै नयाँ स्रोतबाट अज्ञात एपहरू इन्स्टल गर्न लगाएर तपाईंको डिभाइसमा हानिकारक एपहरू इन्स्टल गर्ने प्रयास गर्न सक्छन्।"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>स्क्याम गर्ने व्यक्तिहरू तपाईंलाई कुनै एपलाई सर्वसुलभता सेवा प्रयोग गर्ने अनुमति दिन लगाएर तपाईंको डिभाइस नियन्त्रण गर्ने प्रयास गर्न सक्छन्।"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"एपले <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> प्रयोग गर्न मागेको अनुमति अस्वीकार गरिएको छ"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"यो एपले तपाईंको व्यक्तिगत तथा वित्तीय जानकारी जोखिममा पार्न सक्ने खालको संवेदनशील अनुमति मागेको छ।<xliff:g id="ID_1"><br><br></xliff:g>तपाईले उक्त प्रतिबन्धित अनुमति नदिएका खण्डमा यो एपले राम्रोसँग काम नगर्न सक्छ। <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>अनुमति दिने तरिका सिक्नुहोस्</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"यो एपले डिफल्ट <xliff:g id="ROLE_NAME">%1$s</xliff:g> का रूपमा काम गर्न मागेको अनुमति अस्वीकार गरिएको छ"</string> diff --git a/PermissionController/res/values-nl-v33/strings.xml b/PermissionController/res/values-nl-v33/strings.xml index 5b89f1135..da76670cd 100644 --- a/PermissionController/res/values-nl-v33/strings.xml +++ b/PermissionController/res/values-nl-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Meer meldingen"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Gesloten meldingen"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Uitvouwen en nog 1 melding bekijken}other{Uitvouwen en nog # meldingen bekijken}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Samenvouwen"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Waarschuwing. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Actie afgerond"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Check de instellingen die je apparaat beter kunnen beschermen"</string> diff --git a/PermissionController/res/values-nl/strings.xml b/PermissionController/res/values-nl/strings.xml index 1b8015001..5bfb2c884 100644 --- a/PermissionController/res/values-nl/strings.xml +++ b/PermissionController/res/values-nl/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Toegang tot <xliff:g id="PERM">%1$s</xliff:g> voor deze app op <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Alle rechten van <xliff:g id="APP">%1$s</xliff:g> bekijken"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Alle apps met dit recht bekijken"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informatie"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Instellingen"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Gebruik van Assistent-microfoon tonen"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Niet-gebruikte app-instellingen"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Rechten intrekken als app niet wordt gebruikt"</string> @@ -438,8 +440,10 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Links openen"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Standaard voor werk"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Standaard voor privégedeelte"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Geoptimaliseerd voor apparaat"</string> + <string name="default_app_others" msgid="7793029848126079876">"Anders"</string> <string name="default_app_none" msgid="9084592086808194457">"Geen"</string> - <string name="default_app_system_default" msgid="6218386768175513760">"(Systeemstandaard)"</string> + <string name="default_app_system_default" msgid="6218386768175513760">"(Systeemstandaard)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Geen apps"</string> <string name="default_payment_app_other_nfc_services" msgid="5957633798695758917">"Andere NFC-services"</string> <string name="car_default_app_selected" msgid="5416420830430644174">"Geselecteerd"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> wil foutopsporingsinformatie uploaden."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Foutopsporingsinformatie delen?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Het systeem heeft een probleem gedetecteerd."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> wil een bugrapport van dit apparaat uploaden dat is gemaakt op <xliff:g id="DATE">%2$s</xliff:g> om <xliff:g id="TIME">%3$s</xliff:g>. Bugrapporten omvatten persoonlijke informatie over je apparaat of gegevens die zijn geregistreerd door apps, zoals gebruikersnamen, locatiegegevens, apparaat-ID\'s en netwerkgegevens. Deel alleen bugrapporten met mensen en apps die je met deze informatie vertrouwt. Wil je <xliff:g id="APP_NAME_1">%4$s</xliff:g> toestaan een bugrapport te uploaden?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> wil een bugrapport van dit apparaat uploaden dat is gemaakt op <xliff:g id="DATE">%2$s</xliff:g> om <xliff:g id="TIME">%3$s</xliff:g>. Bugrapporten omvatten persoonlijke informatie over je apparaat of gegevens die zijn geregistreerd door apps, zoals gebruikersnamen, locatiegegevens, apparaat-ID\'s en netwerkgegevens. Deel alleen bugrapporten met mensen en apps die je met deze informatie vertrouwt.\n\nWil je <xliff:g id="APP_NAME_1">%4$s</xliff:g> toestaan een bugrapport te uploaden?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Er is een fout opgetreden bij het verwerken van het bugrapport voor <xliff:g id="APP_NAME">%1$s</xliff:g>. Het delen van de gedetailleerde foutopsporingsinformatie is daarom geweigerd. Onze excuses voor de onderbreking."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Toestaan"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Weigeren"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Beperkte instellingen toestaan"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Beperkte instelling"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Ter beveiliging is deze instelling op dit moment niet beschikbaar."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Actie niet beschikbaar tijdens een telefoongesprek"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Apps toestaan om andere apps te installeren is niet toegestaan tijdens een telefoongesprek.\n\n Scammers vragen vaak om dit soort acties tijdens telefoongesprekken. Daarom is deze actie geblokkeerd om je te beschermen. Als iemand die je niet kent je aanspoort om deze actie uit te voeren, kan dit een scam zijn."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Kan actie niet afronden tijdens gesprek"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Deze instelling is geblokkeerd om je apparaat en gegevens te beschermen.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Scammers kunnen proberen schadelijke apps te installeren door je te vragen onbekende apps te installeren via een nieuwe bron."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Scammers kunnen proberen de controle over je apparaat over te nemen door je te vragen toegankelijkheidstoegang voor een app toe te staan."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"App heeft geen toegang gekregen tot <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"De app heeft toegang gevraagd tot een gevoelig recht, waardoor je persoonlijke en financiële informatie risico kunnen lopen.<xliff:g id="ID_1"><br><br></xliff:g>Het is mogelijk dat de app niet goed werkt zonder dit beperkte recht. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Meer informatie over hoe je toegang geeft</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"App heeft geen toegang gekregen om de standaard <xliff:g id="ROLE_NAME">%1$s</xliff:g> te worden"</string> diff --git a/PermissionController/res/values-or-v33/strings.xml b/PermissionController/res/values-or-v33/strings.xml index 84c07b84e..c77b351d7 100644 --- a/PermissionController/res/values-or-v33/strings.xml +++ b/PermissionController/res/values-or-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"ଅଧିକ ଆଲର୍ଟ"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"ଖାରଜ କରାଯାଇଥିବା ଆଲର୍ଟଗୁଡ଼ିକ"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{ବିସ୍ତାର କରି ଆଉ ଗୋଟିଏ ଆଲର୍ଟ ଦେଖନ୍ତୁ}other{ବିସ୍ତାର କରି ଆଉ #ଟି ଆଲର୍ଟ ଦେଖନ୍ତୁ}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"ସଙ୍କୁଚିତ କରନ୍ତୁ"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"ଆଲର୍ଟ। <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"କାର୍ଯ୍ୟ ସମୂର୍ଣ୍ଣ ହୋଇଛି"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"ଆପଣଙ୍କ ଡିଭାଇସରେ ସୁରକ୍ଷା ଯୋଗ କରୁଥିବା ସେଟିଂସକୁ ଦେଖନ୍ତୁ"</string> diff --git a/PermissionController/res/values-or/strings.xml b/PermissionController/res/values-or/strings.xml index 621e54e1a..cbaba44b0 100644 --- a/PermissionController/res/values-or/strings.xml +++ b/PermissionController/res/values-or/strings.xml @@ -52,7 +52,7 @@ <string name="permission_revoked_none" msgid="9213345075484381180">"କୌଣସି ଅନୁମତି ଅକ୍ଷମ କରାଯାଇନାହିଁ"</string> <string name="grant_dialog_button_allow" msgid="5314677880021102550">"ଅନୁମତି ଦିଅନ୍ତୁ"</string> <string name="grant_dialog_button_allow_always" msgid="4485552579273565981">"ସବୁବେଳେ ଅନୁମତି ଦିଅନ୍ତୁ"</string> - <string name="grant_dialog_button_allow_foreground" msgid="501896824973636533">"ଆପ୍ ବ୍ୟବହାର କରିବା ସମୟରେ"</string> + <string name="grant_dialog_button_allow_foreground" msgid="501896824973636533">"ଆପ ବ୍ୟବହାର କରିବା ସମୟରେ"</string> <string name="grant_dialog_button_change_to_precise_location" msgid="3273115879467236033">"ସଠିକ୍ ଲୋକେସନକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string> <string name="grant_dialog_button_keey_approximate_location" msgid="438025182769080011">"ଆନୁମାନିକ ଲୋକେସନ୍ ରଖନ୍ତୁ"</string> <string name="grant_dialog_button_allow_one_time" msgid="2618088516449706391">"କେବଳ ଏହି ସମୟ ପାଇଁ"</string> @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g>ରେ ଏହି ଆପ ପାଇଁ <xliff:g id="PERM">%1$s</xliff:g> ଆକ୍ସେସ ଅଛି"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"ସମସ୍ତ <xliff:g id="APP">%1$s</xliff:g> ଅନୁମତି ଦେଖନ୍ତୁ"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"ଏହି ଅନୁମତି ଥିବା ସମସ୍ତ ଆପ୍ସ ଦେଖନ୍ତୁ"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"ସୂଚନା"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"ସେଟିଂସ"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Assistant ମାଇକ୍ରୋଫୋନ୍ ବ୍ୟବହାର ଦେଖାନ୍ତୁ"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"ଅବ୍ୟବହୃତ ଆପ ସେଟିଂସ"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"ଯଦି ଆପ୍ ବ୍ୟବହାର କରାଯାଇନାହିଁ, ତେବେ ଅନୁମତିଗୁଡ଼ିକୁ କାଢ଼ି ଦିଅନ୍ତୁ"</string> @@ -353,9 +355,9 @@ <string name="accessibility_service_dialog_title_multiple" msgid="5527879210683548175">"<xliff:g id="NUM_SERVICES">%s</xliff:g>ଟି ଆକ୍ସେସିବିଲିଟୀ ଆପ୍ସର ଆପଣଙ୍କ ଡିଭାଇସ୍କୁ ସମ୍ପୂର୍ଣ୍ଣ ଆକ୍ସେସ୍ ଅଛି"</string> <string name="accessibility_service_dialog_bottom_text_single" msgid="1128666197822205958">"<xliff:g id="SERVICE_NAME">%s</xliff:g> ଆପଣଙ୍କର ସ୍କ୍ରିନ୍, କାର୍ଯ୍ୟ ଏବଂ ଇନ୍ପୁଟ୍ ଦେଖିପାରିବ ଏବଂ କାର୍ଯ୍ୟ ସମ୍ପାଦନ କରିପାରିବ ଏବଂ ଡିସ୍ପ୍ଲେ ନିୟନ୍ତ୍ରଣ କରିପାରିବ।"</string> <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"ଏହି ଆପ୍ସ ଆପଣଙ୍କର ସ୍କ୍ରିନ୍, କାର୍ଯ୍ୟକଳାପ ଏବଂ ଇନ୍ପୁଟ୍ ଦେଖିପାରିବ ଏବଂ କାର୍ଯ୍ୟ ସମ୍ପାଦନ କରିପାରିବ ଏବଂ ଡିସ୍ପ୍ଲେ ନିୟନ୍ତ୍ରଣ କରିପାରିବ।"</string> - <string name="role_assistant_label" msgid="4727586018198208128">"ଡିଫଲ୍ଟ ଡିଜିଟାଲ୍ Assistant ଆପ୍"</string> + <string name="role_assistant_label" msgid="4727586018198208128">"ଡିଫଲ୍ଟ ଡିଜିଟାଲ ସହାୟକ ଆପ"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"ଡିଜିଟାଲ୍ Assistant ଆପ୍"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"ଆପଣ ଦେଖୁଥିବା ସ୍କ୍ରିନ୍ ସୂଚନାକୁ ଆଧାର କରି ସହାୟକ ଆପ୍ ଆପଣଙ୍କୁ ସାହାଯ୍ୟ କରିପାରିବ। କେତେକ ଆପ୍, ଆପଣଙ୍କୁ ଉତ୍ତମ ସହାୟତା ଦେବା ପାଇଁ, ଉଭୟ ଲଞ୍ଚର୍ ଓ ଭଏସ୍ ଇନପୁଟ୍ ସେବାକୁ ସମର୍ଥନ କରେ।"</string> + <string name="role_assistant_description" msgid="6622458130459922952">"ଆପଣ ଭ୍ୟୁ କରୁଥିବା ସ୍କ୍ରିନ ସୂଚନାକୁ ଆଧାର କରି ସହାୟକ ଆପ ଆପଣଙ୍କୁ ସାହାଯ୍ୟ କରିପାରିବ। କେତେକ ଆପ ଆପଣଙ୍କୁ ସମ୍ପୂର୍ଣ୍ଣ ସହାୟତା ଦେବା ପାଇଁ ଉଭୟ ଲଞ୍ଚର ଓ ଭଏସ ଇନପୁଟ ସେବାକୁ ସମର୍ଥନ କରେ।"</string> <string name="role_browser_label" msgid="2877796144554070207">"ଡିଫଲ୍ଟ ବ୍ରାଉଜର୍ ଆପ୍"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"ବ୍ରାଉଜର୍ ଆପ୍"</string> <string name="role_browser_description" msgid="3465253637499842671">"ଆପ୍ସ ଯାହା ଆପଣଙ୍କୁ ଇଣ୍ଟର୍ନେଟ ପାଇଁ ଆକ୍ସେସ ଦିଏ ଏବଂ ଆପଣ ଟାପ କରୁଥିବା ଲିଙ୍କଗୁଡ଼ିକୁ ଡିସପ୍ଲେ କରେ"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"ଓପନିଂ ଲିଙ୍କ୍"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"କାର୍ଯ୍ୟ ପାଇଁ ଡିଫଲ୍ଟ ଅଛି"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"ପ୍ରାଇଭେଟ ସ୍ପେସ ପାଇଁ ଡିଫଲ୍ଟ"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"ଡିଭାଇସ ପାଇଁ ଅପ୍ଟିମାଇଜ କରାଯାଇଛି"</string> + <string name="default_app_others" msgid="7793029848126079876">"ଅନ୍ୟ"</string> <string name="default_app_none" msgid="9084592086808194457">"କିଛି ଆପ ସେଟ କରାଯାଇନାହିଁ"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(ସିଷ୍ଟମ୍ ଡିଫଲ୍ଟ)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"କୌଣସି ଆପ୍ ନାହିଁ"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଡିବଗିଂ ସୂଚନା ଅପ୍ଲୋଡ୍ କରିବାକୁ ଚାହାନ୍ତି।"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"ଡିବଗିଂ ଡାଟା ସେୟାର୍ କରିବେ?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"ସିଷ୍ଟମ୍ ଗୋଟିଏ ସମସ୍ୟା ଚିହ୍ନଟ କରିଛି"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> <xliff:g id="DATE">%2$s</xliff:g> <xliff:g id="TIME">%3$s</xliff:g>ରେ ଏହି ଡିଭାଇସ୍ରୁ ନିଆଯାଇଥିବା ଏକ ବଗ୍ ରିପୋର୍ଟ ଅପ୍ଲୋଡ୍ କରିବାକୁ ଅନୁରୋଧ କରୁଛି। ବଗ୍ ରିପୋର୍ଟରେ ଆପଣଙ୍କ ଡିଭାଇସ୍ ସମ୍ବନ୍ଧରେ ବ୍ୟକ୍ତିଗତ ସୂଚନା ବା ଆପ୍ସ ଲଗ୍ କରିଥିବା ବ୍ୟକ୍ତିଗତ ସୂଚନା, ଉଦାହରଣ ସ୍ୱରୂପ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ନାମ, ଲୋକେସନ୍ ଡାଟା, ଡିଭାଇସ୍ ଚିହ୍ନଟକାରୀ, ଏବଂ ନେଟୱାର୍କ ସୂଚନା ଅନ୍ତର୍ଭୁକ୍ତ ରହିଛି। ଏହି ସୂଚନା ସେୟାର୍ କରିବା ପାଇଁ ଆପଣ ଯାହାକୁ ଭରସା କରୁଛନ୍ତି କେବଳ ସେହି ଲୋକ ଏବଂ ଆପ୍ସ ସହିତ ବଗ୍ ରିପୋର୍ଟ ସେୟାର୍ କରନ୍ତୁ। ଏକ ବଗ୍ ରିପୋର୍ଟ ଅପ୍ଲୋଡ୍ କରିବା ପାଇଁ <xliff:g id="APP_NAME_1">%4$s</xliff:g>କୁ ଅନୁମତି ଦେବେ?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ଏହି ଡିଭାଇସରୁ <xliff:g id="DATE">%2$s</xliff:g> <xliff:g id="TIME">%3$s</xliff:g>ରେ ନିଆଯାଇଥିବା ଏକ ବଗ ରିପୋର୍ଟ ଅପଲୋଡ କରିବାକୁ ଅନୁରୋଧ କରୁଛି। ବଗ ରିପୋର୍ଟରେ ଆପଣଙ୍କ ଡିଭାଇସ ସମ୍ବନ୍ଧୀୟ ବା ଆପ୍ସ ଲଗ କରିଥିବା ବ୍ୟକ୍ତିଗତ ସୂଚନା, ଉଦାହରଣ ସ୍ୱରୂପ ୟୁଜରନେମ, ଲୋକେସନ ଡାଟା, ଡିଭାଇସ ଚିହ୍ନଟକାରୀ ଏବଂ ନେଟୱାର୍କ ସୂଚନା ଅନ୍ତର୍ଭୁକ୍ତ ରହିଛି। ଏହି ସୂଚନା ସେୟାର କରିବା ପାଇଁ ଆପଣ ଯାହାକୁ ବିଶ୍ୱାସ କରୁଛନ୍ତି କେବଳ ସେହି ଲୋକ ଏବଂ ଆପ୍ସ ସହିତ ବଗ ରିପୋର୍ଟ ସେୟାର କରନ୍ତୁ।\n\nଏକ ବଗ ରିପୋର୍ଟ ଅପଲୋଡ କରିବା ପାଇଁ <xliff:g id="APP_NAME_1">%4$s</xliff:g>କୁ ଅନୁମତି ଦେବେ?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> ପାଇଁ ବଗ୍ ରିପୋର୍ଟ ପ୍ରକ୍ରିୟାକରଣରେ ଏକ ତ୍ରୁଟି ହୋଇଛି। ତେଣୁ ଡିବଗିଂ ବିବରଣୀ ଡାଟା ସେୟାରିଂ ପ୍ରତ୍ୟାକ୍ଷାନ ହୋଇଛି। ଅସୁବିଧା ପାଇଁ ଦୁଃଖିତ।"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"ଅନୁମତି ଦିଅନ୍ତୁ"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ"</string> @@ -487,7 +491,7 @@ <string name="permgrouprequest_device_aware_fineupgrade" msgid="4453775952305587571">"<b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>ରେ <xliff:g id="APP_NAME"><b>%1$s</b></xliff:g>ର ଲୋକେସନ ଆକ୍ସେସକୁ ଆନୁମାନିକରୁ ସଠିକକୁ ପରିବର୍ତ୍ତନ କରିବେ?"</string> <string name="permgrouprequest_coarselocation" msgid="7244605063736425232">"ଏହି ଡିଭାଇସର ଆନୁମାନିକ ଲୋକେସନ୍ ଆକ୍ସେସ୍ କରିବା ପାଇଁ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b>କୁ ଅନୁମତି ଦେବେ?"</string> <string name="permgrouprequest_device_aware_coarselocation" msgid="8367540370912066757">"<b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>ର ଆନୁମାନିକ ଲୋକେସନକୁ ଆକ୍ସେସ କରିବା ପାଇଁ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b>କୁ ଅନୁମତି ଦେବେ?"</string> - <string name="permgrouprequest_finelocation_imagetext" msgid="1313062433398914334">"ସଠିକ୍"</string> + <string name="permgrouprequest_finelocation_imagetext" msgid="1313062433398914334">"ସଠିକ"</string> <string name="permgrouprequest_coarselocation_imagetext" msgid="8650605041483025297">"(ଆନୁମାନିକ)"</string> <string name="permgrouprequest_calendar" msgid="1493150855673603806">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>କୁ ଆପଣଙ୍କ କ୍ୟାଲେଣ୍ଡର୍କୁ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଅନୁମତି ଦେବେ କି?"</string> <string name="permgrouprequest_device_aware_calendar" msgid="7161929851377463612">"<b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>ରେ ଆପଣଙ୍କ କେଲେଣ୍ଡରକୁ ଆକ୍ସେସ କରିବା ପାଇଁ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b>କୁ ଅନୁମତି ଦେବେ?"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"ପ୍ରତିବନ୍ଧିତ ସେଟିଂସକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"ପ୍ରତିବନ୍ଧିତ ସେଟିଂ"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"ଆପଣଙ୍କ ସୁରକ୍ଷା ପାଇଁ ଏହି ସେଟିଂ ବର୍ତ୍ତମାନ ଅନୁପଲବ୍ଧ ଅଟେ।"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"କୌଣସି ଫୋନ କଲରେ ଥିବା ସମୟରେ କାର୍ଯ୍ୟ ଉପଲବ୍ଧ ନାହିଁ"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"କୌଣସି ଫୋନ କଲ ସମୟରେ ଅନ୍ୟ ଆପ୍ସକୁ ଇନଷ୍ଟଲ କରିବା ପାଇଁ ଆପ୍ସକୁ ଅନୁମତି ଦିଆଯାଏ ନାହିଁ।\n\n ଫୋନ କଲ ବାର୍ତ୍ତାଳାପ ସମୟରେ ସ୍କାମରମାନେ ପ୍ରାୟତଃ ଏହି ପ୍ରକାରର କାର୍ଯ୍ୟ ପାଇଁ ଅନୁରୋଧ କରନ୍ତି, ତେଣୁ ଆପଣଙ୍କୁ ସୁରକ୍ଷିତ ରଖିବା ପାଇଁ ଏହାକୁ ବ୍ଲକ କରାଯାଏ। ଯଦି ଆପଣଙ୍କୁ ଏହି ପଦକ୍ଷେପ ନେବାକୁ ଆପଣ ଜାଣିନଥିବା ବ୍ୟକ୍ତିଙ୍କ ଦ୍ୱାରା ମାର୍ଗଦର୍ଶନ କରାଯାଉଛି, ତେବେ ଏହା ଏକ ସ୍କାମ ହୋଇପାରେ।"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"କଲ ସମୟରେ କାର୍ଯ୍ୟ ସମ୍ପୂର୍ଣ୍ଣ କରାଯାଇପାରିବ ନାହିଁ"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"ଆପଣଙ୍କ ଡିଭାଇସ ଏବଂ ଡାଟାକୁ ସୁରକ୍ଷିତ ରଖିବା ପାଇଁ ଏହି ସେଟିଂକୁ ବ୍ଲକ କରାଯାଇଛି।<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>ସ୍କାମରମାନେ ଆପଣଙ୍କୁ ଏକ ନୂଆ ସୋର୍ସରୁ ଅଜଣା ଆପ୍ସ ଇନଷ୍ଟଲ କରିବାକୁ କହି କ୍ଷତିକାରକ ଆପ୍ସ ଇନଷ୍ଟଲ କରିବାକୁ ଚେଷ୍ଟା କରିପାରନ୍ତି।"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>ସ୍କାମରମାନେ ଆପଣଙ୍କୁ ଏକ ଆପ ପାଇଁ ଆକ୍ସେସିବିଲିଟୀ ଆକ୍ସେସ ଅନୁମତି ଦେବାକୁ କହି ଆପଣଙ୍କ ଡିଭାଇସକୁ ନିୟନ୍ତ୍ରଣ କରିବାକୁ ଚେଷ୍ଟା କରିପାରନ୍ତି।"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>କୁ ଆପର ଆକ୍ସେସକୁ ଅଗ୍ରାହ୍ୟ କରାଯାଇଛି"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"ଆପଣଙ୍କ ବ୍ୟକ୍ତିଗତ ଏବଂ ଆର୍ଥିକ ସୂଚନାକୁ ବିପଦରେ ପକାଇପାରୁଥିବା ଏକ ସମ୍ବେଦନଶୀଳ ଅନୁମତିକୁ ଆକ୍ସେସ କରିବା ପାଇଁ ଏହି ଆପଟି ଅନୁରୋଧ କରିଛି।<xliff:g id="ID_1"><br><br></xliff:g>ଏହା ସମ୍ଭବ ଯେ ଏହି ପ୍ରତିବନ୍ଧିତ ଅନୁମତି ବିନା ଆପ ସଠିକ ଭାବେ କାର୍ଯ୍ୟ କରିବ ନାହିଁ। <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>ଆକ୍ସେସକୁ କିପରି ଅନୁମତି ଦେବେ ତାହା ଜାଣନ୍ତୁ</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"ଡିଫଲ୍ଟ <xliff:g id="ROLE_NAME">%1$s</xliff:g> ହେବା ପାଇଁ ଆପର ଆକ୍ସେସକୁ ଅଗ୍ରାହ୍ୟ କରାଯାଇଛି"</string> diff --git a/PermissionController/res/values-pa-v33/strings.xml b/PermissionController/res/values-pa-v33/strings.xml index 0aa143302..7a2fc6ca5 100644 --- a/PermissionController/res/values-pa-v33/strings.xml +++ b/PermissionController/res/values-pa-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"ਹੋਰ ਅਲਰਟ"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"ਖਾਰਜ ਕੀਤੇ ਅਲਰਟ"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{ਵਿਸਤਾਰ ਕਰੋ ਅਤੇ ਇੱਕ ਹੋਰ ਅਲਰਟ ਦੇਖੋ}one{ਵਿਸਤਾਰ ਕਰੋ ਅਤੇ # ਹੋਰ ਅਲਰਟ ਦੇਖੋ}other{ਵਿਸਤਾਰ ਕਰੋ ਅਤੇ # ਹੋਰ ਅਲਰਟ ਦੇਖੋ}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"ਸਮੇਟੋ"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"ਅਲਰਟ। <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"ਕਾਰਵਾਈ ਪੂਰੀ ਹੋਈ"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"ਉਨ੍ਹਾਂ ਸੈਟਿੰਗਾਂ ਦੀ ਜਾਂਚ ਕਰੋ ਜੋ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਵਿੱਚ ਸੁਰੱਖਿਆ ਸ਼ਾਮਲ ਕਰ ਸਕਦੀਆਂ ਹਨ"</string> diff --git a/PermissionController/res/values-pa/strings.xml b/PermissionController/res/values-pa/strings.xml index 8984bf0fa..d90bcbfb9 100644 --- a/PermissionController/res/values-pa/strings.xml +++ b/PermissionController/res/values-pa/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> \'ਤੇ ਇਸ ਐਪ ਲਈ <xliff:g id="PERM">%1$s</xliff:g> ਦੀ ਪਹੁੰਚ"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"<xliff:g id="APP">%1$s</xliff:g> ਦੀਆਂ ਸਾਰੀਆਂ ਇਜਾਜ਼ਤਾਂ ਦੇਖੋ"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"ਇਸ ਇਜਾਜ਼ਤ ਵਾਲੀਆਂ ਸਾਰੀਆਂ ਐਪਾਂ ਦੇਖੋ"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"ਜਾਣਕਾਰੀ"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"ਸੈਟਿੰਗਾਂ"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Assistant ਦੇ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਦਿਖਾਓ"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"ਅਣਵਰਤੀ ਐਪ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"ਐਪ ਨੂੰ ਨਾ ਵਰਤੇ ਜਾਣ \'ਤੇ ਇਸ ਲਈ ਦਿੱਤੀਆਂ ਇਜਾਜ਼ਤਾਂ ਨੂੰ ਹਟਾ ਦਿਓ"</string> @@ -251,7 +253,7 @@ <string name="app_permission_never_accessed_summary" msgid="401346181461975090">"ਕਦੇ ਪਹੁੰਚ ਨਹੀਂ ਕੀਤੀ"</string> <string name="app_permission_never_accessed_denied_summary" msgid="6596000497490905146">"ਮਨ੍ਹਾ ਕੀਤਾ ਗਿਆ / ਕਦੇ ਪਹੁੰਚ ਨਹੀਂ ਕੀਤੀ"</string> <string name="allowed_header" msgid="7769277978004790414">"ਮਨਜ਼ੂਰਸ਼ੁਦਾ"</string> - <string name="allowed_always_header" msgid="6455903312589013545">"ਹਰ ਵੇਲੇ ਪਹੁੰਚ ਵਾਲੀਆਂ"</string> + <string name="allowed_always_header" msgid="6455903312589013545">"ਹਰ ਵੇਲੇ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਹੈ"</string> <string name="allowed_foreground_header" msgid="6845655788447833353">"ਸਿਰਫ਼ ਐਪ ਵਰਤੋਂ ਵੇਲੇ ਪਹੁੰਚ ਵਾਲੀਆਂ"</string> <string name="allowed_storage_scoped" msgid="5383645873719086975">"ਸਿਰਫ਼ ਮੀਡੀਆ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦਿੱਤੀ ਗਈ"</string> <string name="allowed_storage_full" msgid="5356699280625693530">"ਸਾਰੀਆਂ ਫ਼ਾਈਲਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰਨ ਦਿੱਤਾ ਗਿਆ"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"ਖੁੱਲ੍ਹਣ ਵਾਲੇ ਲਿੰਕ"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"ਕੰਮ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"ਡੀਵਾਈਸ ਲਈ ਸੁਯੋਗ ਬਣਾਈਆਂ"</string> + <string name="default_app_others" msgid="7793029848126079876">"ਹੋਰ"</string> <string name="default_app_none" msgid="9084592086808194457">"ਕੋਈ ਨਹੀਂ"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(ਸਿਸਟਮ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"ਕੋਈ ਐਪਾਂ ਨਹੀਂ"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਡੀਬੱਗਿੰਗ ਜਾਣਕਾਰੀ ਨੂੰ ਅੱਪਲੋਡ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ।"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"ਕੀ ਡੀਬੱਗਿੰਗ ਡਾਟਾ ਸਾਂਝਾ ਕਰਨਾ ਹੈ?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"ਸਿਸਟਮ ਵਿੱਚ ਕਿਸੇ ਸਮੱਸਿਆ ਦਾ ਪਤਾ ਲੱਗਿਆ।"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ਇਸ ਡੀਵਾਈਸ ਤੋਂ <xliff:g id="DATE">%2$s</xliff:g> ਨੂੰ <xliff:g id="TIME">%3$s</xliff:g> ਵਜੇ ਬਣਾਈ ਗਈ ਬੱਗ ਰਿਪੋਰਟ ਨੂੰ ਅੱਪਲੋਡ ਕਰਨ ਲਈ ਬੇਨਤੀ ਕਰ ਰਹੀ ਹੈ। ਬੱਗ ਰਿਪੋਰਟਾਂ ਵਿੱਚ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਬਾਰੇ ਜਾਂ ਐਪਾਂ ਵੱਲੋਂ ਲੌਗ ਕੀਤੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਹੁੰਦੀ ਹੈ, ਉਦਾਹਰਨ ਲਈ, ਵਰਤੋਂਕਾਰ ਨਾਮ, ਟਿਕਾਣਾ ਡਾਟਾ, ਡੀਵਾਈਸ ਪਛਾਣਕਰਤਾ ਅਤੇ ਨੈੱਟਵਰਕ ਜਾਣਕਾਰੀ। ਬੱਗ ਰਿਪੋਰਟਾਂ ਸਿਰਫ਼ ਉਹਨਾਂ ਲੋਕਾਂ ਅਤੇ ਐਪਾਂ ਨਾਲ ਸਾਂਝੀਆਂ ਕਰੋ ਜਿਨ੍ਹਾਂ \'ਤੇ ਤੁਸੀਂ ਇਸ ਜਾਣਕਾਰੀ ਨੂੰ ਲੈ ਕੇ ਭਰੋਸਾ ਕਰਦੇ ਹੋ। ਕੀ <xliff:g id="APP_NAME_1">%4$s</xliff:g> ਨੂੰ ਬੱਗ ਰਿਪੋਰਟ ਅੱਪਲੋਡ ਕਰਨ ਦੇਣੀ ਹੈ?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ਇਸ ਡੀਵਾਈਸ ਤੋਂ <xliff:g id="DATE">%2$s</xliff:g> ਨੂੰ <xliff:g id="TIME">%3$s</xliff:g> ਵਜੇ ਬਣਾਈ ਗਈ ਬੱਗ ਰਿਪੋਰਟ ਨੂੰ ਅੱਪਲੋਡ ਕਰਨ ਲਈ ਬੇਨਤੀ ਕਰ ਰਹੀ ਹੈ। ਬੱਗ ਰਿਪੋਰਟਾਂ ਵਿੱਚ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਬਾਰੇ ਜਾਂ ਐਪਾਂ ਵੱਲੋਂ ਲੌਗ ਕੀਤੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਹੁੰਦੀ ਹੈ, ਉਦਾਹਰਨ ਲਈ, ਵਰਤੋਂਕਾਰ ਨਾਮ, ਟਿਕਾਣੇ ਦਾ ਡਾਟਾ, ਡੀਵਾਈਸ ਪਛਾਣਕਰਤਾ ਅਤੇ ਨੈੱਟਵਰਕ ਜਾਣਕਾਰੀ। ਬੱਗ ਰਿਪੋਰਟਾਂ ਸਿਰਫ਼ ਉਨ੍ਹਾਂ ਲੋਕਾਂ ਅਤੇ ਐਪਾਂ ਨਾਲ ਸਾਂਝੀਆਂ ਕਰੋ, ਜਿਨ੍ਹਾਂ \'ਤੇ ਤੁਸੀਂ ਇਸ ਜਾਣਕਾਰੀ ਨੂੰ ਲੈ ਕੇ ਭਰੋਸਾ ਕਰਦੇ ਹੋ।\n\nਕੀ <xliff:g id="APP_NAME_1">%4$s</xliff:g> ਨੂੰ ਬੱਗ ਰਿਪੋਰਟ ਅੱਪਲੋਡ ਕਰਨ ਦੇਣੀ ਹੈ?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਦੀ ਬੱਗ ਰਿਪੋਰਟ \'ਤੇ ਪ੍ਰਕਿਰਿਆ ਕਰਨ ਵੇਲੇ ਗੜਬੜ ਹੋ ਗਈ। ਇਸ ਕਰਕੇ ਵੇਰਵੇ-ਸਹਿਤ ਡੀਬੱਗ ਡਾਟੇ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਤੋਂ ਮਨ੍ਹਾ ਕੀਤਾ ਗਿਆ। ਰੁਕਾਵਟ ਲਈ ਮਾਫ਼ੀ।"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"ਕਰਨ ਦਿਓ"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"ਨਾ ਕਰਨ ਦਿਓ"</string> @@ -471,7 +475,7 @@ <string name="permgrouprequest_device_aware_storage_isolated" msgid="6463062962458809752">"ਕੀ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ਨੂੰ <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b> \'ਤੇ ਫ਼ੋਟੋਆਂ ਅਤੇ ਮੀਡੀਆ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string> <string name="permgrouprequest_contacts" msgid="8391550064551053695">"ਕੀ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ਨੂੰ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣੀ ਹੈ?"</string> <string name="permgrouprequest_device_aware_contacts" msgid="731025863972535928">"ਕੀ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ਨੂੰ <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b> \'ਤੇ ਆਪਣੇ ਸੰਪਰਕਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string> - <string name="permgrouprequest_location" msgid="6990232580121067883">"ਕੀ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਦੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣੀ ਹੈ?"</string> + <string name="permgrouprequest_location" msgid="6990232580121067883">"ਕੀ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਦੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string> <string name="permgrouprequest_device_aware_location" msgid="6075412127429878638">"ਕੀ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ਨੂੰ <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b> ਦੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string> <string name="permgrouprequestdetail_location" msgid="2635935335778429894">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਐਪ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵੇਲੇ ਹੀ ਐਪ ਕੋਲ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਹੋਵੇਗੀ"</string> <string name="permgroupbackgroundrequest_location" msgid="1085680897265734809">"ਕੀ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਦੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣੀ ਹੈ?"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"ਪ੍ਰਤਿਬੰਧਿਤ ਸੈਟਿੰਗਾਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"ਪ੍ਰਤਿਬੰਧਿਤ ਸੈਟਿੰਗਾਂ"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"ਤੁਹਾਡੀ ਸੁਰੱਖਿਆ ਲਈ, ਫ਼ਿਲਹਾਲ ਇਹ ਸੈਟਿੰਗ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"ਫ਼ੋਨ ਕਾਲ \'ਤੇ ਹੋਣ ਦੌਰਾਨ ਕਾਰਵਾਈ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"ਫ਼ੋਨ ਕਾਲ ਦੌਰਾਨ ਐਪਾਂ ਨੂੰ ਹੋਰ ਐਪਾਂ ਨੂੰ ਸਥਾਪਤ ਕਰਨ ਦੀ ਆਗਿਆ ਨਹੀਂ ਦਿੱਤੀ ਜਾਂਦੀ।\n\n ਘਪਲੇਬਾਜ਼ ਅਕਸਰ ਫ਼ੋਨ ਕਾਲ ਦੀਆਂ ਗੱਲਾਂਬਾਤਾਂ ਦੌਰਾਨ ਇਸ ਕਿਸਮ ਦੀ ਕਾਰਵਾਈ ਦੀ ਬੇਨਤੀ ਕਰਦੇ ਹਨ, ਇਸ ਲਈ ਤੁਹਾਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਲਈ ਇਸਨੂੰ ਬਲਾਕ ਕੀਤਾ ਹੁੰਦਾ ਹੈ। ਜੇ ਤੁਹਾਨੂੰ ਕਿਸੇ ਅਨਜਾਣ ਵਿਅਕਤੀ ਵੱਲੋਂ ਇਹ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਸੇਧਿਤ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਇਹ ਇੱਕ ਘਪਲਾ ਹੋਵੇ।"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"ਕਾਲ ਦੌਰਾਨ ਇਹ ਕਾਰਵਾਈ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਅਤੇ ਡਾਟੇ ਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਲਈ ਇਸ ਸੈਟਿੰਗ ਨੂੰ ਬਲਾਕ ਕੀਤਾ ਗਿਆ ਹੈ।<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>ਘਪਲੇਬਾਜ਼ ਤੁਹਾਨੂੰ ਕਿਸੇ ਨਵੇਂ ਸਰੋਤ ਤੋਂ ਅਗਿਆਤ ਐਪਾਂ ਸਥਾਪਤ ਕਰਨ ਲਈ ਕਹਿ ਕੇ ਨੁਕਸਾਨਦੇਹ ਐਪਾਂ ਸਥਾਪਤ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹਨ।"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>ਘਪਲੇਬਾਜ਼ ਤੁਹਾਡੇ ਤੋਂ ਕਿਸੇ ਐਪ ਲਈ ਪਹੁੰਚਯੋਗਤਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਮੰਗ ਕਰ ਕੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹਨ।"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"ਐਪ ਨੂੰ <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਨਹੀਂ ਦਿੱਤੀ ਗਈ"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"ਐਪ ਨੇ ਸੰਵੇਦਨਸ਼ੀਲ ਇਜਾਜ਼ਤ ਤੱਕ ਪਹੁੰਚ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ, ਜਿਸ ਨਾਲ ਤੁਹਾਡੀ ਨਿੱਜੀ ਅਤੇ ਵਿੱਤੀ ਜਾਣਕਾਰੀ ਜੋਖਮ ਵਿੱਚ ਪੈ ਸਕਦੀ ਹੈ।<xliff:g id="ID_1"><br><br></xliff:g>ਇਹ ਸੰਭਵ ਹੈ, ਕਿ ਐਪ ਇਸ ਪ੍ਰਤਿਬੰਧਿਤ ਇਜਾਜ਼ਤ ਤੋਂ ਬਿਨਾਂ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਾ ਕਰੇ। <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਣ ਦੇ ਤਰੀਕੇ ਬਾਰੇ ਜਾਣੋ</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"ਐਪ ਨੂੰ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ <xliff:g id="ROLE_NAME">%1$s</xliff:g> ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੀ ਆਗਿਆ ਨਹੀਂ ਦਿੱਤੀ ਗਈ"</string> diff --git a/PermissionController/res/values-pl-v33/strings.xml b/PermissionController/res/values-pl-v33/strings.xml index a6cdbd775..326d9f782 100644 --- a/PermissionController/res/values-pl-v33/strings.xml +++ b/PermissionController/res/values-pl-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Więcej alertów"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Odrzucone alerty"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Rozwiń i zobacz jeszcze 1 alert}few{Rozwiń i zobacz jeszcze # alerty}many{Rozwiń i zobacz jeszcze # alertów}other{Rozwiń i zobacz jeszcze # alertu}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Zwiń"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alert. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Działanie ukończone"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Sprawdź ustawienia, które mogą zwiększyć bezpieczeństwo Twojego urządzenia"</string> diff --git a/PermissionController/res/values-pl/strings.xml b/PermissionController/res/values-pl/strings.xml index 491216726..baacd52cc 100644 --- a/PermissionController/res/values-pl/strings.xml +++ b/PermissionController/res/values-pl/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Aplikacja ma przyznane uprawnienie <xliff:g id="PERM">%1$s</xliff:g> na tym urządzeniu: <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Zobacz wszystkie uprawnienia aplikacji <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Wyświetl wszystkie aplikacje z tym uprawnieniem"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informacje"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Ustawienia"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Pokaż użycie mikrofonu w Asystencie"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Ustawienia nieużywanych aplikacji"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Usuń uprawnienia, jeśli aplikacja jest nieużywana"</string> @@ -251,7 +253,7 @@ <string name="app_permission_never_accessed_summary" msgid="401346181461975090">"Nigdy nie użyto"</string> <string name="app_permission_never_accessed_denied_summary" msgid="6596000497490905146">"Odmowa / nigdy nie użyto"</string> <string name="allowed_header" msgid="7769277978004790414">"Ma dostęp"</string> - <string name="allowed_always_header" msgid="6455903312589013545">"Mają ciągły dostęp"</string> + <string name="allowed_always_header" msgid="6455903312589013545">"Ciągły dostęp"</string> <string name="allowed_foreground_header" msgid="6845655788447833353">"Mają dostęp tylko podczas używania"</string> <string name="allowed_storage_scoped" msgid="5383645873719086975">"Zezwolono na dostęp tylko do multimediów"</string> <string name="allowed_storage_full" msgid="5356699280625693530">"Zezwolono na zarządzanie wszystkimi plikami"</string> @@ -346,7 +348,7 @@ <string name="no_apps_allowed" msgid="7718822655254468631">"Nie zezwolono żadnym aplikacjom"</string> <string name="no_apps_allowed_full" msgid="8011716991498934104">"Brak aplikacji z uprawnieniami dla wszystkich plików"</string> <string name="no_apps_allowed_scoped" msgid="4908850477787659501">"Brak aplikacji z uprawnieniami tylko dla multimediów"</string> - <string name="no_apps_denied" msgid="7663435886986784743">"Nie zabroniono dostępu żadnym aplikacjom"</string> + <string name="no_apps_denied" msgid="7663435886986784743">"Nie odmówiono dostępu żadnym aplikacjom"</string> <string name="car_permission_selected" msgid="180837028920791596">"Wybrana"</string> <string name="settings" msgid="5409109923158713323">"Ustawienia"</string> <string name="accessibility_service_dialog_title_single" msgid="7956432823014102366">"Usługa <xliff:g id="SERVICE_NAME">%s</xliff:g> ma pełny dostęp do urządzenia"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Otwieranie linków"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Domyślne do pracy"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Domyślne dla przestrzeni prywatnej"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Zoptymalizowane dla danego urządzenia"</string> + <string name="default_app_others" msgid="7793029848126079876">"Inne"</string> <string name="default_app_none" msgid="9084592086808194457">"Brak"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Domyślna aplikacja systemowa)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Brak aplikacji"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> chce przesłać informacje debugowania."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Udostępnić dane debugowania?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"System wykrył problem."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> prosi o zezwolenie na przesłanie raportu o błędzie z tego urządzenia. Raport utworzono <xliff:g id="DATE">%2$s</xliff:g> o <xliff:g id="TIME">%3$s</xliff:g>. Raporty o błędach zawierają dane prywatne powiązane z Twoim urządzeniem lub zarejestrowane w aplikacjach, na przykład nazwy użytkowników, dane o lokalizacji, identyfikatory urządzeń i informacje o sieciach. Raporty o błędach zawierające te informacje udostępniaj tylko osobom i aplikacjom, którym ufasz. Zezwolić aplikacji <xliff:g id="APP_NAME_1">%4$s</xliff:g> na przesłanie raportu o błędzie?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> prosi o zezwolenie na przesłanie raportu o błędzie z tego urządzenia, który utworzono <xliff:g id="DATE">%2$s</xliff:g> o <xliff:g id="TIME">%3$s</xliff:g>. Raporty o błędach zawierają dane osobowe powiązane z Twoim urządzeniem lub zarejestrowane w aplikacjach, na przykład nazwy użytkowników, dane o lokalizacji, identyfikatory urządzeń i informacje o sieciach. Udostępniaj je wyłącznie zaufanym osobom i aplikacjom.\n\nZezwolić aplikacji <xliff:g id="APP_NAME_1">%4$s</xliff:g> na przesłanie raportu o błędzie?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Podczas przetwarzania zgłoszenia błędu w aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g> wystąpił błąd. Odmówiono udostępnienia szczegółowych danych debugowania. Przepraszamy za niedogodności."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Zezwól"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Odmów"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Zezwól na ustawienia z ograniczonym dostępem"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Ustawienie z ograniczonym dostępem"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Ze względów bezpieczeństwa to ustawienie jest obecnie niedostępne."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Działanie niedostępne podczas rozmowy telefonicznej"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Podczas rozmowy telefonicznej nie można zezwolić aplikacjom na instalowanie innych aplikacji.\n\n Oszuści często proszą o takie działania podczas rozmów telefonicznych, dlatego blokujemy je, aby Cię chronić. Jeśli ktoś, kogo nie znasz, prosi Cię o podjęcie tego działania, może to być oszustwo."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Nie można wykonywać działania podczas połączenia"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"To ustawienie jest zablokowane, aby chronić Twoje urządzenie i dane.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Oszuści mogą próbować zainstalować szkodliwe aplikacje, prosząc o instalację nieznanych programów z nowego źródła."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Oszuści mogą próbować przejąć kontrolę nad Twoim urządzeniem, prosząc o przyznanie uprawnień do ułatwień dostępu aplikacji."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Aplikacja nie otrzymała dostępu do uprawnień <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Aplikacja wymaga dostępu do uprawnień newralgicznych, co może zagrażać Twoim danym osobowym i informacjom finansowym.<xliff:g id="ID_1"><br><br></xliff:g>Możliwe, że bez tego uprawnienia z ograniczeniami aplikacja nie będzie działać poprawnie. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Jak zezwolić na dostęp</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Aplikacja nie otrzymała dostępu jako domyślna <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-pt-rBR-v33/strings.xml b/PermissionController/res/values-pt-rBR-v33/strings.xml index aeda06c8f..9fba7c078 100644 --- a/PermissionController/res/values-pt-rBR-v33/strings.xml +++ b/PermissionController/res/values-pt-rBR-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Mais alertas"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Alertas dispensados"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Abra para ver mais um alerta}one{Abra para ver mais # alerta}many{Abra para ver mais # de alertas}other{Abra para ver mais # alertas}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Fechar"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alerta. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Ação concluída"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Verifique as configurações que podem adicionar mais proteção ao seu dispositivo"</string> diff --git a/PermissionController/res/values-pt-rBR/strings.xml b/PermissionController/res/values-pt-rBR/strings.xml index e49acd0c8..48cedd428 100644 --- a/PermissionController/res/values-pt-rBR/strings.xml +++ b/PermissionController/res/values-pt-rBR/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Acesso de <xliff:g id="PERM">%1$s</xliff:g> para esse app no <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Ver todas as permissões do app <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Mostrar todos os apps que têm esta permissão"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informações"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Configurações"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Mostrar uso de microfone pelo Assistente"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Configurações de apps não usados"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Remover permissões se o app não for usado"</string> @@ -438,7 +440,9 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Abrir links"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Padrão para trabalho"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Padrão para o espaço privado"</string> - <string name="default_app_none" msgid="9084592086808194457">"Nenhuma"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Otimizados para o dispositivo"</string> + <string name="default_app_others" msgid="7793029848126079876">"Outros"</string> + <string name="default_app_none" msgid="9084592086808194457">"Nenhum"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Padrão do sistema)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Nenhum app"</string> <string name="default_payment_app_other_nfc_services" msgid="5957633798695758917">"Outros serviços de NFC"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"Solicitação do <xliff:g id="APP_NAME">%1$s</xliff:g> para upload de informações de depuração."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Compartilhar dados de depuração?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"O sistema detectou um problema."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"Há uma solicitação do <xliff:g id="APP_NAME_0">%1$s</xliff:g> para upload de um relatório de bug criado neste dispositivo no dia <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g>. Os relatórios de bug incluem informações pessoais do seu dispositivo ou registradas por apps, como nomes de usuário, dados de local, identificadores do dispositivo e informações de rede. Compartilhe relatórios de bug apenas com pessoas e apps em que você confia para ter acesso a essas informações. Permitir que o <xliff:g id="APP_NAME_1">%4$s</xliff:g> faça upload do relatório de bug?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"Há uma solicitação do app <xliff:g id="APP_NAME_0">%1$s</xliff:g> para upload de um relatório de bug criado neste dispositivo no dia <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g>. Os relatórios de bug incluem informações pessoais do seu dispositivo ou registradas por apps, como nomes de usuário, dados de local, identificadores do dispositivo e informações de rede. Por isso, só compartilhe relatórios de bug com pessoas e apps de sua confiança.\n\nPermitir que o app <xliff:g id="APP_NAME_1">%4$s</xliff:g> faça upload do relatório de bug?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Ocorreu um erro ao processar o relatório de bug do app <xliff:g id="APP_NAME">%1$s</xliff:g>. Por isso, o compartilhamento dos dados detalhados de depuração foi negado. Lamentamos a interrupção."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Permitir"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Negar"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Permitir configurações restritas"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Configuração restrita"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Para sua segurança, essa configuração está indisponível no momento."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Ação indisponível durante uma ligação"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Não é possível permitir que apps instalem outros apps durante uma ligação.\n\n Golpistas costumam pedir esse tipo de ação durante ligações, então ela fica bloqueada para sua proteção. Se você está recebendo instruções de uma pessoa desconhecida para realizar essa ação, isso pode ser um golpe."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Não é possível realizar a ação durante uma ligação"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Esta configuração está bloqueada para proteger seu dispositivo e seus dados.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Golpistas podem pedir que você instale apps desconhecidos de uma nova fonte para tentar instalar softwares nocivos."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Golpistas podem pedir que você autorize recursos de acessibilidade em um app para tentar controlar seu dispositivo."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"O app não recebeu a seguinte permissão de acesso: <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"O app solicitou acesso a uma permissão sensível que pode colocar suas informações pessoais e financeiras em risco.<xliff:g id="ID_1"><br><br></xliff:g>É possível que o app não funcione corretamente sem essa permissão restrita. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Aprenda a conceder acesso</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"O app não recebeu o acesso para ser a escolha padrão de: <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-pt-rPT-v33/strings.xml b/PermissionController/res/values-pt-rPT-v33/strings.xml index a228677bf..6b1bd5b56 100644 --- a/PermissionController/res/values-pt-rPT-v33/strings.xml +++ b/PermissionController/res/values-pt-rPT-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Mais alertas"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Alertas ignorados"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Expandir e ver mais um alerta}many{Expandir e ver mais # alertas}other{Expandir e ver mais # alertas}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Reduzir"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alerta. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Ação concluída"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Verifique as definições que podem adicionar proteção ao seu dispositivo"</string> diff --git a/PermissionController/res/values-pt-rPT/strings.xml b/PermissionController/res/values-pt-rPT/strings.xml index 9989caf2e..bdf9b2567 100644 --- a/PermissionController/res/values-pt-rPT/strings.xml +++ b/PermissionController/res/values-pt-rPT/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Acesso a <xliff:g id="PERM">%1$s</xliff:g> para esta app no dispositivo <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Ver todas as autorizações da app <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Ver todas as apps com esta autorização"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informações"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Definições"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Mostrar utilização do microfone do assistente"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Definições de apps não usadas"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Remover autorizações se a app não for utilizada"</string> @@ -353,7 +355,7 @@ <string name="accessibility_service_dialog_title_multiple" msgid="5527879210683548175">"<xliff:g id="NUM_SERVICES">%s</xliff:g> aplicações de acessibilidade têm acesso total ao seu dispositivo"</string> <string name="accessibility_service_dialog_bottom_text_single" msgid="1128666197822205958">"O serviço <xliff:g id="SERVICE_NAME">%s</xliff:g> pode ver o seu ecrã, as ações e as entradas, efetuar ações e controlar o ecrã."</string> <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"Estas aplicações podem ver o ecrã, as ações e as entradas, efetuar ações e controlar o ecrã."</string> - <string name="role_assistant_label" msgid="4727586018198208128">"App assistente digital predefinida"</string> + <string name="role_assistant_label" msgid="4727586018198208128">"App de assistente digital predefinida"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"App assistente digital"</string> <string name="role_assistant_description" msgid="6622458130459922952">"As apps de assistência podem ser-lhe úteis com base em informações do ecrã que está a ver. Algumas apps são compatíveis com serviços de iniciação e de entrada de texto por voz para oferecer assistência integrada."</string> <string name="role_browser_label" msgid="2877796144554070207">"App navegador predefinida"</string> @@ -362,13 +364,13 @@ <string name="role_browser_request_title" msgid="2895200507835937192">"Quer definir o <xliff:g id="APP_NAME">%1$s</xliff:g> como a app de navegador predefinida?"</string> <string name="role_browser_request_description" msgid="5888803407905985941">"Não são necessárias autorizações."</string> <string name="role_dialer_label" msgid="1100224146343237968">"App de telefone predefinida"</string> - <string name="role_dialer_short_label" msgid="7186888549465352489">"App Telefone"</string> + <string name="role_dialer_short_label" msgid="7186888549465352489">"App de telefone"</string> <string name="role_dialer_description" msgid="8768708633696539612">"Apps que permitem fazer e receber chamadas no seu dispositivo"</string> <string name="role_dialer_request_title" msgid="5959618560705912058">"Quer definir o <xliff:g id="APP_NAME">%1$s</xliff:g> como a app de telefone predefinida?"</string> <string name="role_dialer_request_description" msgid="6288839625724909320">"Esta app fica com acesso à sua Câmara, Contactos, Microfone, Telefone e SMS"</string> <string name="role_dialer_search_keywords" msgid="3324448983559188087">"telefone"</string> <string name="role_sms_label" msgid="8456999857547686640">"App de SMS predefinida"</string> - <string name="role_sms_short_label" msgid="4371444488034692243">"app de SMS"</string> + <string name="role_sms_short_label" msgid="4371444488034692243">"App de SMS"</string> <string name="role_sms_description" msgid="3424020199148153513">"Apps que permitem usar o seu número de telefone para enviar e receber mensagens de texto, fotos, vídeos e muito mais."</string> <string name="role_sms_request_title" msgid="7953552109601185602">"Quer definir o <xliff:g id="APP_NAME">%1$s</xliff:g> como app SMS predefinida?"</string> <string name="role_sms_request_description" msgid="2691004766132144886">"Esta app fica com acesso à sua Câmara, Contactos, Ficheiros e multimédia, Microfone, Telefone e SMS"</string> @@ -380,7 +382,7 @@ <string name="role_emergency_request_description" msgid="131645948770262850">"Não são necessárias autorizações."</string> <string name="role_emergency_search_keywords" msgid="1920007722599213358">"em caso de emergência"</string> <string name="role_home_label" msgid="3871847846649769412">"App página inicial predefinida"</string> - <string name="role_home_short_label" msgid="8544733747952272337">"App Página inicial"</string> + <string name="role_home_short_label" msgid="8544733747952272337">"App de página inicial"</string> <string name="role_home_description" msgid="7997371519626556675">"Também conhecidas por \"launcher\" são apps que substituem os ecrãs principais no Android e dão acesso aos conteúdos e às funcionalidades do seu dispositivo"</string> <string name="role_home_request_title" msgid="738136983453341081">"Quer definir o <xliff:g id="APP_NAME">%1$s</xliff:g> como a app Página inicial predefinida?"</string> <string name="role_home_request_description" msgid="2658833966716057673">"Não são necessárias autorizações."</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Abertura de links"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Predefinição para o trabalho"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Predefinição para espaço privado"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Otimizadas para o dispositivo"</string> + <string name="default_app_others" msgid="7793029848126079876">"Outras"</string> <string name="default_app_none" msgid="9084592086808194457">"Nenhuma"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Predefinição do sistema)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Sem apps"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"A app <xliff:g id="APP_NAME">%1$s</xliff:g> quer carregar informações de depuração."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Quer partilhar dados de depuração?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"O sistema detetou um problema."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"A app <xliff:g id="APP_NAME_0">%1$s</xliff:g> está a solicitar o carregamento de um relatório de erro a partir deste dispositivo realizado a <xliff:g id="DATE">%2$s</xliff:g> à(s) <xliff:g id="TIME">%3$s</xliff:g>. Os relatórios de erros incluem informações pessoais acerca do seu dispositivo ou registadas por app, por exemplo, nomes de utilizador, dados de localização, identificadores do dispositivo e informações da rede. Apenas partilhe relatórios de erros com pessoas e apps nas quais confia. Permite que a app <xliff:g id="APP_NAME_1">%4$s</xliff:g> carregue um relatório de erro?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"A app <xliff:g id="APP_NAME_0">%1$s</xliff:g> está a pedir o carregamento de um relatório de erro a partir deste dispositivo realizado a <xliff:g id="DATE">%2$s</xliff:g> à(s) <xliff:g id="TIME">%3$s</xliff:g>. Os relatórios de erros incluem informações pessoais acerca do seu dispositivo ou registadas por apps, por exemplo, nomes de utilizador, dados de localização, identificadores do dispositivo e informações da rede. Partilhe relatórios de erros apenas com pessoas e apps nas quais confia.\n\nPermite que a app <xliff:g id="APP_NAME_1">%4$s</xliff:g> carregue um relatório de erro?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Ocorreu um erro ao processar o relatório de erro para a app <xliff:g id="APP_NAME">%1$s</xliff:g>. Como tal, a partilha dos dados de depuração detalhados foi negada. Pedimos desculpa pela interrupção."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Permitir"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Recusar"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Permitir definições restritas"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Definição restrita"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Para sua segurança, esta definição está indisponível atualmente."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Ação não disponível durante uma chamada"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Não é permitido permitir que as apps instalem outras apps durante uma chamada telefónica.\n\n Os autores de esquemas pedem frequentemente este tipo de ação durante as conversas telefónicas, por isso, a opção é bloqueada para sua proteção. Se alguém que não conhece lhe pedir para realizar esta ação, pode tratar-se de um esquema."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Não é possível concluir a ação durante a chamada"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Esta definição está bloqueada para proteger o seu dispositivo e dados.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Os autores de esquemas podem tentar instalar apps prejudiciais pedindo-lhe para instalar apps desconhecidas de uma nova origem."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Os autores de esquemas podem tentar assumir o controlo do seu dispositivo pedindo-lhe para permitir o acesso de acessibilidade para uma app."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"O acesso a <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> foi negado à app"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"A app pediu acesso a uma autorização confidencial que pode pôr em risco as suas informações pessoais e financeiras.<xliff:g id="ID_1"><br><br></xliff:g>É possível que a app não funcione corretamente sem esta autorização restrita. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Saiba como permitir o acesso</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"O acesso à função predefinida <xliff:g id="ROLE_NAME">%1$s</xliff:g> foi negado à app"</string> diff --git a/PermissionController/res/values-pt-v33/strings.xml b/PermissionController/res/values-pt-v33/strings.xml index aeda06c8f..9fba7c078 100644 --- a/PermissionController/res/values-pt-v33/strings.xml +++ b/PermissionController/res/values-pt-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Mais alertas"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Alertas dispensados"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Abra para ver mais um alerta}one{Abra para ver mais # alerta}many{Abra para ver mais # de alertas}other{Abra para ver mais # alertas}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Fechar"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alerta. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Ação concluída"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Verifique as configurações que podem adicionar mais proteção ao seu dispositivo"</string> diff --git a/PermissionController/res/values-pt/strings.xml b/PermissionController/res/values-pt/strings.xml index e49acd0c8..48cedd428 100644 --- a/PermissionController/res/values-pt/strings.xml +++ b/PermissionController/res/values-pt/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Acesso de <xliff:g id="PERM">%1$s</xliff:g> para esse app no <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Ver todas as permissões do app <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Mostrar todos os apps que têm esta permissão"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informações"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Configurações"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Mostrar uso de microfone pelo Assistente"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Configurações de apps não usados"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Remover permissões se o app não for usado"</string> @@ -438,7 +440,9 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Abrir links"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Padrão para trabalho"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Padrão para o espaço privado"</string> - <string name="default_app_none" msgid="9084592086808194457">"Nenhuma"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Otimizados para o dispositivo"</string> + <string name="default_app_others" msgid="7793029848126079876">"Outros"</string> + <string name="default_app_none" msgid="9084592086808194457">"Nenhum"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Padrão do sistema)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Nenhum app"</string> <string name="default_payment_app_other_nfc_services" msgid="5957633798695758917">"Outros serviços de NFC"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"Solicitação do <xliff:g id="APP_NAME">%1$s</xliff:g> para upload de informações de depuração."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Compartilhar dados de depuração?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"O sistema detectou um problema."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"Há uma solicitação do <xliff:g id="APP_NAME_0">%1$s</xliff:g> para upload de um relatório de bug criado neste dispositivo no dia <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g>. Os relatórios de bug incluem informações pessoais do seu dispositivo ou registradas por apps, como nomes de usuário, dados de local, identificadores do dispositivo e informações de rede. Compartilhe relatórios de bug apenas com pessoas e apps em que você confia para ter acesso a essas informações. Permitir que o <xliff:g id="APP_NAME_1">%4$s</xliff:g> faça upload do relatório de bug?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"Há uma solicitação do app <xliff:g id="APP_NAME_0">%1$s</xliff:g> para upload de um relatório de bug criado neste dispositivo no dia <xliff:g id="DATE">%2$s</xliff:g>, <xliff:g id="TIME">%3$s</xliff:g>. Os relatórios de bug incluem informações pessoais do seu dispositivo ou registradas por apps, como nomes de usuário, dados de local, identificadores do dispositivo e informações de rede. Por isso, só compartilhe relatórios de bug com pessoas e apps de sua confiança.\n\nPermitir que o app <xliff:g id="APP_NAME_1">%4$s</xliff:g> faça upload do relatório de bug?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Ocorreu um erro ao processar o relatório de bug do app <xliff:g id="APP_NAME">%1$s</xliff:g>. Por isso, o compartilhamento dos dados detalhados de depuração foi negado. Lamentamos a interrupção."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Permitir"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Negar"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Permitir configurações restritas"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Configuração restrita"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Para sua segurança, essa configuração está indisponível no momento."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Ação indisponível durante uma ligação"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Não é possível permitir que apps instalem outros apps durante uma ligação.\n\n Golpistas costumam pedir esse tipo de ação durante ligações, então ela fica bloqueada para sua proteção. Se você está recebendo instruções de uma pessoa desconhecida para realizar essa ação, isso pode ser um golpe."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Não é possível realizar a ação durante uma ligação"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Esta configuração está bloqueada para proteger seu dispositivo e seus dados.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Golpistas podem pedir que você instale apps desconhecidos de uma nova fonte para tentar instalar softwares nocivos."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Golpistas podem pedir que você autorize recursos de acessibilidade em um app para tentar controlar seu dispositivo."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"O app não recebeu a seguinte permissão de acesso: <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"O app solicitou acesso a uma permissão sensível que pode colocar suas informações pessoais e financeiras em risco.<xliff:g id="ID_1"><br><br></xliff:g>É possível que o app não funcione corretamente sem essa permissão restrita. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Aprenda a conceder acesso</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"O app não recebeu o acesso para ser a escolha padrão de: <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-ro-v33/strings.xml b/PermissionController/res/values-ro-v33/strings.xml index a32a32db5..7eae996fa 100644 --- a/PermissionController/res/values-ro-v33/strings.xml +++ b/PermissionController/res/values-ro-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Mai multe alerte"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Alerte respinse"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Extinde și mai vezi o alertă}few{Extinde și mai vezi # alerte}other{Extinde și mai vezi # de alerte}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Restrânge"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alertă. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Acțiune încheiată"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Verifică setările care pot spori protecția dispozitivului"</string> diff --git a/PermissionController/res/values-ro/strings.xml b/PermissionController/res/values-ro/strings.xml index d75d6c6de..50d771866 100644 --- a/PermissionController/res/values-ro/strings.xml +++ b/PermissionController/res/values-ro/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Acces de <xliff:g id="PERM">%1$s</xliff:g> pentru această aplicație pe <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Vezi toate permisiunile aplicației <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Vezi toate aplicațiile cu această permisiune"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informații"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Setări"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Afișează datele de utilizare a microfonului cu Asistentul"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Setările aplicațiilor nefolosite"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Elimină permisiunile dacă aplicația nu este folosită"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Deschiderea linkurilor"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Prestabilite pentru serviciu"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Prestabilit pentru spațiul privat"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimizate pentru dispozitiv"</string> + <string name="default_app_others" msgid="7793029848126079876">"Altele"</string> <string name="default_app_none" msgid="9084592086808194457">"Niciuna"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Prestabilită de sistem)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Nicio aplicație"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> dorește să încarce informațiile despre remedierea erorilor."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Trimiți datele despre remedierea erorilor?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Sistemul a detectat o problemă."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> solicită încărcarea unui raport de eroare de pe acest dispozitiv creat în data de <xliff:g id="DATE">%2$s</xliff:g> la <xliff:g id="TIME">%3$s</xliff:g>. Rapoartele de erori conțin informații cu caracter personal despre dispozitiv sau înregistrate de aplicații, de exemplu: nume de utilizator, date privind locațiile, identificatori ai dispozitivului și informații despre rețea. Trimite rapoarte de erori doar persoanelor și aplicațiilor de încredere. Permiți ca <xliff:g id="APP_NAME_1">%4$s</xliff:g> să încarce un raport de eroare?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> solicită încărcarea unui raport de eroare de pe acest dispozitiv creat în data de <xliff:g id="DATE">%2$s</xliff:g> la <xliff:g id="TIME">%3$s</xliff:g>. Rapoartele de erori conțin informații cu caracter personal despre dispozitiv sau înregistrate de aplicații, de exemplu: nume de utilizator, date privind locațiile, identificatori ai dispozitivului și informații despre rețea. Trimite rapoarte de erori doar persoanelor și aplicațiilor de încredere.\n\nPermiți ca <xliff:g id="APP_NAME_1">%4$s</xliff:g> să încarce un raport de eroare?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"A apărut o eroare la procesarea raportului de eroare pentru <xliff:g id="APP_NAME">%1$s</xliff:g>. Astfel, accesul la datele detaliate de remedierea erorilor a fost refuzat. Ne cerem scuze pentru întrerupere."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Permite"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Refuz"</string> @@ -471,7 +475,7 @@ <string name="permgrouprequest_device_aware_storage_isolated" msgid="6463062962458809752">"Permiți accesul <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> la fotografiile și conținutul media de pe <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>?"</string> <string name="permgrouprequest_contacts" msgid="8391550064551053695">"Permiți ca <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> să-ți acceseze agenda?"</string> <string name="permgrouprequest_device_aware_contacts" msgid="731025863972535928">"Permiți ca <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> să acceseze agenda ta de pe <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>?"</string> - <string name="permgrouprequest_location" msgid="6990232580121067883">"Permiți ca <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> să acceseze locația acestui dispozitiv?"</string> + <string name="permgrouprequest_location" msgid="6990232580121067883">"Permiți accesarea de către <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> a locației acestui dispozitiv?"</string> <string name="permgrouprequest_device_aware_location" msgid="6075412127429878638">"Permiți ca <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> să acceseze locația dispozitivului <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>?"</string> <string name="permgrouprequestdetail_location" msgid="2635935335778429894">"Aplicația va avea acces la locație doar când o folosești"</string> <string name="permgroupbackgroundrequest_location" msgid="1085680897265734809">"Permiți ca <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> să acceseze locația acestui dispozitiv?"</string> @@ -525,7 +529,7 @@ <string name="permgroupupgraderequestdetail_camera" msgid="6642747548010962597">"Aplicația dorește să fotografieze și să înregistreze videoclipuri permanent, chiar și când nu o folosești. "<annotation id="link">"Acordă această permisiune din setări."</annotation></string> <string name="permgrouprequest_calllog" msgid="2065327180175371397">"Permiți ca <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> să-ți acceseze jurnalele de apeluri?"</string> <string name="permgrouprequest_device_aware_calllog" msgid="8220927190376843309">"Permiți ca <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> să-ți acceseze jurnalele de apeluri telefonice de pe <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>?"</string> - <string name="permgrouprequest_phone" msgid="1829234136997316752">"Permiți ca <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> să dea și să gestioneze apeluri telefonice?"</string> + <string name="permgrouprequest_phone" msgid="1829234136997316752">"Permiți ca <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> să și să gestioneze apeluri telefonice?"</string> <string name="permgrouprequest_device_aware_phone" msgid="590399263670349955">"Permiți ca <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> să inițieze și să gestioneze apeluri telefonice pe <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>?"</string> <string name="permgrouprequest_sensors" msgid="4397358316850652235">"Permiți ca <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> să acceseze datele de la senzori despre semnele vitale?"</string> <string name="permgrouprequest_device_aware_sensors" msgid="3874451050573615157">"Permiți ca <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> să acceseze datele de la senzori despre semnele tale vitale de pe <b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>?"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Permite setările restricționate"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Setare restricționată"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Pentru securitatea ta, setarea este momentan indisponibilă."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Acțiune indisponibilă în timpul apelului telefonic"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Nu este permisă instalarea altor aplicații în timpul unui apel telefonic.\n\n Escrocii solicită adesea acest tip de acțiune în timpul conversațiilor telefonice, astfel că opțiunea este blocată pentru a te proteja. Dacă o persoană necunoscută te îndrumă să faci această acțiune, este posibil să fie o escrocherie."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Nu se poate finaliza acțiunea în timpul apelului"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Această setare este blocată pentru a-ți proteja dispozitivul și datele.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Escrocii pot încerca să instaleze aplicații dăunătoare cerându-ți să instalezi aplicații necunoscute dintr-o sursă nouă."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Escrocii pot încerca să preia controlul asupra dispozitivului tău cerându-ți să permiți accesul la funcții de accesibilitate pentru o aplicație."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Accesul aplicației la <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> a fost refuzat"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Aplicația a solicitat acces la o permisiune de accesare a informațiilor sensibile care îți poate pune în pericol informațiile financiare și cu caracter personal.<xliff:g id="ID_1"><br><br></xliff:g>Este posibil ca aplicația să nu funcționeze corect fără această permisiune restricționată. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Află cum să permiți accesul</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Accesul aplicației pentru a deveni <xliff:g id="ROLE_NAME">%1$s</xliff:g> prestabilită a fost refuzat"</string> diff --git a/PermissionController/res/values-ru-v33/strings.xml b/PermissionController/res/values-ru-v33/strings.xml index a13e4e8d5..5506ccd97 100644 --- a/PermissionController/res/values-ru-v33/strings.xml +++ b/PermissionController/res/values-ru-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Другие оповещения"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Закрытые оповещения"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Разверните, чтобы увидеть ещё одно оповещение}one{Разверните, чтобы увидеть ещё # оповещение}few{Разверните, чтобы увидеть ещё # оповещения}many{Разверните, чтобы увидеть ещё # оповещений}other{Разверните, чтобы увидеть ещё # оповещения}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Свернуть"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Оповещение. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Действие выполнено"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Изучите настройки, позволяющие усилить защиту устройства"</string> @@ -40,7 +41,7 @@ <string name="safety_center_qs_privacy_control" msgid="1160682635058529673">"Переключатель: <xliff:g id="PRIVACY_CONTROL_TITLE">%1$s</xliff:g> (<xliff:g id="PRIVACY_CONTROL_STATUS">%2$s</xliff:g>)"</string> <string name="safety_center_qs_toggle_action" msgid="5920465736488119255">"Переключатель"</string> <string name="safety_center_qs_open_action" msgid="2760200829912423728">"Открыть"</string> - <string name="safety_center_review_settings_button" msgid="938981137942443930">"Перейти в настройки"</string> + <string name="safety_center_review_settings_button" msgid="938981137942443930">"Открыть настройки"</string> <string name="safety_center_gear_label" msgid="5175877094379694098">"Настройки"</string> <string name="safety_center_info_label" msgid="8993181584061825412">"Информация"</string> </resources> diff --git a/PermissionController/res/values-ru/strings.xml b/PermissionController/res/values-ru/strings.xml index 8d99ca6aa..8f858e766 100644 --- a/PermissionController/res/values-ru/strings.xml +++ b/PermissionController/res/values-ru/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Разрешение \"<xliff:g id="PERM">%1$s</xliff:g>\" для этого приложения на устройстве \"<xliff:g id="DEVICE_NAME">%2$s</xliff:g>\""</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Все разрешения приложения \"<xliff:g id="APP">%1$s</xliff:g>\""</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Все приложения с этим разрешением"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Информация"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Настройки"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Показывать сведения об использовании микрофона Ассистентом"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Настройки неиспользуемых приложений"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Отзывать разрешения, если приложение не используется"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Переход по ссылкам"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Стандартные для работы"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Приложения по умолчанию для личного пространства"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Оптимизированные для устройства"</string> + <string name="default_app_others" msgid="7793029848126079876">"Прочие"</string> <string name="default_app_none" msgid="9084592086808194457">"Нет"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(по умолчанию)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Приложений нет"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" запрашивает разрешение на загрузку данных об отладке."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Отправить данные об отладке?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"В системе обнаружена проблема"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"Приложение \"<xliff:g id="APP_NAME_0">%1$s</xliff:g>\" запрашивает разрешение загрузить с этого устройства отчет об ошибке, созданный <xliff:g id="DATE">%2$s</xliff:g> в <xliff:g id="TIME">%3$s</xliff:g>. Отчет может содержать персональную информацию об устройстве или сведения, сохраненные приложениями, например имена пользователей, геоданные, идентификаторы устройства и информацию о сетях. Отправляйте отчеты об ошибке только тем приложениям и пользователям, которым доверяете. Разрешить приложению \"<xliff:g id="APP_NAME_1">%4$s</xliff:g>\" загрузить отчет об ошибке?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"Приложение \"<xliff:g id="APP_NAME_0">%1$s</xliff:g>\" запрашивает разрешение загрузить с этого устройства отчет об ошибке, созданный <xliff:g id="DATE">%2$s</xliff:g> в <xliff:g id="TIME">%3$s</xliff:g>. Отчет может содержать персональные данные об устройстве или сведения, сохраненные приложениями, например имена пользователей, геоданные, идентификаторы устройства и информацию о сетях. Отправляйте отчеты об ошибке только тем приложениям и пользователям, которым доверяете.\n\nРазрешить приложению \"<xliff:g id="APP_NAME_1">%4$s</xliff:g>\" загрузить отчет об ошибке?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Не удалось обработать информацию об ошибке в приложении \"<xliff:g id="APP_NAME">%1$s</xliff:g>\". Данные об отладке не отправлены. Приносим извинения за неудобства."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Разрешить"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Запретить"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Разрешить доступ к настройкам"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Настройки с ограниченным доступом"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"В целях безопасности эти настройки пока недоступны."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Действие недоступно во время звонка."</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Во время звонка нельзя давать приложениям разрешение на установку приложений.\n\n Об этом часто просят телефонные мошенники, поэтому мы заблокировали эту функцию, чтобы защитить вас. Если незнакомый человек предлагает вам предоставить такое разрешение, возможно, это мошенник."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Нельзя выполнить действие во время звонка"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Функция заблокирована для защиты устройства и данных.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Мошенники могут попросить вас установить из ненадежных источников незнакомые приложения, которые на самом деле окажутся вредоносным ПО."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Мошенники могут попытаться завладеть устройством, попросив вас включить специальные возможности для приложения."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Для приложения заблокировано разрешение \"<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>\""</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Приложение запрашивает разрешение на доступ к конфиденциальной информации. Если вы предоставите его, ваши личные и финансовые данные могут оказаться под угрозой.<xliff:g id="ID_1"><br><br></xliff:g>Без такого разрешения приложение может работать неправильно. Узнайте, <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>как предоставить доступ к данным</a>."</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Запрос на использование в качестве приложения по умолчанию (<xliff:g id="ROLE_NAME">%1$s</xliff:g>) отклонен"</string> diff --git a/PermissionController/res/values-si-v33/strings.xml b/PermissionController/res/values-si-v33/strings.xml index b3d1ab958..f83695a16 100644 --- a/PermissionController/res/values-si-v33/strings.xml +++ b/PermissionController/res/values-si-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"තවත් ඇඟවීම්"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"අස් කළ ඇඟවීම්"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{පුළුල් කර තවත් එක් ඇඟවීමක් බලන්න}one{පුළුල් කර තවත් ඇඟවීම් #ක් බලන්න}other{පුළුල් කර තවත් ඇඟවීම් #ක් බලන්න}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"හකුළන්න"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"ඇඟවීම. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"ක්රියාමාර්ගය සම්පූර්ණයි"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"ඔබේ උපාංගයට ආරක්ෂණය එක් කළ හැකි සැකසීම් පරීක්ෂා කරන්න"</string> diff --git a/PermissionController/res/values-si/strings.xml b/PermissionController/res/values-si/strings.xml index 4f0a78c39..4319a25bc 100644 --- a/PermissionController/res/values-si/strings.xml +++ b/PermissionController/res/values-si/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> මත මෙම යෙදුම සඳහා <xliff:g id="PERM">%1$s</xliff:g> ප්රවේශය"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"සියලුම <xliff:g id="APP">%1$s</xliff:g> අවසර බලන්න"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"මෙම අවසරය සහිත සියලුම යෙදුම් බලන්න"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"තොරතුරු"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"සැකසීම්"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"සහායක මයික්රෆෝන භාවිතය පෙන්වන්න"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"භාවිත නොකළ යෙදුම් සැකසීම්"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"යෙදුම භාවිත කර නැති නම් අවසර ඉවත් කරන්න"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"සබැඳි විවෘත කිරීම"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"වැඩ සඳහා පෙරනිමි"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"රහසිගත අවකාශය සඳහා පෙරනිමිය"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"උපාංගය සඳහා ප්රශස්ත කර ඇත"</string> + <string name="default_app_others" msgid="7793029848126079876">"වෙනත්"</string> <string name="default_app_none" msgid="9084592086808194457">"කිසිවක් නැත"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(පද්ධතිය පෙරනිමි)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"යෙදුම් නොමැත"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> නිදොසීම් තොරතුරු උඩුගත කිරීමට කැමතිය."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"නිදොසීම් දත්ත බෙදා ගන්නද?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"පද්ධතිය ගැටලුවක් අනාවරණ කර ඇත."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> මෙම උපාංගයෙන් <xliff:g id="DATE">%2$s</xliff:g> හි <xliff:g id="TIME">%3$s</xliff:g> හිදී ගෙන ඇති දෝෂ වාර්තාවක් උඩුගත කිරීමට ඉල්ලා සිටී. දෝෂ වාර්තාවල ඔබේ උපාංගය පිළිබඳ හෝ යෙදුම් විසින් සටහන් කර ඇති පුද්ගලික තොරතුරු, උදාහරණයක් ලෙස, පරිශීලක නාම, ස්ථාන දත්ත, උපාංග හැඳුනුම්කාරක සහ ජාල තොරතුරු ඇතුළත් වේ. ඔබ මෙම තොරතුරු සමඟ විශ්වාස කරන පුද්ගලයින් සහ යෙදුම් සමඟ පමණක් දෝෂ වාර්තා බෙදා ගන්න. <xliff:g id="APP_NAME_1">%4$s</xliff:g> හට දෝෂ වාර්තාවක් උඩුගත කිරීමට ඉඩ දෙන්න ද?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> මෙම උපාංගයෙන් <xliff:g id="DATE">%2$s</xliff:g> හි <xliff:g id="TIME">%3$s</xliff:g> හිදී ගෙන ඇති දෝෂ වාර්තාවක් උඩුගත කිරීමට ඉල්ලා සිටී. දෝෂ වාර්තාවල ඔබේ උපාංගය පිළිබඳ හෝ යෙදුම් විසින් සටහන් කර ඇති පුද්ගලික තොරතුරු, උදාහරණයක් ලෙස, පරිශීලක නාම, ස්ථාන දත්ත, උපාංග හැඳුනුම්කාරක සහ ජාල තොරතුරු ඇතුළත් වේ. ඔබ මෙම තොරතුරු සමඟ විශ්වාස කරන පුද්ගලයින් සහ යෙදුම් සමඟ පමණක් දෝෂ වාර්තා බෙදා ගන්න.\n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g> හට දෝෂ වාර්තාවක් උඩුගත කිරීමට ඉඩ දෙන්න ද?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> සඳහා දෝෂ වාර්තාව සැකසීමේ දෝෂයක් ඇති විය. එබැවින් විස්තරාත්මක නිදොසීම් දත්ත බෙදා ගැනීම ප්රතික්ෂේප කර ඇත. බාධා කිරීම ගැන කනගාටුයි."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"ඉඩ දෙන්න"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"ප්රතික්ෂේප කරන්න"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"සීමා කළ සැකසීම්වලට ඉඩ දෙන්න"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"සීමා කළ සැකසීම"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"ඔබේ ආරක්ෂාව සඳහා, මෙම සැකසීම දැනට නොමැත."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"දුරකථන ඇමතුමක සිටින අතරතුර ක්රියාව ලබා ගත නොහැක."</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"දුරකථන ඇමතුමක් අතරතුර යෙදුම් වලට වෙනත් යෙදුම් ස්ථාපනය කිරීමට ඉඩ නොදෙයි.\n\n වංචාකරුවන් බොහෝ විට දුරකථන ඇමතුම් සංවාද අතරතුර මෙවැනි ක්රියාමාර්ග ඉල්ලා සිටින බැවින්, ඔබව ආරක්ෂා කිරීමට එය අවහිර කර ඇත. ඔබ නොදන්නා කෙනෙකු විසින් මෙම ක්රියාමාර්ගය ගැනීමට ඔබට මඟ පෙන්වනු ලැබුවහොත්, එය වංචාවක් විය හැක."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"ඇමතුම අතරතුර ක්රියාව සම්පූර්ණ කළ නොහැක."</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"ඔබේ උපාංගය සහ දත්ත ආරක්ෂා කිරීමට මෙම සැකසීම අවහිර කර ඇත. <xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>වංචාකරුවන් නව මූලාශ්රයකින් නොදන්නා යෙදුම් ස්ථාපනය කරන ලෙස ඉල්ලා සිටීමෙන් හානිකර යෙදුම් ස්ථාපනය කිරීමට උත්සාහ කළ හැක."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>වංචාකරුවන් යෙදුමක් සඳහා ප්රවේශ්යතා ප්රවේශයට ඉඩ දෙන ලෙස ඉල්ලා සිටීමෙන් ඔබේ උපාංගයේ පාලනය ලබා ගැනීමට උත්සාහ කළ හැක."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"යෙදුම <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> වෙත ප්රවේශය ප්රතික්ෂේප කරන ලදි"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"යෙදුම ඔබේ පුද්ගලික සහ මූල්ය තොරතුරු අවදානමට ලක් කළ හැකි සංවේදී අවසරයකට ප්රවේශය ඉල්ලා ඇත.<xliff:g id="ID_1"><br><br></xliff:g>මෙම සීමා කළ අවසරය නොමැතිව යෙදුම නිසි ලෙස ක්රියා නොකරනු ඇත. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>ප්රවේශයට ඉඩ දෙන ආකාරය දැන ගන්න</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"යෙදුම පෙරනිමි <xliff:g id="ROLE_NAME">%1$s</xliff:g> වීමට ප්රවේශය ප්රතික්ෂේප කරන ලදි"</string> diff --git a/PermissionController/res/values-sk-v33/strings.xml b/PermissionController/res/values-sk-v33/strings.xml index f36fd1089..3024de58b 100644 --- a/PermissionController/res/values-sk-v33/strings.xml +++ b/PermissionController/res/values-sk-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Ďalšie upozornenia"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Odmietnuté upozornenia"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Po rozbalení sa zobrazí jedno ďalšie upozornenie}few{Po rozbalení sa zobrazia # ďalšie upozornenia}many{Expand and see # more alerts}other{Po rozbalení sa zobrazí # ďalších upozornení}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Zbaliť"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Upozornenie. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Akcia je dokončená"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Skontrolujte nastavenia, ktoré môžu pridať ochranu do vášho zariadenia"</string> diff --git a/PermissionController/res/values-sk-watch/strings.xml b/PermissionController/res/values-sk-watch/strings.xml index 1a7e89701..52503904f 100644 --- a/PermissionController/res/values-sk-watch/strings.xml +++ b/PermissionController/res/values-sk-watch/strings.xml @@ -23,10 +23,10 @@ <string name="generic_yes" msgid="2489207724988649846">"Áno"</string> <string name="generic_cancel" msgid="2631708607129269698">"Zrušiť"</string> <string name="permission_access_always" msgid="2107115233573823032">"Po celý čas"</string> - <string name="permission_access_only_foreground" msgid="4412115020089923986">"Pri používaní"</string> + <string name="permission_access_only_foreground" msgid="4412115020089923986">"Pri používaní aplikácie"</string> <string name="app_permission_button_allow_always" msgid="4920899432212307102">"Po celý čas"</string> - <string name="app_permission_button_allow_foreground" msgid="7186980598244864830">"Pri používaní"</string> + <string name="app_permission_button_allow_foreground" msgid="7186980598244864830">"Pri používaní aplikácie"</string> <string name="grant_dialog_button_allow_always" msgid="7130695257254694576">"Po celý čas"</string> - <string name="grant_dialog_button_allow_foreground" msgid="8917595344037255090">"Pri používaní"</string> + <string name="grant_dialog_button_allow_foreground" msgid="8917595344037255090">"Pri používaní aplikácie"</string> <string name="grant_dialog_button_allow_background" msgid="6104993390936535493">"Po celý čas"</string> </resources> diff --git a/PermissionController/res/values-sk/strings.xml b/PermissionController/res/values-sk/strings.xml index 4442bbc85..1335d64ef 100644 --- a/PermissionController/res/values-sk/strings.xml +++ b/PermissionController/res/values-sk/strings.xml @@ -74,7 +74,7 @@ <string name="days_ago" msgid="6650359081551335629">"{count,plural, =0{Dnes}=1{Pred 1 dňom}few{Pred # dňami}many{Pred # dňa}other{Pred # dňami}}"</string> <string name="app_disable_dlg_positive" msgid="7418444149981904940">"Deaktivovať aplikáciu"</string> <string name="app_disable_dlg_text" msgid="3126943217146120240">"Ak aplikáciu deaktivujete, systém a ďalšie aplikácie už nemusia fungovať podľa očakávaní. Upozorňujeme, že túto aplikáciu nemôžete odstrániť, pretože bola vo vašom zariadení predinštalovaná. Deaktiváciou ju vypnete a skryjete v zariadení."</string> - <string name="app_permission_manager" msgid="3903811137630909550">"Správca povolení"</string> + <string name="app_permission_manager" msgid="3903811137630909550">"Správa povolení"</string> <string name="never_ask_again" msgid="4728762438198560329">"Nabudúce sa nepýtať"</string> <string name="no_permissions" msgid="3881676756371148563">"Žiadne povolenia"</string> <string name="additional_permissions" msgid="5801285469338873430">"Ďalšie povolenia"</string> @@ -86,7 +86,7 @@ <string name="default_permission_description" msgid="4624464917726285203">"umožňuje vykonať neznámu akciu"</string> <string name="app_permissions_group_summary" msgid="8788419008958284002">"Povolené pri <xliff:g id="COUNT_0">%1$d</xliff:g> z(o) <xliff:g id="COUNT_1">%2$d</xliff:g> aplik."</string> <string name="app_permissions_group_summary2" msgid="4329922444840521150">"Počet povolených aplikácií: <xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string> - <string name="menu_show_system" msgid="4254021607027872504">"Zobraziť systémové"</string> + <string name="menu_show_system" msgid="4254021607027872504">"Zobraziť systémové aplikácie"</string> <string name="menu_hide_system" msgid="3855390843744028465">"Skryť systémové aplikácie"</string> <string name="menu_show_7_days_data" msgid="8979611198508523706">"Zobraziť 7 dní"</string> <string name="menu_show_24_hours_data" msgid="8228054833323380780">"Zobraziť 24 hodín"</string> @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Prístup k položke <xliff:g id="PERM">%1$s</xliff:g> pre túto aplikáciu v zariadení <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Zobraziť všetky povolenia aplikácie <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Zobraziť všetky aplikácie s týmto povolením"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informácia"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Nastavenia"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Zobraziť používanie mikrofónu Asistentom"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Nastavenia nepoužívaných aplikácií"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Odstrániť povolenia, ak sa aplikácia nepoužíva"</string> @@ -355,7 +357,7 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"Tieto aplikácie si môžu zobraziť vašu obrazovku, akcie a vstupy, vykonávať akcie a ovládať obrazovku."</string> <string name="role_assistant_label" msgid="4727586018198208128">"Predvolený digitálny asistent"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"Digitálny asistent"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"Asistenčné aplikácie vám pomáhajú na základe informácií zo zobrazenej obrazovky. Niektoré aplikácie podporujú spúšťač aj služby hlasového vstupu, aby vám poskytli integrovanú pomoc."</string> + <string name="role_assistant_description" msgid="6622458130459922952">"Asistenčné aplikácie pomáhajú na základe informácií zo zobrazenej obrazovky. Niektoré aplikácie podporujú spúšťače aj hlasový vstup, a ponúkajú tak integrovanú asistenciu."</string> <string name="role_browser_label" msgid="2877796144554070207">"Predvolený prehliadač"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"Prehliadač"</string> <string name="role_browser_description" msgid="3465253637499842671">"Aplikácie, ktoré umožňujú prehliadať internet a otvárať webové odkazy"</string> @@ -438,7 +440,9 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Otváranie odkazov"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Predvolené na prácu"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Predvolené pre súkromný priestor"</string> - <string name="default_app_none" msgid="9084592086808194457">"Žiadna"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimalizované pre zariadenie"</string> + <string name="default_app_others" msgid="7793029848126079876">"Iné"</string> + <string name="default_app_none" msgid="9084592086808194457">"Žiadna aplikácia"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Predvolené systémom)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Žiadne aplikácie"</string> <string name="default_payment_app_other_nfc_services" msgid="5957633798695758917">"Ďalšie služby NFC"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> chce nahrať informácie o ladení."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Chcete zdieľať údaje ladenia?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Systém zistil problém."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> žiada o nahranie hlásenia chyby z tohto zariadenia vytvoreného <xliff:g id="DATE">%2$s</xliff:g> o <xliff:g id="TIME">%3$s</xliff:g>. Hlásenia chýb zahŕňajú osobné údaje o zariadení alebo osobné údaje zapísané aplikáciami, napríklad používateľské mená, údaje o polohe, identifikátory zariadenia a informácie o sieti. Hlásenia chýb zdieľajte iba s dôveryhodnými osobami a aplikáciami. Chcete povoliť aplikácii <xliff:g id="APP_NAME_1">%4$s</xliff:g> nahrať hlásenie chyby?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"Aplikácia <xliff:g id="APP_NAME_0">%1$s</xliff:g> žiada o nahranie hlásenia chyby z tohto zariadenia vytvoreného <xliff:g id="DATE">%2$s</xliff:g> o <xliff:g id="TIME">%3$s</xliff:g>. Hlásenia chýb zahŕňajú osobné údaje o zariadení alebo osobné údaje zapísané aplikáciami, napríklad používateľské mená, údaje o polohe, identifikátory zariadenia a informácie o sieti. Hlásenia chýb zdieľajte iba s dôveryhodnými osobami a aplikáciami.\n\nChcete povoliť aplikácii <xliff:g id="APP_NAME_1">%4$s</xliff:g> nahrať hlásenie chyby?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Pri spracúvaní hlásenia chyby pre <xliff:g id="APP_NAME">%1$s</xliff:g> sa vyskytla chyba. Zdieľanie podrobných údajov o ladení bolo preto zamietnuté. Ospravedlňujeme sa za prerušenie."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Povoliť"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Zamietnuť"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Povoliť obmedzené nastavenia"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Obmedzené nastavenie"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Z bezpečnostných dôvodov nie je toto nastavenie momentálne k dispozícii."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Akcia nie je počas telefonovania k dispozícii"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Počas telefonického hovoru nie je povolená inštalácia aplikácií inými aplikáciami.\n\n Podvodníci často žiadajú o tento typ akcie počas telefonických hovorov, preto je daná akcia zablokovaná z dôvodu vašej ochrany. Ak vás o túto akciu žiada niekto, koho nepoznáte, môže ísť o podvod."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Počas hovoru sa akcia nedá dokončiť"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Toto nastavenie je zablokované, aby sa zaistila ochrana vášho zariadenia a údajov. <xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Podvodníci sa môžu pokúsiť nainštalovať škodlivé aplikácie tým, že vás požiadajú o inštaláciu neznámych aplikácií z nového zdroja."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Podvodníci sa môžu pokúsiť získať kontrolu nad vaším zariadením tým, že vás v prípade nejakej aplikácie požiadajú o povolenie prístupu k dostupnosti."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Aplikácii bol prístup k povoleniu <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> zamietnutý"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Táto aplikácia vyžaduje prístup k citlivému povoleniu, čo môže ohroziť vaše osobné údaje a finančné informácie.<xliff:g id="ID_1"><br><br></xliff:g>Je možné, že bez tohto obmedzeného povolenia nebude aplikácia správne fungovať. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Ako povoliť prístup</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Aplikácii bol zamietnutý prístup a predvolene nemôže byť <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-sl-v33/strings.xml b/PermissionController/res/values-sl-v33/strings.xml index 6bc0748fb..9e1e7a979 100644 --- a/PermissionController/res/values-sl-v33/strings.xml +++ b/PermissionController/res/values-sl-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Več opozoril"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Opuščena opozorila"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Razširi in prikaži še eno opozorilo}one{Razširi in prikaži še # opozorilo}two{Razširi in prikaži še # opozorili}few{Razširi in prikaži še # opozorila}other{Razširi in prikaži še # opozoril}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Strni"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Opozorilo. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Dejanje končano"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Preverite nastavitve, ki lahko izboljšajo varnost naprave."</string> diff --git a/PermissionController/res/values-sl/strings.xml b/PermissionController/res/values-sl/strings.xml index 168646ac1..0a822baac 100644 --- a/PermissionController/res/values-sl/strings.xml +++ b/PermissionController/res/values-sl/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Dostop do dovoljenja »<xliff:g id="PERM">%1$s</xliff:g>« za to aplikacijo v napravi <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Ogled vseh dovoljenj za aplikacijo <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Ogled vseh aplikacij s tem dovoljenjem"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informacije"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Nastavitve"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Prikaz uporabe pomožnega mikrofona"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Nastavitve neuporabljenih aplikacij"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Odstrani dovoljenja, če aplikacija ni v uporabi"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Odpiranje povezav"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Privzeto za delo"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Privzeto za zasebni prostor"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimizirano za napravo"</string> + <string name="default_app_others" msgid="7793029848126079876">"Drugo"</string> <string name="default_app_none" msgid="9084592086808194457">"Brez"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(privzeta v sistemu)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Ni aplikacij"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> želi naložiti podatke za odpravljanje napak."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Želite poslati podatke za odpravljanje napak?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Sistem je odkril težavo."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"Aplikacija <xliff:g id="APP_NAME_0">%1$s</xliff:g> želi iz te naprave naložiti poročilo o napakah, pripravljeno dne <xliff:g id="DATE">%2$s</xliff:g> ob <xliff:g id="TIME">%3$s</xliff:g>. Poročila o napakah vključujejo osebne podatke o vaši napravi ali osebne podatke, ki so jih zabeležile aplikacije, na primer uporabniška imena, lokacijske podatke, identifikatorje naprave in podatke o omrežju. Poročila o napakah delite samo z osebami in aplikacijami, ki jim te podatke lahko zaupate. Ali aplikaciji <xliff:g id="APP_NAME_1">%4$s</xliff:g> dovolite, da naloži poročilo o napakah?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"Aplikacija <xliff:g id="APP_NAME_0">%1$s</xliff:g> želi iz te naprave naložiti poročilo o napakah, pripravljeno dne <xliff:g id="DATE">%2$s</xliff:g> ob <xliff:g id="TIME">%3$s</xliff:g>. Poročila o napakah vključujejo osebne podatke o vaši napravi ali osebne podatke, ki so jih zabeležile aplikacije, na primer uporabniška imena, lokacijske podatke, identifikatorje naprave in podatke o omrežju. Poročila o napakah delite samo z osebami in aplikacijami, ki jim te podatke lahko zaupate.\n\nAli aplikaciji <xliff:g id="APP_NAME_1">%4$s</xliff:g> dovolite, da naloži poročilo o napakah?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Pri obdelavi poročila o napakah za aplikacijo <xliff:g id="APP_NAME">%1$s</xliff:g> je prišlo do napake, zato je bilo deljenje podrobnih podatkov za odpravljanje napak zavrnjeno. Oprostite zaradi prekinitve."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Dovoli"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Zavrni"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Dovoli omejene nastavitve"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Omejena nastavitev"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Zaradi vaše varnosti ta nastavitev trenutno ni na voljo."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Dejanje ni na voljo med telefonskim klicem"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Med telefonskim klicem ne morete aplikacijam omogočiti nameščanja drugih aplikacij.\n\n Prevaranti med pogovori v telefonskih klicih pogosto zahtevajo to vrsto dejanja, zato je to dejanje blokirano zaradi vaše zaščite. Če vas k temu dejanju napeljuje nekdo, ki ga ne poznate, gre morda za poskus prevare."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Dejanja ni mogoče izvesti med klicem"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Ta nastavitev je blokirana zaradi zaščite naprave in podatkov.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Goljufi lahko poskusijo namestiti škodljive aplikacije tako, da vas prosijo, da namestite neznane aplikacije iz novega vira."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Goljufi lahko poskusijo prevzeti nadzor nad vašo napravo tako, da vas prosijo, da omogočite dostop do funkcij dostopnosti za aplikacijo."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Aplikaciji je bil zavrnjen dostop do dovoljenja »<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>«"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Aplikacija je zahtevala dostop do občutljivega dovoljenja, ki lahko ogrozi vaše osebne in finančne podatke.<xliff:g id="ID_1"><br><br></xliff:g>Aplikacija morda ne bo pravilno delovala brez tega omejenega dovoljenja. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Preberite, kako omogočite dostop</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Aplikaciji je bil zavrnjen dostop do privzete vloge »<xliff:g id="ROLE_NAME">%1$s</xliff:g>«"</string> diff --git a/PermissionController/res/values-sq-v33/strings.xml b/PermissionController/res/values-sq-v33/strings.xml index bbe8e9a89..038dc8d39 100644 --- a/PermissionController/res/values-sq-v33/strings.xml +++ b/PermissionController/res/values-sq-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Sinjalizime të tjera"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Sinjalizime të shpërfillura"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Zgjero dhe shiko një sinjalizim tjetër}other{Zgjero dhe shiko # sinjalizime të tjera}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Palos"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Sinjalizim. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Veprimi përfundoi"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Shiko cilësimet që mund të shtojnë mbrojtjen e pajisjes sate"</string> diff --git a/PermissionController/res/values-sq/strings.xml b/PermissionController/res/values-sq/strings.xml index 793b1beb1..73d2f27fe 100644 --- a/PermissionController/res/values-sq/strings.xml +++ b/PermissionController/res/values-sq/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Qasja te <xliff:g id="PERM">%1$s</xliff:g> për këtë aplikacion në <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Shiko të gjitha lejet e aplikacionit \"<xliff:g id="APP">%1$s</xliff:g>\""</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Shiko të gjitha aplikacionet me këtë leje"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Informacione"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Cilësimet"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Shfaq përdorimin e mikrofonit të \"Asistentit\""</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Cilësimet e aplikacioneve të papërdorura"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Hiq lejet nëse aplikacioni nuk është përdorur"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Hapja e lidhjeve"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Të parazgjedhura për punën"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Të parazgjedhurat për hapësirën private"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimizuar për pajisjen"</string> + <string name="default_app_others" msgid="7793029848126079876">"Të tjera"</string> <string name="default_app_none" msgid="9084592086808194457">"Asnjë"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Parazgjedhja e sistemit)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Nuk ka aplikacione"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> dëshiron të ngarkojë informacionin e korrigjimit."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Të ndahen të dhënat e korrigjimit?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Sistemi ka zbuluar një problem."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> kërkon të ngarkojë një raport të defekteve në kod nga kjo pajisje të regjistruar më <xliff:g id="DATE">%2$s</xliff:g> në <xliff:g id="TIME">%3$s</xliff:g>. Raportet e defekteve në kod përfshijnë informacione personale rreth pajisjes sate ose të regjistruara nga aplikacionet, për shembull emrat e përdoruesve, të dhënat e vendndodhjes, identifikuesit e pajisjeve, si dhe informacione të rrjetit. Ndaji raportet e defekteve në kod vetëm me personat dhe aplikacionet që i beson me këtë informacion. Të lejohet <xliff:g id="APP_NAME_1">%4$s</xliff:g> të ngarkojë një raport të defekteve në kod?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> kërkon të ngarkojë një raport të defekteve në kod nga kjo pajisje të regjistruar më <xliff:g id="DATE">%2$s</xliff:g> në <xliff:g id="TIME">%3$s</xliff:g>. Raportet e defekteve në kod përfshijnë informacione personale rreth pajisjes sate ose të regjistruara nga aplikacionet, për shembull emrat e përdoruesve, të dhënat e vendndodhjes, identifikuesit e pajisjeve dhe informacionet e rrjetit. Ndaji raportet e defekteve në kod vetëm me personat dhe aplikacionet të cilave u beson me këto informacione.\n\nTë lejohet që <xliff:g id="APP_NAME_1">%4$s</xliff:g> të ngarkojë një raport të defekteve në kod?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Kishte një gabim me përpunimin e raportit të defekteve në kod për <xliff:g id="APP_NAME">%1$s</xliff:g>. Kështu që ndarja e të dhënave të detajuara të korrigjimit është refuzuar. Na vjen keq për ndërprerjen."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Lejo"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Refuzo"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Lejo cilësimet e kufizuara"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Cilësim i kufizuar"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Për sigurinë tënde, ky cilësim nuk ofrohet për momentin."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Veprimi nuk ofrohet kur je në një telefonatë"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Nuk lejohet që aplikacionet të lejohen të instalojnë aplikacione të tjera gjatë një telefonate.\n\n Mashtruesit e kërkojnë shpesh këtë lloj veprimi gjatë bisedave të telefonatave, prandaj kjo është bllokuar për të të mbrojtur ty. Nëse po udhëzohesh ta kryesh këtë veprim nga dikush që nuk e njeh, mund të jetë një mashtrim."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Veprimi nuk mund të përfundohet gjatë telefonatës"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Ky cilësim është bllokuar për të mbrojtur pajisjen dhe të dhënat e tua.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Mashtruesit mund të përpiqen të instalojnë aplikacione të dëmshme duke të të kërkuar që të instalosh aplikacione të panjohura nga një burim i ri."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Mashtruesit mund të përpiqen të marrin kontrollin e pajisjes sate duke të të kërkuar që të lejosh qasjen për shërbimin e qasshmërisë për një aplikacion."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Aplikacionit iu refuzua qasja te: <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Aplikacioni kërkoi qasje në një leje delikate që mund t\'i vendosë në rrezik informacionet e tua personale dhe financiare.<xliff:g id="ID_1"><br><br></xliff:g>Ka mundësi që aplikacioni të mos funksionojë si duhet pa këtë leje të kufizuar. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Mëso se si të lejosh qasjen</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Aplikacionit iu refuzua qasja për të qenë parazgjedhja për: <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-sr-v33/strings.xml b/PermissionController/res/values-sr-v33/strings.xml index 1fe22cee5..d778b2a31 100644 --- a/PermissionController/res/values-sr-v33/strings.xml +++ b/PermissionController/res/values-sr-v33/strings.xml @@ -30,9 +30,10 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Још обавештења"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Одбачена обавештења"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Проширите и видите још једно обавештење}one{Проширите и видите још # обавештење}few{Проширите и видите још # обавештења}other{Проширите и видите још # обавештења}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Скупи"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Обавештење. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Радња је довршена"</string> - <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Проверите подешавања која могу да додају заштиту уређају"</string> + <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Проверите подешавања која могу да допринесу бољој заштити уређаја"</string> <string name="safety_center_qs_page_landing" msgid="1717368301679228128">"Брза подешавања безбедности и приватности"</string> <string name="safety_center_qs_close_button" msgid="1352313308176244599">"Затвори"</string> <string name="safety_center_qs_expand_action" msgid="2193190557696484169">"Прошири и прикажи опције"</string> diff --git a/PermissionController/res/values-sr/strings.xml b/PermissionController/res/values-sr/strings.xml index 0c6fd04f6..aeb17d32a 100644 --- a/PermissionController/res/values-sr/strings.xml +++ b/PermissionController/res/values-sr/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Ова апликација има приступ за: <xliff:g id="PERM">%1$s</xliff:g> на уређају <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Прикажи све дозволе за: <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Прикажи све апликације са овом дозволом"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Информације"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Подешавања"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Прикажи како Помоћник користи микрофон"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Подешавања некоришћених апликација"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Уклони дозволе ако се апликација не користи"</string> @@ -353,7 +355,7 @@ <string name="accessibility_service_dialog_title_multiple" msgid="5527879210683548175">"Апликације приступачности (<xliff:g id="NUM_SERVICES">%s</xliff:g>) имају потпун приступ уређају"</string> <string name="accessibility_service_dialog_bottom_text_single" msgid="1128666197822205958">"<xliff:g id="SERVICE_NAME">%s</xliff:g> може да прегледа садржај екрана, радње и уносе, обавља радње и управља екраном."</string> <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"Ове апликације могу да прегледају садржај екрана, радње и уносе, као и да обављају радње и управљају екраном."</string> - <string name="role_assistant_label" msgid="4727586018198208128">"Подразумев. дигитални помоћник"</string> + <string name="role_assistant_label" msgid="4727586018198208128">"Подразумевани дигитални помоћник"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"Апликација дигиталног помоћника"</string> <string name="role_assistant_description" msgid="6622458130459922952">"Апликације за помоћ могу да вам помогну на основу информација са екрана који гледате. Неке апликације подржавају услуге покретача и гласовног уноса да би вам пружиле интегрисану помоћ."</string> <string name="role_browser_label" msgid="2877796144554070207">"Подразумевана апл. прегледача"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Отварање линкова"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Подразумевана за посао"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Подразумевано за приватан простор"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Оптимизовано за уређај"</string> + <string name="default_app_others" msgid="7793029848126079876">"Друго"</string> <string name="default_app_none" msgid="9084592086808194457">"Ништа"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Подразумевана системска)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Нема апликација"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> жели да отпреми информације за отклањање грешака."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Желите да делите податке о отклањању грешака?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Систем је открио проблем."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> тражи да отпреми извештај о грешкама са овог уређаја који је направљен <xliff:g id="DATE">%2$s</xliff:g> у <xliff:g id="TIME">%3$s</xliff:g>. Извештаји о грешкама обухватају личне податке о уређају или податке које су евидентирале апликације, на пример, корисничка имена, податке о локацији, идентификаторе уређаја и информације о мрежи. Делите извештаје о грешкама само са људима и апликацијама које сматрате поузданим за те информације. Желите ли да дозволите да <xliff:g id="APP_NAME_1">%4$s</xliff:g> отпреми извештај о грешци?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> тражи да отпреми извештај о грешци са овог уређаја који је направљен <xliff:g id="DATE">%2$s</xliff:g> у <xliff:g id="TIME">%3$s</xliff:g>. Извештаји о грешкама обухватају личне податке о уређају или податке које су евидентирале апликације, на пример, корисничка имена, податке о локацији, идентификаторе уређаја и информације о мрежи. Делите извештаје о грешкама само са људима и апликацијама којима можете да поверите те информације.\n\nЖелите ли да дозволите да <xliff:g id="APP_NAME_1">%4$s</xliff:g> отпреми извештај о грешци?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Дошло је до грешке при обради извештаја о грешци за апликацију <xliff:g id="APP_NAME">%1$s</xliff:g>. Зато је одбијено дељење детаљних података о отклањању грешака. Извињавамо се због прекида."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Дозволи"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Одбиј"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Дозволи ограничена подешавања"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Ограничено подешавање"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Ово подешавање је тренутно недоступно ради ваше безбедности."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Радња није доступна током телефонског позива"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Није дозвољено да апликације инсталирају друге апликације током телефонског позива.\n\n Преваранти често траже овај тип радње током телефонског позива, па смо је блокирали да бисмо вас заштитили. Ако вас неко кога не познајете упућује на ову радњу, то би могла да буде превара."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Радња не може да се заврши током позива"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Ово подешавање је блокирано да би се заштитили уређај и подаци.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Преваранти могу да покушају да инсталирају штетне апликације тако што ће тражити да инсталирате непознате апликације из новог извора."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Преваранти могу да покушају да преузму контролу над уређајем тако што ће тражити да за апликацију дозволите приступ за приступачност."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Апликацији није дозвољен приступ дозволи: <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Апликација је затражила приступ осетљивој дозволи, што може да угрози безбедност личних и финансијских података.<xliff:g id="ID_1"><br><br></xliff:g>Апликација можда неће радити исправно без ове ограничене дозволе. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Сазнајте како да дозволите приступ</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Апликацији није дозвољен приступ да постане подразумевана: <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-sv-v33/strings.xml b/PermissionController/res/values-sv-v33/strings.xml index e661efeb0..dd7c6a7df 100644 --- a/PermissionController/res/values-sv-v33/strings.xml +++ b/PermissionController/res/values-sv-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Fler varningar"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Ignorerade varningar"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Utöka för att visa en varning till}other{Utöka för att visa # varningar till}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Komprimera"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Varning. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Åtgärd slutförd"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Kontrollera inställningar som kan skydda enheten"</string> diff --git a/PermissionController/res/values-sv/strings.xml b/PermissionController/res/values-sv/strings.xml index 3d0f56de0..8f12c1ea3 100644 --- a/PermissionController/res/values-sv/strings.xml +++ b/PermissionController/res/values-sv/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Åtkomst till <xliff:g id="PERM">%1$s</xliff:g> för den här appen på <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Visa alla behörigheter för <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Visa alla appar med den här behörigheten"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Information"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Inställningar"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Visa mikrofonanvändning för assistenten"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Inställningar för appar som inte används"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Ta bort behörigheter om en app inte används"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Öppna länkar"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Standardinställning för jobbet"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Standard för privat utrymme"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Optimerade för enheten"</string> + <string name="default_app_others" msgid="7793029848126079876">"Andra"</string> <string name="default_app_none" msgid="9084592086808194457">"Ingen"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Systemstandard)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Inga appar"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill ladda upp felsökningsinformation."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Vill du dela felsökningsinformation?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Ett problem har upptäckts i systemet."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> begär tillstånd att ladda upp en felrapport som sparades <xliff:g id="DATE">%2$s</xliff:g> kl. <xliff:g id="TIME">%3$s</xliff:g> från den här enheten. Felrapporter innehåller personlig information om enheten eller information som loggats av appar, t.ex. användarnamn, platsdata, enhetsidentifierare och nätverksinformation. Dela bara felrapporter med personer och appar du litar på. Tillåter du att <xliff:g id="APP_NAME_1">%4$s</xliff:g> laddar upp en felrapport?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> begär tillstånd att ladda upp en felrapport som sparades <xliff:g id="DATE">%2$s</xliff:g> kl. <xliff:g id="TIME">%3$s</xliff:g> från den här enheten. Felrapporter innehåller personlig information om enheten eller information som loggats av appar, t.ex. användarnamn, platsdata, enhetsidentifierare och nätverksinformation. Dela bara felrapporter med personer och appar du litar på.\n\n Tillåter du att <xliff:g id="APP_NAME_1">%4$s</xliff:g> laddar upp en felrapport?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Ett fel uppstod när felrapporten för <xliff:g id="APP_NAME">%1$s</xliff:g> skulle behandlas. Därför har delning av utförlig felsökningsdata nekats. Ursäkta avbrottet."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Tillåt"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Neka"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Tillåt blockerade inställningar"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Begränsad inställning"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Av säkerhetsskäl är den här inställningen inte tillgänglig för närvarande."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Åtgärden är inte tillgänglig under pågående samtal"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Det går inte att tillåta att appar installerar andra appar under ett telefonsamtal.\n\n Bedragare vill ofta att man gör sådana här saker under telefonsamtalet, så vi möjligheten blockeras för att skydda dig. Om du blir tillsagd att göra detta av någon du inte känner kan det vara ett bedrägeri."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Det går inte att slutföra åtgärden under samtal"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Den här inställningen har blockerats för att skydda enheten och din data.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Bedragare kan försöka installera skadliga appar genom att be dig installera okända appar från en ny källa."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Bedragare kan försöka få kontroll över enheten genom att be dig att tillåta tillgänglighetsåtkomst för en app."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Appen nekades åtkomst till <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Appen begärde åtkomstbehörighet till känsliga uppgifter, vilket kan utsätta din personliga och finansiella information för risk.<xliff:g id="ID_1"><br><br></xliff:g>Appen kanske inte fungerar som den ska utan denna begränsade behörighet. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>&gtLäs mer om hur du tillåter åtkomst</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Appen nekades åtkomst till standardrollen för <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-sw-v33/strings.xml b/PermissionController/res/values-sw-v33/strings.xml index db02c110b..645c2a44f 100644 --- a/PermissionController/res/values-sw-v33/strings.xml +++ b/PermissionController/res/values-sw-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Arifa zaidi"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Arifa zilizoondolewa"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Panua na uangalie arifa moja zaidi}other{Panua na uangalie arifa # zaidi}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Kunja"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Tahadhari. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Kitendo kimekamilika"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Angalia mipangilio inayoweza kuongeza usalama wa kifaa chako"</string> diff --git a/PermissionController/res/values-sw/strings.xml b/PermissionController/res/values-sw/strings.xml index 290d56807..e307454c9 100644 --- a/PermissionController/res/values-sw/strings.xml +++ b/PermissionController/res/values-sw/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Ufikaiji wa <xliff:g id="PERM">%1$s</xliff:g> katika programu hii kwenye <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Angalia ruhusa zote za <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Angalia programu zote zenye ruhusa hii"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Maelezo"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Mipangilio"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Onyesha matumizi ya maikrofoni ya mratibu"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Mipangilio ya programu zisizotumika"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Ondoa ruhusa ikiwa programu haitumiki"</string> @@ -355,7 +357,7 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"Programu hizi zinaweza kuona skrini, vitendo na maudhui unayoweka, kutekeleza vitendo na kudhibiti onyesho."</string> <string name="role_assistant_label" msgid="4727586018198208128">"Programu msingi ya usaidizi wa kidijitali"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"Programu saidizi ya kidijitali"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"Programu za usaidizi zinaweza kukusaidia kulingana na maelezo kutoka skrini unayotazama. Baadhi ya programu zinaweza kutumia huduma za kifungua programu na kuweka data kwa kutamka ili kukupa usaidizi wa pamoja."</string> + <string name="role_assistant_description" msgid="6622458130459922952">"Programu za usaidizi zinaweza kukusaidia kulingana na maelezo kutoka kwenye skrini unayoangalia. Baadhi ya programu zinaweza kutumia huduma za kifungua programu na kuweka data kwa kutamka ili kukupa usaidizi jumuifu."</string> <string name="role_browser_label" msgid="2877796144554070207">"Programu kuu ya kivinjari"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"Programu ya kivinjari"</string> <string name="role_browser_description" msgid="3465253637499842671">"Programu zinazokupa uwezo wa kufikia intaneti na kuonyesha viungo unavyogusa"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Kufungua viungo"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Programu chaguomsingi kazini"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Programu chaguomsingi za sehemu ya faragha"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Zilizoboreshwa ili kufaa kifaa chako"</string> + <string name="default_app_others" msgid="7793029848126079876">"Nyingine"</string> <string name="default_app_none" msgid="9084592086808194457">"Hakuna"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Programu chaguomsingi ya mfumo)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Hakuna programu"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> inataka kupakia maelezo ya utatuzi."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Ungependa kushiriki data ya utatuzi?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Mfumo umetambua hitilafu."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> inaomba kupakia ripoti ya hitilafu kutoka kifaa hiki, iliyochakatwa tarehe <xliff:g id="DATE">%2$s</xliff:g> saa <xliff:g id="TIME">%3$s</xliff:g>. Ripoti za hitilafu hujumuisha taarifa binafsi kuhusu kifaa chako au iliyohifadhiwa na programu, kwa mfano, majina ya watumiaji, data ya mahali, vitambulisho vya vifaa na maelezo ya mtandao. Tuma tu ripoti za hitilafu kwa watu au programu unazoamini. Ungependa kuruhusu <xliff:g id="APP_NAME_1">%4$s</xliff:g> ipakie ripoti ya hitilafu?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> inaomba kupakia ripoti ya hitilafu kutoka kifaa hiki, iliyochakatwa tarehe <xliff:g id="DATE">%2$s</xliff:g> saa <xliff:g id="TIME">%3$s</xliff:g>. Ripoti za hitilafu zinajumuisha taarifa binafsi kuhusu kifaa chako au zilizohifadhiwa na programu, kwa mfano, majina ya watumiaji, data ya mahali, vitambulisho vya vifaa na maelezo ya mtandao. Tuma tu ripoti za hitilafu kwa watu na programu unazoamini kupokea taarifa hizi.\n\nUngependa kuruhusu <xliff:g id="APP_NAME_1">%4$s</xliff:g> ipakie ripoti ya hitilafu?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Hitilafu imetokea wakati wa kuchakata ripoti ya hitilafu ya <xliff:g id="APP_NAME">%1$s</xliff:g>. Kwa hivyo, kushiriki data ya maelezo ya kina ya utatuzi kumekataliwa. Samahani kwa usumbufu."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Ruhusu"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Kataa"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Ruhusu mipangilio yenye mipaka"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Mipangilio imezuiwa"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Ili kulinda usalama wako, mipangilio hii haipatikani kwa sasa."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Kitendo hiki hakipatikani unapopiga simu"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Programu haziruhusiwi kuweka programu nyingine kwenye kifaa wakati wa mazungumzo ya simu.\n\n Mara nyingi, walaghai hukuomba utekeleze vitendo vya aina hii wakati wa mazungumzo ya simu, kwa hivyo kimezuiwa ili kukulinda. Iwapo unaelekezwa utekeleze kitendo hiki na mtu usiyemjua, huenda ikawa ni ulaghai."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Huwezi kukamilisha kitendo hiki simu inapopigwa"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Mipangilio hii imezuiwa ili kulinda kifaa na data yako.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Walaghai wanaweza kujaribu kuweka programu hatari kwenye kifaa chako kwa kukuomba uweke programu zisizojulikana kutoka chanzo kigeni."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Walaghai wanaweza kujaribu kudhibiti kifaa chako kwa kukuomba uruhusu programu ifikie vipengele vya ufikivu."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Programu haijapewa idhini ya kufikia <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Programu imeomba kufikia ruhusa nyeti, hali ambayo inaweza kuhatarisha maelezo yako ya kifedha na ya binafsi.<xliff:g id="ID_1"><br><br></xliff:g>Kuna uwezekano kuwa programu haitafanya kazi vizuri bila ruhusa hii inayodhibitiwa. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Pata maelezo kuhusu jinsi ya kuruhusu ufikiaji</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Programu haijapewa idhini ya kuwa <xliff:g id="ROLE_NAME">%1$s</xliff:g> chaguomsingi"</string> diff --git a/PermissionController/res/values-ta-v33/strings.xml b/PermissionController/res/values-ta-v33/strings.xml index 41b6d0923..b528e9bf6 100644 --- a/PermissionController/res/values-ta-v33/strings.xml +++ b/PermissionController/res/values-ta-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"கூடுதல் விழிப்பூட்டல்கள்"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"நிராகரிக்கப்பட்ட விழிப்பூட்டல்கள்"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{விரிவாக்கி மேலும் ஒரு விழிப்பூட்டலைப் பாருங்கள்}other{விரிவாக்கி மேலும் # விழிப்பூட்டல்களைப் பாருங்கள்}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"சுருக்கு"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"விழிப்பூட்டும். <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"செயல் நிறைவடைந்தது"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"உங்கள் சாதனத்திற்குப் பாதுகாப்பைச் சேர்க்கக்கூடிய அமைப்புகளைப் பாருங்கள்"</string> diff --git a/PermissionController/res/values-ta/strings.xml b/PermissionController/res/values-ta/strings.xml index 8e1b71b97..e6e587b98 100644 --- a/PermissionController/res/values-ta/strings.xml +++ b/PermissionController/res/values-ta/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> சாதனத்தில் இந்த ஆப்ஸுக்கான <xliff:g id="PERM">%1$s</xliff:g> அணுகல்"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"அனைத்து <xliff:g id="APP">%1$s</xliff:g> அனுமதிகளையும் காட்டு"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"இந்த அனுமதியைக் கொண்டுள்ள அனைத்து ஆப்ஸையும் காட்டு"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"தகவல்கள்"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"அமைப்புகள்"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"அசிஸ்டண்ட் மைக்ரோஃபோன் உபயோகத்தைக் காட்டு"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"பயன்படுத்தப்படாத ஆப்ஸ் அமைப்புகள்"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"இந்த ஆப்ஸ் பயன்படுத்தப்படவில்லை என்றால் அனுமதிகளை அகற்றவும்"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"இணைப்புகளைத் திறத்தல்"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"பணிக்கான இயல்பு நிலை ஆப்ஸ்"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"ரகசிய இடத்திற்கான இயல்பு"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"சாதனத்திற்காக மேம்படுத்தப்பட்டவை"</string> + <string name="default_app_others" msgid="7793029848126079876">"மற்றவை"</string> <string name="default_app_none" msgid="9084592086808194457">"ஏதுமில்லை"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(சிஸ்டத்தின் இயல்புநிலை)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"ஆப்ஸ் இல்லை"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"பிழைதிருத்தத் தகவலை <xliff:g id="APP_NAME">%1$s</xliff:g> பதிவேற்ற விரும்புகிறது."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"பிழைதிருத்தத் தரவைப் பகிர வேண்டுமா?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"சிக்கல் இருப்பதை சிஸ்டம் கண்டறிந்துள்ளது."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"இந்தச் சாதனத்திலிருந்து <xliff:g id="DATE">%2$s</xliff:g> அன்று <xliff:g id="TIME">%3$s</xliff:g> மணிக்கு எடுக்கப்பட்ட பிழை அறிக்கையைப் பதிவேற்றுமாறு <xliff:g id="APP_NAME_0">%1$s</xliff:g> கோருகிறது. இதில் பயனர் பெயர்கள், இருப்பிடத் தரவு, சாதன அடையாளங்காட்டிகள் மற்றும் நெட்வொர்க் தகவல்கள் போன்ற உங்கள் சாதனம் அல்லது உள்நுழைந்துள்ள ஆப்ஸ் பற்றிய தனிப்பட்ட தகவல்களும் உள்ளடங்கும். இந்தத் தகவல்களுடனான பிழை அறிக்கைகளை நம்பகமானவர்களுடனும் ஆப்ஸுடனும் மட்டுமே பகிரவும். பிழை அறிக்கையைப் பதிவேற்ற <xliff:g id="APP_NAME_1">%4$s</xliff:g> ஆப்ஸை அனுமதிக்கவா?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"இந்தச் சாதனத்திலிருந்து <xliff:g id="DATE">%2$s</xliff:g> அன்று <xliff:g id="TIME">%3$s</xliff:g>க்கு எடுக்கப்பட்ட பிழை அறிக்கையைப் பதிவேற்றுமாறு <xliff:g id="APP_NAME_0">%1$s</xliff:g> கேட்கிறது. இதில் பயனர் பெயர்கள், இருப்பிடத் தரவு, சாதன அடையாளங்காட்டிகள் மற்றும் நெட்வொர்க் தகவல்கள் போன்ற உங்கள் சாதனம் அல்லது உள்நுழைந்துள்ள ஆப்ஸ் பற்றிய தனிப்பட்ட தகவல்களும் உள்ளடங்கும். இந்தத் தகவல்களுடனான பிழை அறிக்கைகளை நீங்கள் நம்பும் நபர்கள் மற்றும் ஆப்ஸுடன் மட்டுமே பகிரவும்.\n\nபிழை அறிக்கையைப் பதிவேற்ற <xliff:g id="APP_NAME_1">%4$s</xliff:g> ஆப்ஸை அனுமதிக்கவா?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> ஆப்ஸிற்கான பிழை அறிக்கையைச் செயல்படுத்துவதில் பிழை ஏற்பட்டுள்ளது. பிழைதிருத்தத்திற்கான தரவைப் பகிர்வது மறுக்கப்பட்டுள்ளது. தடங்கலுக்கு வருந்துகிறோம்."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"அனுமதி"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"நிராகரி"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"கட்டுப்படுத்தப்பட்ட அமைப்பை அனுமதி"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"கட்டுப்படுத்தப்பட்ட அமைப்பு"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"உங்கள் பாதுகாப்பிற்காக, இந்த அமைப்பு தற்போது இல்லை."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"மொபைல் அழைப்பின்போது இந்தச் செயலைச் செய்ய முடியாது"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"மொபைல் அழைப்பின்போது ஓர் ஆப்ஸ் பிற ஆப்ஸை நிறுவ அனுமதிப்பது அனுமதிக்கப்படாது.\n\n மொபைல் அழைப்பு உரையாடல்களின்போது, மோசடி செய்பவர்கள் அடிக்கடி இதுபோன்ற செயலைச் செய்யுமாறு கேட்கின்றனர், எனவே இவற்றிலிருந்து உங்களைப் பாதுகாக்கவே அனுமதி தடுக்கப்பட்டுள்ளது. உங்களுக்குத் தெரியாத ஒருவரால் இந்தச் செயலைச் செய்வதற்கு நீங்கள் வழிகாட்டப்பட்டால் அது மோசடியாக இருக்கலாம்."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"அழைப்பின்போது செயலை நிறைவுசெய்ய முடியாது"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"உங்கள் சாதனத்தையும் தரவையும் பாதுகாப்பதற்காக இந்த அமைப்பு தடுக்கப்பட்டுள்ளது.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>புதிய மூலத்தில் இருந்து அறியப்படாத ஆப்ஸை நிறுவுமாறு கேட்பதன் மூலம் மோசடி செய்பவர்கள் தீங்கு விளைவிக்கும் ஆப்ஸை நிறுவ முயலலாம்."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>ஆப்ஸுக்கான அணுகல்தன்மை அம்சங்களை அனுமதிக்குமாறு கேட்பதன் மூலம் மோசடி செய்பவர்கள் உங்கள் சாதனத்தைக் கட்டுப்படுத்த முயலலாம்."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>க்கான ஆப்ஸ் அணுகல் நிராகரிக்கப்பட்டது"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"பாதுகாக்க வேண்டிய தகவல்களுக்கான அனுமதியை வழங்க ஆப்ஸ் கேட்டுள்ளது, இது உங்கள் தனிப்பட்ட மற்றும் நிதித் தகவல்களை ஆபத்துக்குள்ளாக்கலாம்.<xliff:g id="ID_1"><br><br></xliff:g>இந்தக் கட்டுப்படுத்தப்பட்ட அனுமதி இல்லாமல் ஆப்ஸ் சரியாக வேலை செய்யாமல் போகக்கூடும். <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>எப்படி அணுகல் வழங்குவதென அறிக</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"இயல்புநிலை <xliff:g id="ROLE_NAME">%1$s</xliff:g>க்கான ஆப்ஸ் அணுகல் நிராகரிக்கப்பட்டது"</string> diff --git a/PermissionController/res/values-te-v33/strings.xml b/PermissionController/res/values-te-v33/strings.xml index 7245ac078..348553dd2 100644 --- a/PermissionController/res/values-te-v33/strings.xml +++ b/PermissionController/res/values-te-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"మరిన్ని అలర్ట్లు"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"విస్మరించబడిన అలర్ట్లు"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{విస్తరించి, మరొక అలర్ట్ను చూడండి}other{విస్తరించి, మరో # అలర్ట్లను చూడండి}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"కుదించండి"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"అలర్ట్. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"చర్య పూర్తయింది"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"మీ పరికరానికి రక్షణను జోడించగల సెట్టింగ్లను చెక్ చేయండి"</string> diff --git a/PermissionController/res/values-te/strings.xml b/PermissionController/res/values-te/strings.xml index e920ad698..0d07bf6c1 100644 --- a/PermissionController/res/values-te/strings.xml +++ b/PermissionController/res/values-te/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> పరికరంలో ఈ యాప్నకు <xliff:g id="PERM">%1$s</xliff:g> యాక్సెస్"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"అన్ని \'<xliff:g id="APP">%1$s</xliff:g>\' అనుమతులను చూడండి"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"ఈ అనుమతి ఉన్న అన్ని యాప్లను చూడండి"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"సమాచారం"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"సెట్టింగ్లు"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"అసిస్టెంట్ మైక్రోఫోన్ వినియోగాన్ని చూపు"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"ఉపయోగించని యాప్ సెట్టింగ్లు"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"యాప్ని ఉపయోగించకపోతే, అనుమతులను తీసివేయండి"</string> @@ -355,7 +357,7 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"ఈ యాప్లు మీ స్క్రీన్, చర్యలు, ఇన్పుట్లను చూడగలవు, చర్యలను అమలు చేయగలవు, అలాగే ప్రదర్శనను నియంత్రించగలవు."</string> <string name="role_assistant_label" msgid="4727586018198208128">"ఆటోమేటిక్ డిజిటల్ అసిస్టెంట్ యాప్"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"డిజిటల్ అసిస్టెంట్ యాప్"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"సహాయక యాప్లు మీరు వీక్షిస్తున్న స్క్రీన్పై ఉన్న సమాచారం ఆధారంగా మీకు సహాయపడగలవు. కొన్ని యాప్లు మీకు సమగ్రమైన సహాయాన్ని అందించడానికి లాంచర్కు, వాయిస్ ఇన్పుట్ సర్వీసులకు రెండింటికీ సపోర్ట్ చేస్తాయి."</string> + <string name="role_assistant_description" msgid="6622458130459922952">"మీ ముందున్న స్క్రీన్లోని సమాచారం ఆధారంగా సహాయక (అసిస్ట్) యాప్లు, మీకు హెల్ప్ చేయగలవు. కొన్ని యాప్లు, మీకు ఈజీగా సాయం చేయడానికి లాంచర్కు, వాయిస్ ఇన్పుట్ సర్వీసులకు రెండింటికీ సపోర్ట్ ఇస్తాయి."</string> <string name="role_browser_label" msgid="2877796144554070207">"ఆటోమేటిక్ బ్రౌజర్ యాప్"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"బ్రౌజర్ యాప్"</string> <string name="role_browser_description" msgid="3465253637499842671">"మీకు ఇంటర్నెట్కు యాక్సెస్ ఇచ్చి, ట్యాప్ చేయడానికి లింక్లను డిస్ప్లే చేసే యాప్లు"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"లింక్లను తెరవడం"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"వర్క్ ప్లేస్ కోసం ఆటోమేటిక్"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"ఆటోమేటిక్గా ప్రైవేట్ స్పేస్"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"పరికరం కోసం ఆప్టిమైజ్ చేసినవి"</string> + <string name="default_app_others" msgid="7793029848126079876">"ఇతర యాప్లు"</string> <string name="default_app_none" msgid="9084592086808194457">"ఏదీ కాదు"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(సిస్టమ్ ఆటోమేటిక్)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"ఏ యాప్ లేదు"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g>డీబగ్గింగ్ సమాచారాన్ని అప్లో డ్ చేయదలుచుకుంటున్నారు."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"డీబగ్గింగ్ డేటాను షేర్ చేయమంటారా?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"సిస్టమ్ ఒక సమస్యను గుర్తించింది."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> <xliff:g id="DATE">%2$s</xliff:g>న <xliff:g id="TIME">%3$s</xliff:g>కు ఈ డివైజ్లో జనరేట్ అయిన డీబగ్ రిపోర్ట్ను అప్లోడ్ చేయండి అని అభ్యర్థిస్తోంది. బగ్ రిపోర్ట్లు మీ డివైజ్ లేదా లాగిన్ చేసిన యాప్ల వ్యక్తిగత సమాచారం, ఉదాహరణకు యూజర్ పేర్లు, లొకేషన్ డేటా, డివైజ్ గుర్తింపులతో పాటు నెట్వర్క్ సమాచారాన్ని కలిగి ఉంటాయి. ఈ సమాచారం విషయంలో మీకు నమ్మకం ఉన్న వ్యక్తులకు, యాప్లకు మాత్రమే బగ్ రిపోర్ట్ వివరాలను షేర్ చేయండి. బగ్ రిపోర్ట్ను అప్లోడ్ చేయడానికి <xliff:g id="APP_NAME_1">%4$s</xliff:g>ను అనుమతించాలా?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g>, <xliff:g id="DATE">%2$s</xliff:g>న <xliff:g id="TIME">%3$s</xliff:g>కు ఈ పరికరంలో తీసిన డీబగ్ రిపోర్ట్ను అప్లోడ్ చేయమని రిక్వెస్ట్ చేస్తోంది. బగ్ రిపోర్ట్లలో మీ పరికరం లేదా లాగిన్ చేసిన యాప్లలోని వ్యక్తిగత సమాచారం ఉంటుంది, ఉదాహరణకు యూజర్ నేమ్లు, లొకేషన్ డేటా, పరికర ఐడెంటిఫయర్లు, ఇంకా నెట్వర్క్ సమాచారం వంటివి. మీకు ఈ సమాచారం విషయంలో నమ్మకమైన వ్యక్తులకు, యాప్లకు మాత్రమే బగ్ రిపోర్ట్ వివరాలను షేర్ చేయండి.\n\nబగ్ రిపోర్ట్ను అప్లోడ్ చేయడానికి <xliff:g id="APP_NAME_1">%4$s</xliff:g>ను అనుమతించాలా?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> కోసం బగ్ రిపోర్ట్ ప్రాసెస్ చేయడంలో ఎర్రర్ ఉంది. కాబట్టి వివరణాత్మక డీబగ్గింగ్ డేటాను షేర్ చేయడాన్ని నిరాకరించారు. అంతరాయానికి చింతిస్తున్నాము."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"అనుమతించండి"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"తిరస్కరించు"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"పరిమితం చేసిన సెట్టింగ్లను అనుమతించండి"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"పరిమితం చేయబడిన సెట్టింగ్"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"మీ సెక్యూరిటీ కోసం, ఈ సెట్టింగ్ ప్రస్తుతం అందుబాటులో లేదు."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"ఫోన్ కాల్లో ఉండగా ఈ చర్య అందుబాటులో ఉండదు"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"ఫోన్ కాల్ మాట్లాడే సమయంలో ఇతర యాప్లను ఇన్స్టాల్ చేయడానికి యాప్లను అనుమతించడానికి వీలు లేదు.\n\n ఫోన్ కాల్ సంభాషణల సమయంలో స్కామర్లు తరచుగా ఈ రకమైన చర్యను రిక్వెస్ట్ చేస్తారు, కాబట్టి మిమ్మల్ని రక్షించడానికి ఈ ఫీచర్ బ్లాక్ చేయబడుతుంది. మీకు తెలియని వారు ఈ చర్య తీసుకోవాల్సిందిగా మిమ్మల్ని గైడ్ చేస్తే, అది స్కామ్ కావచ్చు."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"కాల్ మాట్లాడే సమయంలో చర్యను పూర్తి చేయడం కుదరదు"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"మీ పరికరాన్ని, డేటాను సురక్షితంగా ఉంచేందుకు ఈ సెట్టింగ్ బ్లాక్ చేయబడింది.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>స్కామర్లు మిమ్మల్ని కొత్త సోర్స్ నుండి తెలియని యాప్లను ఇన్స్టాల్ చేయమని అడగడం ద్వారా హానికరమైన యాప్లను ఇన్స్టాల్ చేయడానికి ట్రై చేయవచ్చు."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>స్కామర్లు మిమ్నల్ని యాప్ కోసం యాక్సెసిబిలిటీ యాక్సెస్ను అనుమతించమని అడగడం ద్వారా మీ పరికరాన్ని కంట్రోల్ చేసే అవకాశం ఉంది."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"యాప్ <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>కు యాక్సెస్ తిరస్కరించబడింది"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"మీ వ్యక్తిగత, ఆర్థిక సమాచారాన్ని ప్రమాదంలో పడేసే గోప్యమైన సమాచార యాక్సెస్ అనుమతికి యాప్ యాక్సెస్ను రిక్వెస్ట్ చేయడం జరిగింది.<xliff:g id="ID_1"><br><br></xliff:g>ఈ అదనపు అవసరాలు గల అనుమతి లేకుండా యాప్ సరిగ్గా పని చేయకపోయే అవకాశం ఉంది. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>యాక్సెస్ను అనుమతించడం ఎలాగో తెలుసుకోండి</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"ఆటోమేటిక్ <xliff:g id="ROLE_NAME">%1$s</xliff:g>గా ఉండటానికి యాప్నకు యాక్సెస్ నిరాకరించబడింది"</string> diff --git a/PermissionController/res/values-th-v33/strings.xml b/PermissionController/res/values-th-v33/strings.xml index 1270c9c1c..1f558970c 100644 --- a/PermissionController/res/values-th-v33/strings.xml +++ b/PermissionController/res/values-th-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"การแจ้งเตือนเพิ่มเติม"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"การแจ้งเตือนที่ปิดไป"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{ขยายและดูการแจ้งเตือนอีก 1 รายการ}other{ขยายและดูการแจ้งเตือนอีก # รายการ}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"ยุบ"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"การแจ้งเตือน <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"การดำเนินการเสร็จสมบูรณ์"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"ตรวจสอบการตั้งค่าที่เพิ่มการปกป้องให้กับอุปกรณ์ได้"</string> diff --git a/PermissionController/res/values-th/strings.xml b/PermissionController/res/values-th/strings.xml index 45b34108b..1103e6927 100644 --- a/PermissionController/res/values-th/strings.xml +++ b/PermissionController/res/values-th/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"สิทธิ์เข้าถึง<xliff:g id="PERM">%1$s</xliff:g>สำหรับแอปนี้บน <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"ดูสิทธิ์ทั้งหมดของ \"<xliff:g id="APP">%1$s</xliff:g>\""</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"ดูแอปทั้งหมดที่มีสิทธิ์นี้"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"ข้อมูล"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"การตั้งค่า"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"แสดงการใช้ไมโครโฟนของ Assistant"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"การตั้งค่าแอปที่ไม่ได้ใช้"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"นำสิทธิ์ออกหากไม่ได้ใช้งานแอป"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"การเปิดลิงก์"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"ค่าเริ่มต้นสำหรับงาน"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"ค่าเริ่มต้นสำหรับพื้นที่ส่วนตัว"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"ได้รับการเพิ่มประสิทธิภาพสำหรับอุปกรณ์"</string> + <string name="default_app_others" msgid="7793029848126079876">"อื่นๆ"</string> <string name="default_app_none" msgid="9084592086808194457">"ไม่มี"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(ค่าเริ่มต้นของระบบ)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"ไม่มีแอป"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการอัปโหลดข้อมูลการแก้ไขข้อบกพร่อง"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"แชร์ข้อมูลการแก้ไขข้อบกพร่องไหม"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"ระบบตรวจพบปัญหา"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> กำลังขออัปโหลดรายงานข้อบกพร่องจากอุปกรณ์นี้ซึ่งบันทึกไว้เมื่อวันที่ <xliff:g id="DATE">%2$s</xliff:g> เวลา <xliff:g id="TIME">%3$s</xliff:g> รายงานข้อบกพร่องมีข้อมูลส่วนบุคคลเกี่ยวกับอุปกรณ์ของคุณหรือที่แอปต่างๆ บันทึกไว้ เช่น ชื่อผู้ใช้ ข้อมูลตำแหน่ง ตัวระบุอุปกรณ์ และข้อมูลเครือข่าย โปรดแชร์รายงานข้อบกพร่องกับบุคคลและแอปที่คุณไว้วางใจให้เห็นข้อมูลนี้เท่านั้น อนุญาตให้ <xliff:g id="APP_NAME_1">%4$s</xliff:g> อัปโหลดรายงานข้อบกพร่องไหม"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> กำลังขออัปโหลดรายงานข้อบกพร่องจากอุปกรณ์นี้ซึ่งบันทึกไว้เมื่อวันที่ <xliff:g id="DATE">%2$s</xliff:g> เวลา <xliff:g id="TIME">%3$s</xliff:g> รายงานข้อบกพร่องมีข้อมูลส่วนบุคคลเกี่ยวกับอุปกรณ์ของคุณหรือที่แอปต่างๆ บันทึกไว้ เช่น ชื่อผู้ใช้ ข้อมูลตำแหน่ง ตัวระบุอุปกรณ์ และข้อมูลเครือข่าย โปรดแชร์รายงานข้อบกพร่องกับบุคคลและแอปที่คุณไว้วางใจให้เห็นข้อมูลนี้เท่านั้น\n\nอนุญาตให้ <xliff:g id="APP_NAME_1">%4$s</xliff:g> อัปโหลดรายงานข้อบกพร่องไหม"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"เกิดข้อผิดพลาดในการประมวลผลรายงานข้อบกพร่องของ <xliff:g id="APP_NAME">%1$s</xliff:g> การแชร์ข้อมูลการแก้ไขข้อบกพร่องอย่างละเอียดจึงถูกปฏิเสธ ขออภัยสำหรับความขัดข้อง"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"อนุญาต"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"ปฏิเสธ"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"อนุญาตการตั้งค่าที่จำกัด"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"การตั้งค่าที่จำกัด"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"การตั้งค่านี้ใช้ไม่ได้ในตอนนี้เพื่อความปลอดภัยของคุณ"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"การดำเนินการไม่พร้อมใช้งานขณะกำลังโทรศัพท์"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"ไม่อนุญาตให้แอปติดตั้งแอปอื่นๆ ระหว่างการโทร\n\n สแกมเมอร์มักขอการดำเนินการประเภทนี้ระหว่างการโทร ดังนั้นระบบจึงบล็อกไว้เพื่อปกป้องคุณ หากมีคนที่คุณไม่รู้จักบอกให้คุณดำเนินการดังกล่าว นั่นอาจเป็นการหลอกลวง"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"ดำเนินการให้เสร็จสิ้นระหว่างการโทรไม่ได้"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"การตั้งค่านี้ถูกบล็อกเพื่อปกป้องอุปกรณ์และข้อมูลของคุณ<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>สแกมเมอร์อาจพยายามติดตั้งแอปที่เป็นอันตรายโดยขอให้คุณติดตั้งแอปที่ไม่รู้จักจากแหล่งที่มาใหม่"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>สแกมเมอร์อาจพยายามควบคุมอุปกรณ์ของคุณโดยขอให้คุณอนุญาตสิทธ์เข้าถึงการช่วยเหลือพิเศษแก่แอป"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"แอปถูกปฏิเสธไม่ให้เข้าถึง <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"แอปขอเข้าถึงสิทธิ์ที่มีความละเอียดอ่อนซึ่งอาจทำให้ข้อมูลส่วนบุคคลและข้อมูลทางการเงินของคุณมีความเสี่ยง<xliff:g id="ID_1"><br><br></xliff:g>แอปอาจทำงานได้ไม่ถูกต้องหากไม่มีสิทธิ์ที่จำกัดนี้ <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>ดูวิธีอนุญาตให้เข้าถึง</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"แอปถูกปฏิเสธไม่ให้เข้าถึงเพื่อเป็น<xliff:g id="ROLE_NAME">%1$s</xliff:g> เริ่มต้น"</string> diff --git a/PermissionController/res/values-tl-v33/strings.xml b/PermissionController/res/values-tl-v33/strings.xml index 0c23a30f7..ad410e830 100644 --- a/PermissionController/res/values-tl-v33/strings.xml +++ b/PermissionController/res/values-tl-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Higit pang alerto"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Mga na-dismiss na alerto"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{I-expand at makakita ng isa pang alerto}one{I-expand at makakita ng # pang alerto}other{I-expand at makakita ng # pang alerto}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"I-collapse"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Alerto. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Tapos na ang pagkilos"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Tingnan ang mga setting na makakapagdagdag ng proteksyon sa iyong device"</string> diff --git a/PermissionController/res/values-tl/strings.xml b/PermissionController/res/values-tl/strings.xml index 70bcec228..604c9cf52 100644 --- a/PermissionController/res/values-tl/strings.xml +++ b/PermissionController/res/values-tl/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"access sa <xliff:g id="PERM">%1$s</xliff:g> para sa app na ito sa <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Tingnan ang lahat ng pahintulot ng <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Tingnan ang lahat ng app na may ganitong pahintulot"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Impormasyon"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Mga Setting"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Ipakita ang paggamit ng mikropono ng assistant"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Mga setting ng hindi ginagamit na app"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Alisin ang mga pahintulot kung hindi ginagamit ang app"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Pagbubukas ng mga link"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Default para sa trabaho"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Default para sa pribadong space"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Na-optimize para sa device"</string> + <string name="default_app_others" msgid="7793029848126079876">"Iba pa"</string> <string name="default_app_none" msgid="9084592086808194457">"Wala"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Default ng system)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Walang app"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"Gustong mag-upload ng <xliff:g id="APP_NAME">%1$s</xliff:g> ng impormasyon sa pag-debug."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Ibahagi ang data sa pag-debug?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"May natukoy na problema ang system."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"Hinihiling ng <xliff:g id="APP_NAME_0">%1$s</xliff:g> na mag-upload ng ulat ng bug mula sa device na ito na kinuha noong <xliff:g id="DATE">%2$s</xliff:g> sa ganap na <xliff:g id="TIME">%3$s</xliff:g>. Kabilang sa mga ulat ng bug ang personal na impormasyon tungkol sa iyong device o naka-log ayon sa mga app, halimbawa, mga user name, data ng lokasyon, pagkakakilanlan ng device, at impormasyon ng network. Magbahagi lang ng mga ulat ng bug sa mga tao at app na pinagkakatiwalaan mo ng impormasyong ito. Payagan ang <xliff:g id="APP_NAME_1">%4$s</xliff:g> na mag-upload ng ulat ng bug?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"Hinihiling ng <xliff:g id="APP_NAME_0">%1$s</xliff:g> na mag-upload ng ulat ng bug mula sa device na ito na kinuha noong <xliff:g id="DATE">%2$s</xliff:g> sa ganap na <xliff:g id="TIME">%3$s</xliff:g>. Kasama sa mga ulat ng bug ang personal na impormasyon tungkol sa iyong device o naka-log ayon sa mga app, halimbawa, mga user name, data ng lokasyon, identifier ng device, at impormasyon ng network. Magbahagi lang ng mga ulat ng bug sa mga tao at app na pinagkakatiwalaan mo ng impormasyong ito.\n\nPayagan ang <xliff:g id="APP_NAME_1">%4$s</xliff:g> na mag-upload ng ulat ng bug?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Nagka-error sa pagproseso ng ulat ng bug para sa <xliff:g id="APP_NAME">%1$s</xliff:g>. Kaya naman tinanggihan ang pagbabahagi ng detalyadong data ng pag-debug. Paumanhin sa pagkaantala."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Payagan"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Tanggihan"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Payagan ang mga pinaghihigpitang setting"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Pinaghihigpitang setting"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Para sa iyong seguridad, hindi available ang setting na ito sa ngayon."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Hindi available ang pagkilos habang may tumatawag"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Hindi pinapayagan ang pagpayag sa pag-install ng mga app ng iba pang app habang may tawag sa telepono.\n\n Madalas na humihiling ng ganitong uri ng pagkilos ang mga scammer habang tumatawag sa telepono, kaya na-block ito para protektahan ka. Kung ginagabayan kang gawin ang pagkilos na ito ng taong hindi mo kilala, posibleng scam ito."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Hindi magawa ang aksyon habang tumatawag"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Naka-block ang setting na ito para protektahan ang iyong device at data.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Posibleng subukan ng mga scammer na mag-install ng mga nakakapinsalang app sa pamamagitan ng paghiling sa iyong mag-install ng mga hindi kilalang app mula sa isang bagong source."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Posibleng subukan ng mga scammer na kontrolin ang iyong device sa pamamagitan ng paghiling sa iyong payagan ang access sa accessibility para sa isang app."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Tinanggihan ang access ng appp sa <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Humiling ang app ng access sa pahintulot sa sensitibong impormasyon na posibleng maglagay ng iyong personal at pinansyal na impormasyon sa panganib.<xliff:g id="ID_1"><br><br></xliff:g>Posibleng hindi gumana nang maayos ang app kung wala ang pinaghihigpitang pahintulot na ito. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Alamin kung paano payagan ang pag-access</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Tinanggihan ang access ng app na maging default na <xliff:g id="ROLE_NAME">%1$s</xliff:g>"</string> diff --git a/PermissionController/res/values-tr-v33/strings.xml b/PermissionController/res/values-tr-v33/strings.xml index d6d2e4286..f3b0f08e5 100644 --- a/PermissionController/res/values-tr-v33/strings.xml +++ b/PermissionController/res/values-tr-v33/strings.xml @@ -30,9 +30,10 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Diğer uyarılar"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Reddedilen uyarılar"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Genişletip bir uyarıyı daha görün}other{Genişletip # uyarıyı daha görün}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Daralt"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Uyarı. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"İşlem tamamlandı"</string> - <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Cihazınızın korumasını artırabilecek ayarlara göz atın"</string> + <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Cihazınızın korunma düzeyini artırabilecek ayarlara göz atın"</string> <string name="safety_center_qs_page_landing" msgid="1717368301679228128">"Güvenlik ve gizlilikle ilgili hızlı ayarlar"</string> <string name="safety_center_qs_close_button" msgid="1352313308176244599">"Kapat"</string> <string name="safety_center_qs_expand_action" msgid="2193190557696484169">"Seçenekleri genişletip göster"</string> diff --git a/PermissionController/res/values-tr/strings.xml b/PermissionController/res/values-tr/strings.xml index 6b288f412..ccf075649 100644 --- a/PermissionController/res/values-tr/strings.xml +++ b/PermissionController/res/values-tr/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> adlı cihazda bu uygulamanın <xliff:g id="PERM">%1$s</xliff:g> erişimi"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Tüm <xliff:g id="APP">%1$s</xliff:g> izinlerini göster"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Bu izne sahip tüm uygulamaları göster"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Bilgi"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Ayarlar"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Yardımcı mikrofon kullanımını göster"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Kullanılmayan uygulama ayarları"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Uygulama kullanılmıyorsa izinleri kaldır"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Bağlantıları açma"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"İş için varsayılan"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Özel alan için varsayılan"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Cihaz için optimize edilenler"</string> + <string name="default_app_others" msgid="7793029848126079876">"Diğer"</string> <string name="default_app_none" msgid="9084592086808194457">"Yok"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Sistem varsayılanı)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Uygulama yok"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g>, hata ayıklama bilgilerini yüklemek istiyor."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Hata ayıklama verileri paylaşılsın mı?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Sistem bir sorun algıladı."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g>, bu cihazda <xliff:g id="DATE">%2$s</xliff:g> saat <xliff:g id="TIME">%3$s</xliff:g> itibarıyla kaydedilen hata raporunu yüklemek istiyor. Hata raporları cihazınızla ilgili veya uygulamalar tarafından günlüğe kaydedilmiş kişisel bilgiler (örneğin kullanıcı adları, konum verisi, cihaz tanımlayıcılar ve ağ bilgileri) içerir. Hata raporlarını yalnızca bu bilgileri verme konusunda güvendiğiniz kişi ve uygulamalarla paylaşın. <xliff:g id="APP_NAME_1">%4$s</xliff:g> uygulamasının hata raporu yüklemesine izin verilsin mi?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g>, bu cihazda <xliff:g id="DATE">%2$s</xliff:g> saat <xliff:g id="TIME">%3$s</xliff:g> itibarıyla kaydedilen hata raporunu yüklemek istiyor. Hata raporları cihazınızla ilgili veya uygulamalar tarafından günlüğe kaydedilmiş kişisel bilgiler (örneğin kullanıcı adları, konum verisi, cihaz tanımlayıcılar ve ağ bilgileri) içerir. Hata raporlarını yalnızca bu bilgileri verme konusunda güvendiğiniz kişi ve uygulamalarla paylaşın. \n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g> uygulamasının hata raporu yüklemesine izin verilsin mi?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> hata raporunu işlemeyle ilgili sorun oluştu. Ayrıntılı hata ayıklama verilerinin paylaşılması reddedildi. Kesinti için üzgünüz."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"İzin ver"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Reddet"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Kısıtlanmış ayarlara izin verme"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Kısıtlanmış ayar"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Güvenliğiniz için bu ayar şu anda kullanılamıyor."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"İşlem, telefon görüşmesi sırasında yapılamaz"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Telefon görüşmesi sırasında uygulamaların başka uygulama yüklemesine izin verilmez.\n\n Dolandırıcıların genellikle telefon görüşmesi sırasında talep ettiği bu tür işlemler sizi korumak için engellenir. Tanımadığınız biri tarafından bu işlemi yapmanız isteniyorsa dolandırılıyor olabilirsiniz."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"İşlem, arama sırasında tamamlanamaz"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Bu ayar, cihazınızı ve verilerinizi korumak için engellenmiştir.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Dolandırıcılar, yeni bir kaynaktan bilinmeyen uygulamaları yüklemenizi isteyerek zararlı uygulamalar yüklemeye çalışabilir."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Dolandırıcılar, bir uygulama için erişilebilirlik erişimine izin vermenizi isteyerek cihazınızın kontrolünü ele geçirmeye çalışabilir."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Uygulamanın <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> iznine erişimi reddedildi"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Uygulama, kişisel ve finansal bilgilerinizi riske atabilecek hassas bir izne erişim istedi.<xliff:g id="ID_1"><br><br></xliff:g>Bu kısıtlı izin olmadan uygulama düzgün çalışmayabilir. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Erişime nasıl izin vereceğinizi öğrenin</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Uygulamanın varsayılan <xliff:g id="ROLE_NAME">%1$s</xliff:g> olarak kullanılma erişimi reddedildi"</string> diff --git a/PermissionController/res/values-uk-v33/strings.xml b/PermissionController/res/values-uk-v33/strings.xml index 0066766f5..24571a6d7 100644 --- a/PermissionController/res/values-uk-v33/strings.xml +++ b/PermissionController/res/values-uk-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Більше сповіщень"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Закриті сповіщення"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Розгорніть і перегляньте ще одне сповіщення}one{Розгорніть і перегляньте ще # сповіщення}few{Розгорніть і перегляньте ще # сповіщення}many{Розгорніть і перегляньте ще # сповіщень}other{Розгорніть і перегляньте ще # сповіщення}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Згорнути"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Сповіщення. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Дію виконано"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Перевірте налаштування, які можуть посилити захист вашого пристрою"</string> diff --git a/PermissionController/res/values-uk/strings.xml b/PermissionController/res/values-uk/strings.xml index c69790fcf..65feb5d2f 100644 --- a/PermissionController/res/values-uk/strings.xml +++ b/PermissionController/res/values-uk/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="PERM">%1$s</xliff:g>: доступ для цього додатка (<xliff:g id="DEVICE_NAME">%2$s</xliff:g>)"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Переглянути всі дозволи додатка <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Переглянути всі додатки з цим дозволом"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Інформація"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Налаштування"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Показати статус мікрофона Асистента"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Налаштування невикористовуваних додатків"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Відкликати дозволи, якщо додаток не використовується"</string> @@ -279,7 +281,7 @@ <string name="post_drive_permission_decision_reminder_summary_1_app_2_permissions" msgid="671791184670801301">"Під час руху ви надали додатку <xliff:g id="APP">%1$s</xliff:g> дозвіл на доступ до таких об’єктів: <xliff:g id="PERMISSION_1">%2$s</xliff:g> і <xliff:g id="PERMISSION_2">%3$s</xliff:g>"</string> <string name="post_drive_permission_decision_reminder_summary_1_app_multi_permission" msgid="4080701771111456927">"Під час руху ви надали додатку <xliff:g id="APP">%2$s</xliff:g> стільки дозволів: <xliff:g id="COUNT">%1$d</xliff:g>"</string> <string name="post_drive_permission_decision_reminder_summary_multi_apps" msgid="5253882771252863902">"{count,plural, =1{Під час руху ви надали дозвіл на доступ додатку <xliff:g id="APP_0">%1$s</xliff:g> і ще одному додатку}one{Під час руху ви надали дозвіл на доступ додатку <xliff:g id="APP_1">%1$s</xliff:g> і ще # додатку}few{Під час руху ви надали дозвіл на доступ додатку <xliff:g id="APP_1">%1$s</xliff:g> і ще # додаткам}many{Під час руху ви надали дозвіл на доступ додатку <xliff:g id="APP_1">%1$s</xliff:g> і ще # додаткам}other{Під час руху ви надали дозвіл на доступ додатку <xliff:g id="APP_1">%1$s</xliff:g> і ще # додатка}}"</string> - <string name="go_to_settings" msgid="1053735612211228335">"Перейти до налаштувань"</string> + <string name="go_to_settings" msgid="1053735612211228335">"Відкрити налаштування"</string> <string name="auto_revoke_setting_subtitle" msgid="8631720570723050460">"Деякі додатки не використовувалися кілька місяців"</string> <string name="permissions_removed_category_title" msgid="1064754271178447643">"Скасовані дозволи"</string> <string name="permission_removed_page_title" msgid="2627436155091001209">"Дозволи скасовано"</string> @@ -355,7 +357,7 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"Ці додатки можуть бачити ваші екран, дії та введені дані, а також виконувати дії й контролювати дисплей."</string> <string name="role_assistant_label" msgid="4727586018198208128">"Цифровий помічник за умовчанням"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"Цифровий помічник"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"Помічники надають допомогу на основі вмісту, який ви переглядаєте на екрані. Задля ефективності деякі додатки підтримують панель запуску й голосовий ввід."</string> + <string name="role_assistant_description" msgid="6622458130459922952">"Додатки-помічники можуть допомагати, використовуючи інформацію на екрані. Для зручності деякі з них підтримують панель запуску й голосовий ввід."</string> <string name="role_browser_label" msgid="2877796144554070207">"Вебпереглядач за умовчанням"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"Вебпереглядач"</string> <string name="role_browser_description" msgid="3465253637499842671">"Додатки, за допомогою яких можна переглядати сайти й переходити за посиланнями"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Відкривання посилань"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Для роботи за умовчанням"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"За умовчанням для приватного простору"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Оптимізовано для пристрою"</string> + <string name="default_app_others" msgid="7793029848126079876">"Інші"</string> <string name="default_app_none" msgid="9084592086808194457">"Немає"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(За умовчанням)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Немає додатків"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"Додаток <xliff:g id="APP_NAME">%1$s</xliff:g> хоче завантажити інформацію про налагодження."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Поділитися даними про налагодження?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Система виявила проблему."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"Додаток <xliff:g id="APP_NAME_0">%1$s</xliff:g> запитує, чи можна завантажити повідомлення про помилку, створене на цьому пристрої <xliff:g id="DATE">%2$s</xliff:g> о <xliff:g id="TIME">%3$s</xliff:g>. Повідомлення про помилки містять особисту інформацію про ваш пристрій або відомості, записані додатками, як-от імена користувачів, місцеположення, ідентифікатори пристроїв та інформацію про мережу. Діліться повідомленнями про помилки лише з тими людьми й додатками, яким довіряєте. Дозволити додатку <xliff:g id="APP_NAME_1">%4$s</xliff:g> завантажити повідомлення про помилку?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"Додаток <xliff:g id="APP_NAME_0">%1$s</xliff:g> запитує, чи можна завантажити звіт про помилку, створений на цьому пристрої <xliff:g id="DATE">%2$s</xliff:g> о <xliff:g id="TIME">%3$s</xliff:g>. Звіти про помилки містять особисту інформацію про ваш пристрій або відомості, записані додатками, наприклад імена користувачів, місцеположення, ідентифікатори пристроїв і інформацію про мережу. Діліться звітами про помилки лише з тими користувачами й додатками, яким довіряєте.\n\nДозволити додатку <xliff:g id="APP_NAME_1">%4$s</xliff:g> завантажити звіт про помилку?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Не вдалося обробити повідомлення про помилку в додатку <xliff:g id="APP_NAME">%1$s</xliff:g>. Дані про налагодження не надіслано. Вибачте за незручності."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Дозволити"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Заборонити"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Дозволити налаштування з обмеженнями"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Налаштування з обмеженнями"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"З міркувань безпеки це налаштування наразі недоступне."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Дія недоступна під час телефонного виклику"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Під час телефонного виклику не можна надавати додаткам дозвіл на встановлення інших додатків.\n\n Шахраї часто просять виконати такі дії під час телефонних розмов, тому цю можливість заблоковано задля вашого захисту. Якщо незнайома особа просить вас виконати таку дію, це може бути шахрайством."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Неможливо виконати дію під час виклику"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Це налаштування заблоковано, щоб захистити ваш пристрій і дані.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Шахраї можуть намагатися встановити шкідливі додатки, надсилаючи вам запити на встановлення невідомих додатків із нового джерела."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Шахраї можуть намагатися захопити контроль над вашим пристроєм, попросивши дозволити певному додатку використовувати функції доступності."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Додатку не надано дозвіл \"<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>\""</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Додаток запитав дозвіл на доступ до чутливих даних, що може поставити під загрозу вашу особисту й фінансову інформацію.<xliff:g id="ID_1"><br><br></xliff:g>Без цього обмеженого дозволу додаток може не працювати належним чином. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Як надати доступ</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Додатку не надано доступ до ролі \"<xliff:g id="ROLE_NAME">%1$s</xliff:g>\" за умовчанням"</string> diff --git a/PermissionController/res/values-ur-v33/strings.xml b/PermissionController/res/values-ur-v33/strings.xml index 0a56dd190..4d89c92b3 100644 --- a/PermissionController/res/values-ur-v33/strings.xml +++ b/PermissionController/res/values-ur-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"مزید الرٹس"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"برخاست کردہ الرٹس"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{پھیلائیں اور ایک اور الرٹ دیکھیں}other{پھیلائیں اور # مزید الرٹس دیکھیں}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"سکیڑیں"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"الرٹ۔ <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"کارروائی مکمل ہو گئی"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"اپنے آلہ کو تحفظ دینے والی ترتیبات چیک کریں"</string> diff --git a/PermissionController/res/values-ur/strings.xml b/PermissionController/res/values-ur/strings.xml index cc9182c1e..9f1792afc 100644 --- a/PermissionController/res/values-ur/strings.xml +++ b/PermissionController/res/values-ur/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g> پر اس ایپ تک رسائی حاصل کریں<xliff:g id="PERM">%1$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"<xliff:g id="APP">%1$s</xliff:g> کی سبھی اجازتیں دیکھیں"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"اس اجازت والی سبھی ایپس دیکھیں"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"معلومات"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"ترتیبات"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"اسسٹنٹ مائیکروفون کا استعمال دکھائیں"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"غیر استعمال شدہ ایپ کی ترتیبات"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"ایپ کے استعمال نہ ہونے پر اجازتیں ہٹائیں"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"شروعاتی لنکس"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"کام کیلئے ڈیفالٹ"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"پرائیویٹ اسپیس کے لیے ڈیفالٹ"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"آلہ کیلئے بہتر بنایا گیا"</string> + <string name="default_app_others" msgid="7793029848126079876">"دیگر"</string> <string name="default_app_none" msgid="9084592086808194457">"کوئی نہیں"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(سسٹم ڈیفالٹ)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"کوئی ایپس نہیں ہیں"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> ڈیبگنگ کی معلومات اپ لوڈ کرنا چاہتی ہے۔"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"ڈیبگنگ ڈیٹا کا اشتراک کریں؟"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"سسٹم نے ایک مسئلے کا پتا لگایا ہے۔"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> <xliff:g id="DATE">%2$s</xliff:g> کو <xliff:g id="TIME">%3$s</xliff:g> پر اس آلہ سے لی گئی بگ رپورٹ اپ لوڈ کرنے کی درخواست کر رہی ہے۔ بگ رپورٹس میں آپ کے آلہ کے بارے میں یا ایپس کے ذریعے لاگ کی گئی ذاتی معلومات، جیسے کہ صارف کے نام، مقام کا ڈیٹا، آلہ کے شناخت کاران اور نیٹ ورک کی معلومات شامل ہوتی ہیں۔ صرف ان ہی لوگوں اور ایپس کے ساتھ بگ رپورٹس کا اشتراک کریں جن پر آپ کو اس معلومات کے تعلق سے بھروسہ ہے۔ <xliff:g id="APP_NAME_1">%4$s</xliff:g> کو بگ رپورٹ اپ لوڈ کرنے کی اجازت دیں؟"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> <xliff:g id="DATE">%2$s</xliff:g> کو <xliff:g id="TIME">%3$s</xliff:g> پر اس آلہ سے لی گئی بگ رپورٹ اپ لوڈ کرنے کی درخواست کر رہی ہے۔ بگ رپورٹس میں آپ کے آلہ کے بارے میں ذاتی معلومات یا ایپس کے ذریعے لاگ کی گئی معلومات، جیسے کہ صارف کے نام، مقام کا ڈیٹا، آلہ کے شناخت کاران اور نیٹ ورک کی معلومات شامل ہوتی ہیں۔ صرف ان ہی لوگوں اور ایپس کے ساتھ بگ رپورٹس کا اشتراک کریں جن پر آپ کو اس معلومات کے تعلق سے بھروسہ ہے۔\n\n <xliff:g id="APP_NAME_1">%4$s</xliff:g> کو بگ رپورٹ اپ لوڈ کرنے کی اجازت دیں؟"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> کیلئے بگ رپورٹ پر کارروائی کرنے میں ایک خرابی تھی۔ اس لئے ڈیبگنگ کے مفصل ڈیٹا کے اشتراک کی اجازت نہیں دی گئی۔ رکاوٹ کیلئے معذرت۔"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"اجازت دیں"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"مسترد کریں"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"پابندی والی ترتیبات کی اجازت دیں"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"محدود ترتیب"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"آپ کی سیکیورٹی کیلئے، یہ ترتیب فی الحال دستیاب نہیں ہے۔"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"فون کال کے دوران کارروائی دستیاب نہیں ہے"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"فون کال کے دوران ایپس کو دوسری ایپس انسٹال کرنے کی اجازت دینا ممنوع ہے۔\n\n دھوکے باز اکثر فون کال گفتگوؤں کے دوران اس قسم کی کارروائی کی درخواست کرتے ہیں، اس لیے اسے آپ کی حفاظت کے لیے مسدود کر دیا جاتا ہے۔ اگر آپ کو کسی ایسے شخص کے ذریعے سے یہ کارروائی کرنے کے لیے رہنمائی کی جا رہی ہے جس کو آپ نہیں جانتے ہیں تو یہ ایک فریب کاری ہو سکتی ہے۔"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"کال کے دوران کارروائی مکمل نہیں کر سکتے"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"اس ترتیب کو آپ کے آلے اور ڈیٹا کی حفاظت کے لیے بلاک کر دیا گیا ہے۔<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>دھوکے باز آپ سے کسی نئے ذریعہ سے نامعلوم ایپس انسٹال کرنے کے لیے کہہ کر نقصان دہ ایپس انسٹال کرنے کی کوشش کر سکتے ہیں۔"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>دھوکے باز آپ سے کسی ایپ کے لیے ایکسیسبیلٹی رسائی کی اجازت دینے کے لیے کہہ کر آپ کے آلے کا کنٹرول حاصل کرنے کی کوشش کر سکتے ہیں۔"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"<xliff:g id="PERMISSION_NAME">%1$s</xliff:g> تک ایپ کی رسائی کو مسترد کر دیا گیا"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"ایپ نے ایک حساس اجازت تک رسائی کی درخواست کی ہے جو آپ کی ذاتی اور مالی معلومات کو خطرے میں ڈال سکتی ہے۔<xliff:g id="ID_1"><br><br></xliff:g>یہ ممکن ہے کہ اس محدود اجازت کے بغیر ایپ ٹھیک سے کام نہ کرے۔ <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>رسائی کی اجازت دینے کا طریقہ جانیں</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"ڈیفالٹ <xliff:g id="ROLE_NAME">%1$s</xliff:g> ہونے کے لیے ایپ کی رسائی کو مسترد کر دیا گیا"</string> diff --git a/PermissionController/res/values-uz-v33/strings.xml b/PermissionController/res/values-uz-v33/strings.xml index a32387c37..31fc63c98 100644 --- a/PermissionController/res/values-uz-v33/strings.xml +++ b/PermissionController/res/values-uz-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Boshqa ogohlantirishlar"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Ogohlantirishlar yopildi"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Kengaytirish va yana bitta ogohlantirishni ochish}other{Kengaytirish va yana # ta ogohlantirishni ochish}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Yopish"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Ogohlantirish: <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Amal bajarildi"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Qurilmangizga himoya qoʻshadigan sozlamalarni tekshiring"</string> diff --git a/PermissionController/res/values-uz/strings.xml b/PermissionController/res/values-uz/strings.xml index 55a271e39..c97bd92e8 100644 --- a/PermissionController/res/values-uz/strings.xml +++ b/PermissionController/res/values-uz/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"<xliff:g id="DEVICE_NAME">%2$s</xliff:g>da bu ilova uchun <xliff:g id="PERM">%1$s</xliff:g> kirish ruxsati"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"<xliff:g id="APP">%1$s</xliff:g> uchun berilgan barcha ruxsatlar"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Bu ruxsatga ega barcha ilovalar"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Axborot"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Sozlamalar"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Assistent uchun mikrofondan foydalanishni koʻrsatish"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Ishlatilmagan ilova sozlamalari"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Ishlatilmayotgan ilovalardan ruxsatlarni olib tashlash"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Havolalarni ochish"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Ish uchun birlamchi"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Maxfiy makon uchun standart"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Qurilma uchun optimallangan"</string> + <string name="default_app_others" msgid="7793029848126079876">"Boshqalar"</string> <string name="default_app_none" msgid="9084592086808194457">"Hech qanday"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Birlamchi)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Hech qanday ilova topilmadi"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasi nosozliklarni aniqlash axborotini yuklamoqchi."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Nosozliklarni aniqlash axboroti ulashilsinmi?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Tizim muammo topdi."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ilovasi bu qurilmadan <xliff:g id="DATE">%2$s</xliff:g> sanasida <xliff:g id="TIME">%3$s</xliff:g> da olingan xatoliklar hisobotini yuklashni talab etmoqda. Xatoliklar hisobotiga foydalanuvchi nomlari, joylashuv axboroti, qurilma identifikatorlari va tarmoq maʼlumotlari kabi qurilmangiz yoki qayd qilingan ilovalar haqida shaxsiy maʼlumotlar kiradi. Bunday maʼlumotlarni faqat ishonchli odamlar va ilovalarga yuboring. <xliff:g id="APP_NAME_1">%4$s</xliff:g> ilovasiga xatoliklar hisobotini yuklashga ruxsat berilsinmi?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ilovasi bu qurilmadan <xliff:g id="DATE">%2$s</xliff:g> sanasida <xliff:g id="TIME">%3$s</xliff:g> da olingan xatoliklar hisobotini yuklashni talab etmoqda. Xatoliklar hisobotiga foydalanuvchi nomlari, joylashuv axboroti, qurilma identifikatorlari va tarmoq maʼlumotlari kabi qurilmangiz yoki qayd qilingan ilovalar haqida shaxsiy maʼlumotlar kiradi. Bunday maʼlumotlarni faqat ishonchli odamlar va ilovalarga yuboring.\n\n<xliff:g id="APP_NAME_1">%4$s</xliff:g> ilovasiga xatoliklar hisobotini yuklashga ruxsat berilsinmi?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"<xliff:g id="APP_NAME">%1$s</xliff:g> uchun nosozlik axborotini yuborishda xatolik yuz berdi, shuning uchun batafsil nosozlik axborotini uzatish taqiqlandi. Nosozlik uchun uzr soʻraymiz."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Ruxsat"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Rad etish"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Cheklangan sozlamalarga ruxsat berish"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Cheklangan sozlama"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Xavfsizlik maqsadida bu sozlama hozir ishlamaydi."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Telefon chaqiruvi paytida amal ishlamaydi"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Telefon chaqiruvi paytida ilovalarga boshqa ilovalarni oʻrnatishga ruxsat berish mumkin emas.\n\n Tovlamachilar koʻpincha telefon chaqiruvi orqali suhbatlar paytida shu turdagi amalni bajarishni soʻraydi, shu bois u sizni himoyalash uchun bloklanadi. Sizga notanish biror kishi shu amalni bajarishga undasa, bu tovlamachilik boʻlishi mumkin."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Chaqiruv paytida bu amalni bajarish imkonsiz"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Qurilma va maʼlumotlarni himoyalash maqsadida bu sozlama bloklandi.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Firibgarlar yangi manbadan notanish ilovalarni oʻrnatishga ruxsat soʻrab, zararli ilovalarni oʻrnatishga urinishi mumkin."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Firibgarlar ilova uchun maxsus imkoniyatlarga ruxsat berishni soʻrab, qurilmani boshqarishga urinishi mumkin."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Ilovaga <xliff:g id="PERMISSION_NAME">%1$s</xliff:g> ruxsati berilmadi"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Ilova maxfiy maʼlumotlarga kirish uchun ruxsat soʻramoqda. Ruxsat bersangiz, shaxsiy va moliyaviy maʼlumotlaringiz xavf ostida qolishi mumkin.<xliff:g id="ID_1"><br><br></xliff:g> Bu cheklangan ruxsatsiz ilova toʻgʻri ishlamasligi mumkin. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Qanday ruxsat berish haqida batafsil</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Ilovadan <xliff:g id="ROLE_NAME">%1$s</xliff:g> turkumidagi standart sifatida foydalanish taqiqlangan"</string> diff --git a/PermissionController/res/values-v33/strings.xml b/PermissionController/res/values-v33/strings.xml index 2267d068e..6cf538b48 100644 --- a/PermissionController/res/values-v33/strings.xml +++ b/PermissionController/res/values-v33/strings.xml @@ -52,6 +52,8 @@ other {Expand and see # more alerts} } </string> + <!-- Label for collapsing the "See all alerts"/"More issues" card in Safety Center [CHAR LIMIT=NONE] --> + <string name="safety_center_more_issues_card_collapse_action">Collapse</string> <!-- Content description prefixing the first text view of a safety center issue card preference [CHAR LIMIT=NONE]--> <string name="safety_center_issue_card_prefix_content_description">Alert. <xliff:g id="issue card title" example="Protect your account">%1$s</xliff:g></string> diff --git a/PermissionController/res/values-v35/themes.xml b/PermissionController/res/values-v35/themes.xml index ff6c430c4..995f230e7 100644 --- a/PermissionController/res/values-v35/themes.xml +++ b/PermissionController/res/values-v35/themes.xml @@ -28,7 +28,7 @@ TODO(b/309578419): Make activities handle insets properly and then remove this. --> <style name="OptOutEdgeToEdgeEnforcement"> - <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item> + <item name="android:windowOptOutEdgeToEdgeEnforcement">false</item> </style> <style name="ThemeOverlay.PermissionSettings" parent="" /> diff --git a/PermissionController/res/values-vi-v33/strings.xml b/PermissionController/res/values-vi-v33/strings.xml index d0c8853c5..a8c70b112 100644 --- a/PermissionController/res/values-vi-v33/strings.xml +++ b/PermissionController/res/values-vi-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Cảnh báo khác"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Cảnh báo bị loại bỏ"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Mở rộng và xem một cảnh báo khác}other{Mở rộng và xem # cảnh báo khác}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Thu gọn"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Cảnh báo. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Hoàn tất hành động"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Kiểm tra các chế độ cài đặt có thể giúp tăng cường bảo vệ cho thiết bị của bạn"</string> diff --git a/PermissionController/res/values-vi/strings.xml b/PermissionController/res/values-vi/strings.xml index ecb94368c..ce5e6dca3 100644 --- a/PermissionController/res/values-vi/strings.xml +++ b/PermissionController/res/values-vi/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Quyền truy cập <xliff:g id="PERM">%1$s</xliff:g> cho ứng dụng này trên <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Xem tất cả các quyền của <xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Xem tất cả ứng dụng có quyền này"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Thông tin"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Cài đặt"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Hiển thị việc sử dụng micrô của Trợ lý"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Chế độ cài đặt cho ứng dụng không dùng đến"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Thu hồi quyền nếu bạn không dùng ứng dụng"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Mở đường liên kết"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Ứng dụng mặc định cho công việc"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Ứng dụng mặc định cho không gian riêng tư"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Tối ưu hoá cho thiết bị"</string> + <string name="default_app_others" msgid="7793029848126079876">"Ứng dụng khác"</string> <string name="default_app_none" msgid="9084592086808194457">"Không có"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Ứng dụng mặc định của hệ thống)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Không có ứng dụng nào"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g> muốn tải thông tin gỡ lỗi lên."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Chia sẻ dữ liệu gỡ lỗi?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Hệ thống đã phát hiện thấy một vấn đề."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> đang yêu cầu tải lên một báo cáo lỗi trên thiết bị này được thực hiện vào <xliff:g id="DATE">%2$s</xliff:g> lúc <xliff:g id="TIME">%3$s</xliff:g>. Báo cáo lỗi bao gồm thông tin cá nhân về thiết bị của bạn hoặc do ứng dụng ghi nhật ký, ví dụ như tên người dùng, dữ liệu vị trí, mã nhận dạng thiết bị và thông tin mạng. Chỉ chia sẻ báo cáo lỗi với người và ứng dụng bạn tin cậy để truy cập thông tin này. Bạn muốn cho phép <xliff:g id="APP_NAME_1">%4$s</xliff:g> tải báo cáo lỗi lên?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> đang yêu cầu tải lên một báo cáo lỗi được thực hiện lúc <xliff:g id="TIME">%3$s</xliff:g> ngày <xliff:g id="DATE">%2$s</xliff:g> trên thiết bị này. Báo cáo lỗi có chứa thông tin cá nhân trên thiết bị của bạn hoặc thông tin cá nhân do các ứng dụng ghi lại, ví dụ như tên người dùng, dữ liệu vị trí, giá trị nhận dạng thiết bị và thông tin mạng. Chỉ chia sẻ báo cáo lỗi với những người và ứng dụng bạn tin cậy.\n\nCho phép <xliff:g id="APP_NAME_1">%4$s</xliff:g> tải báo cáo lỗi lên?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Đã xảy ra lỗi khi xử lý báo cáo lỗi cho <xliff:g id="APP_NAME">%1$s</xliff:g>. Vì vậy, yêu cầu chia sẻ dữ liệu gỡ lỗi chi tiết đã bị từ chối. Rất tiếc vì sự gián đoạn này."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Cho phép"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Từ chối"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Cho phép các chế độ cài đặt bị hạn chế"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Chế độ cài đặt bị hạn chế"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Để đảm bảo an toàn cho bạn, chế độ cài đặt này hiện không dùng được."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Không thao tác được khi đang gọi điện"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Không cho phép ứng dụng cài đặt các ứng dụng khác trong khi bạn gọi điện.\n\n Kẻ lừa đảo thường yêu cầu bạn cài đặt ứng dụng trong khi gọi điện, vì vậy, hành động này bị chặn để bảo vệ bạn. Nếu người mà bạn không biết hướng dẫn bạn cài đặt ứng dụng, thì đó có thể là thủ đoạn lừa đảo."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Không thực hiện được thao tác trong khi gọi điện"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Chế độ cài đặt này bị chặn để bảo vệ thiết bị và dữ liệu của bạn.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Kẻ lừa đảo có thể cố cài đặt các ứng dụng gây hại bằng cách yêu cầu bạn cài đặt ứng dụng không xác định từ một nguồn mới."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Kẻ lừa đảo có thể cố giành quyền kiểm soát thiết bị của bạn bằng cách yêu cầu bạn cấp quyền truy cập vào tính năng hỗ trợ tiếp cận cho một ứng dụng."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"Ứng dụng đã bị từ chối cấp quyền truy cập vào <xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"Ứng dụng này yêu cầu quyền truy cập vào thông tin nhạy cảm. Việc đó có thể khiến thông tin cá nhân và thông tin tài chính của bạn gặp rủi ro.<xliff:g id="ID_1"><br><br></xliff:g>Có thể ứng dụng sẽ hoạt động không đúng cách nếu không được cấp quyền bị hạn chế này. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Tìm hiểu cách cấp quyền</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"Ứng dụng đã bị từ chối cấp quyền để làm <xliff:g id="ROLE_NAME">%1$s</xliff:g> mặc định"</string> diff --git a/PermissionController/res/values-zh-rCN-v33/strings.xml b/PermissionController/res/values-zh-rCN-v33/strings.xml index 064e8b581..d43167cc9 100644 --- a/PermissionController/res/values-zh-rCN-v33/strings.xml +++ b/PermissionController/res/values-zh-rCN-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"更多提醒"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"忽略的提醒"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{展开并查看另外一项提醒}other{展开并查看另外 # 项提醒}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"收起"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"提醒：<xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"操作完成"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"查看可提高设备安全性的设置"</string> diff --git a/PermissionController/res/values-zh-rCN/strings.xml b/PermissionController/res/values-zh-rCN/strings.xml index 031f48640..6e1a2d1a3 100644 --- a/PermissionController/res/values-zh-rCN/strings.xml +++ b/PermissionController/res/values-zh-rCN/strings.xml @@ -196,12 +196,14 @@ <string name="precise_image_description" msgid="6349638632303619872">"确切位置"</string> <string name="approximate_image_description" msgid="938803699637069884">"大致位置"</string> <string name="app_permission_location_accuracy" msgid="7166912915040018669">"使用确切位置"</string> - <string name="app_permission_location_accuracy_subtitle" msgid="2654077606404987210">"确切位置关闭时，应用可以获取您的大致位置"</string> + <string name="app_permission_location_accuracy_subtitle" msgid="2654077606404987210">"精确位置关闭时，应用可以获取您的大致位置"</string> <string name="app_permission_title" msgid="2090897901051370711">"<xliff:g id="PERM">%1$s</xliff:g>权限"</string> <string name="app_permission_header" msgid="2951363137032603806">"是否允许此应用获得“<xliff:g id="PERM">%1$s</xliff:g>”权限"</string> <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"此应用在<xliff:g id="DEVICE_NAME">%2$s</xliff:g>上的<xliff:g id="PERM">%1$s</xliff:g>访问权限"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"查看“<xliff:g id="APP">%1$s</xliff:g>”的所有权限"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"查看具有此权限的所有应用"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"信息"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"设置"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"显示 Google 助理麦克风使用情况"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"闲置应用设置"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"如果未使用此应用，则移除相关权限"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"打开链接"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"默认工作应用"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"私密空间的默认应用"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"针对设备进行了优化"</string> + <string name="default_app_others" msgid="7793029848126079876">"其他"</string> <string name="default_app_none" msgid="9084592086808194457">"无"</string> <string name="default_app_system_default" msgid="6218386768175513760">"（系统默认）"</string> <string name="default_app_no_apps" msgid="115720991680586885">"没有应用"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"<xliff:g id="APP_NAME">%1$s</xliff:g>请求上传调试信息。"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"要分享调试数据吗？"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"系统已检测到一个问题。"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> 请求上传此设备在 <xliff:g id="DATE">%2$s</xliff:g><xliff:g id="TIME">%3$s</xliff:g> 获取的错误报告。错误报告包含与您的设备相关或者由应用记录的个人信息，例如用户名、位置数据、设备标识符和网络信息。请务必只与您信任的用户和应用分享错误报告。要允许 <xliff:g id="APP_NAME_1">%4$s</xliff:g> 上传错误报告吗？"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"“<xliff:g id="APP_NAME_0">%1$s</xliff:g>”正在请求上传此设备在 <xliff:g id="DATE">%2$s</xliff:g><xliff:g id="TIME">%3$s</xliff:g> 获取的错误报告。错误报告包含与您的设备相关或者由应用记录的个人信息，例如用户名、位置数据、设备标识符和网络信息。请务必只与您信任的用户和应用分享错误报告。\n\n要允许“<xliff:g id="APP_NAME_1">%4$s</xliff:g>”上传错误报告吗？"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"处理<xliff:g id="APP_NAME">%1$s</xliff:g>的错误报告时出错，因此系统已拒绝分享详细的调试数据。不便之处，敬请见谅。"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"允许"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"拒绝"</string> @@ -483,8 +487,8 @@ <string name="permgrouprequest_nearby_devices" msgid="2272829282660436700">"要允许“<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>”查找、连接到附近设备以及确定附近设备的相对位置吗？"</string> <string name="permgrouprequest_device_aware_nearby_devices" msgid="5293478278408567442">"要允许<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>在<b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>上查找、连接到附近设备以及确定附近设备的相对位置吗？"</string> <string name="permgroupupgraderequestdetail_nearby_devices" msgid="6877531270654738614">"要允许<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>查找、连接附近设备以及确定附近设备的相对位置吗？"<annotation id="link">"您可以在“设置”中允许。"</annotation></string> - <string name="permgrouprequest_fineupgrade" msgid="2334242928821697672">"要将“<xliff:g id="APP_NAME"><b>%1$s</b></xliff:g>”可以使用的位置信息从大致位置改为确切位置吗？"</string> - <string name="permgrouprequest_device_aware_fineupgrade" msgid="4453775952305587571">"要将<xliff:g id="APP_NAME"><b>%1$s</b></xliff:g>在<b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>上的位置信息访问权限从大致位置信息改为确切位置信息吗？"</string> + <string name="permgrouprequest_fineupgrade" msgid="2334242928821697672">"要将“<xliff:g id="APP_NAME"><b>%1$s</b></xliff:g>”可以使用的位置信息从大致位置改为精确位置吗？"</string> + <string name="permgrouprequest_device_aware_fineupgrade" msgid="4453775952305587571">"要将<xliff:g id="APP_NAME"><b>%1$s</b></xliff:g>在<b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>上的位置信息访问权限从大致位置信息改为精确位置信息吗？"</string> <string name="permgrouprequest_coarselocation" msgid="7244605063736425232">"要允许“<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>”获取此设备的大致位置信息吗？"</string> <string name="permgrouprequest_device_aware_coarselocation" msgid="8367540370912066757">"要允许<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>获取<b><xliff:g id="DEVICE_NAME">%2$s</xliff:g></b>的大致位置信息吗？"</string> <string name="permgrouprequest_finelocation_imagetext" msgid="1313062433398914334">"确切位置"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"允许受限制的设置"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"受限制的设置"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"出于安全考虑，此设置目前不可用。"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"通话期间无法执行此类操作"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"在通话期间，不允许应用安装其他应用。\n\n诈骗者经常会在通话过程中要求执行此类操作，所以系统阻止了此类操作来保障您的安全。如果您正在陌生人的指引下执行此类操作，要当心，这可能是骗局。"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"无法在通话期间完成操作"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"为保护您的设备和数据，系统已屏蔽此设置。<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>诈骗者可能会要求您从新的来源安装未知应用，从而试图安装有害应用。"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>诈骗者可能会要求您允许某个应用使用无障碍功能，从而试图控制您的设备。"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"系统已拒绝向此应用授予<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>访问权限"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"该应用请求获得敏感权限，授予这项权限可能会导致您的个人信息和财务信息面临风险。<xliff:g id="ID_1"><br><br></xliff:g>如果不授予这项受限权限，该应用可能无法正常运行。<a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>了解如何授予访问权限</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"系统已拒绝向此应用授予作为默认<xliff:g id="ROLE_NAME">%1$s</xliff:g>的访问权限"</string> diff --git a/PermissionController/res/values-zh-rHK-v33/strings.xml b/PermissionController/res/values-zh-rHK-v33/strings.xml index da31b6eae..c9dffa172 100644 --- a/PermissionController/res/values-zh-rHK-v33/strings.xml +++ b/PermissionController/res/values-zh-rHK-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"更多警示"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"已關閉的警示"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{展開即可查看多一個警示}other{展開即可查看多 # 個警示}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"收合"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"警示：<xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"動作已完成"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"查看可加強保護裝置的設定"</string> diff --git a/PermissionController/res/values-zh-rHK-v34/strings.xml b/PermissionController/res/values-zh-rHK-v34/strings.xml index 12f494881..3bd6abe6e 100644 --- a/PermissionController/res/values-zh-rHK-v34/strings.xml +++ b/PermissionController/res/values-zh-rHK-v34/strings.xml @@ -19,7 +19,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="security_privacy_brand_name" msgid="7303621734258440812">"安全性和私隱"</string> <string name="privacy_subpage_controls_header" msgid="4152396976713749322">"控制項"</string> - <string name="health_connect_title" msgid="2132233890867430855">"Health Connect"</string> + <string name="health_connect_title" msgid="2132233890867430855">"健康資料同步"</string> <string name="health_connect_summary" msgid="815473513776882296">"管理應用程式的健康資料存取權"</string> <string name="location_settings" msgid="8863940440881290182">"位置資料存取權"</string> <string name="mic_toggle_description" msgid="1504101620086616040">"適用於應用程式和服務。如果關閉此設定，系統仍會在你撥打緊急電話號碼時提供麥克風的資料"</string> diff --git a/PermissionController/res/values-zh-rHK/strings.xml b/PermissionController/res/values-zh-rHK/strings.xml index 64ced6518..782912088 100644 --- a/PermissionController/res/values-zh-rHK/strings.xml +++ b/PermissionController/res/values-zh-rHK/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"此應用程式在<xliff:g id="DEVICE_NAME">%2$s</xliff:g>上的<xliff:g id="PERM">%1$s</xliff:g>存取權"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"查看「<xliff:g id="APP">%1$s</xliff:g>」的所有權限"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"查看擁有此權限的所有應用程式"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"資料"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"設定"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"顯示「Google 助理」麥克風使用情況"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"不使用的應用程式設定"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"如不使用應用程式，即移除權限"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"開啟連結"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"預設用於工作"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"私人空間的預設應用程式"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"已針對你的裝置優化"</string> + <string name="default_app_others" msgid="7793029848126079876">"其他"</string> <string name="default_app_none" msgid="9084592086808194457">"無"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(系統預設)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"沒有應用程式"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求上載偵錯資料。"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"分享偵錯資料？"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"系統偵測到問題。"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"「<xliff:g id="APP_NAME_0">%1$s</xliff:g>」要求上載此裝置於 <xliff:g id="DATE">%2$s</xliff:g> <xliff:g id="TIME">%3$s</xliff:g> 傳送的錯誤報告。錯誤報告包括你的裝置或應用程式記錄的個人資料，例如使用者名稱、位置資料、裝置識別碼和網絡資訊。只與你信任可存取這些資料的使用者和應用程式分享錯誤報告。要允許「<xliff:g id="APP_NAME_1">%4$s</xliff:g>」上載錯誤報告嗎？"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"「<xliff:g id="APP_NAME_0">%1$s</xliff:g>」要求上載此裝置於 <xliff:g id="DATE">%2$s</xliff:g><xliff:g id="TIME">%3$s</xliff:g>傳送的錯誤報告。錯誤報告包括與裝置相關的個人資料或應用程式記錄的個人資料，例如使用者名稱、位置資料、裝置識別碼和網絡資訊。請只與你信任的使用者和應用程式分享錯誤報告。\n\n要允許「<xliff:g id="APP_NAME_1">%4$s</xliff:g>」上載錯誤報告嗎？"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"系統處理「<xliff:g id="APP_NAME">%1$s</xliff:g>」的錯誤報告時發生錯誤，因此已拒絕分享詳細的偵錯資料。很抱歉發生中斷情況。"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"允許"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"拒絕"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"允許受限設定"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"受限設定"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"為安全起見，系統目前不提供此設定。"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"通話期間無法執行此操作"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"通話期間，應用程式不可安裝其他應用程式。\n\n由於騙徒經常在電話對話中要求這類操作，因此我們封鎖此功能以保障你的安全。如果有陌生人引導你執行此操作，那可能是詐騙。"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"通話期間無法完成操作"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"系統已封鎖此設定，以保護你的裝置和資料。<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>騙徒可能會要求你從新的來源安裝不明應用程式，以試圖安裝有害應用程式。"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>騙徒可能會要求你允許應用程式存取無障礙功能，以試圖控制你的裝置。"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"系統已拒絕授予應用程式「<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>」存取權"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"應用程式要求存取敏感資料權限，授予此權限可能會危害你的個人和財務資料。<xliff:g id="ID_1"><br><br></xliff:g>如沒有此受限制權限，應用程式可能無法正常運作。<a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>進一步瞭解如何授予存取權</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"系統已拒絕授予應用程式作為預設<xliff:g id="ROLE_NAME">%1$s</xliff:g>的存取權"</string> diff --git a/PermissionController/res/values-zh-rTW-v33/strings.xml b/PermissionController/res/values-zh-rTW-v33/strings.xml index a1ca5c673..40a5b41f4 100644 --- a/PermissionController/res/values-zh-rTW-v33/strings.xml +++ b/PermissionController/res/values-zh-rTW-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"更多警示"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"已關閉的警示"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{展開並查看另外 1 則快訊}other{展開並查看另外 # 則快訊}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"收合"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"警示：<xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"動作已完成"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"查看可強化裝置防護的設定"</string> diff --git a/PermissionController/res/values-zh-rTW/strings.xml b/PermissionController/res/values-zh-rTW/strings.xml index e98024c52..d745840ad 100644 --- a/PermissionController/res/values-zh-rTW/strings.xml +++ b/PermissionController/res/values-zh-rTW/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"這個應用程式在<xliff:g id="DEVICE_NAME">%2$s</xliff:g>上的<xliff:g id="PERM">%1$s</xliff:g>存取權"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"查看「<xliff:g id="APP">%1$s</xliff:g>」的所有權限"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"查看具備此權限的所有應用程式"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"資訊"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"設定"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"顯示 Google 助理的麥克風使用狀況"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"未使用的應用程式設定"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"如果應用程式未使用，讓系統移除相關權限"</string> @@ -355,10 +357,10 @@ <string name="accessibility_service_dialog_bottom_text_multiple" msgid="7009848932395519852">"這些應用程式不但可查看你的畫面、動作和輸入內容，還能執行動作及控制顯示畫面。"</string> <string name="role_assistant_label" msgid="4727586018198208128">"預設數位助理應用程式"</string> <string name="role_assistant_short_label" msgid="3369003713187703399">"數位助理應用程式"</string> - <string name="role_assistant_description" msgid="6622458130459922952">"小幫手應用程式可根據當下的螢幕內容提供協助。某些應用程式同時支援啟動器和語音輸入服務，提供更完善的服務。"</string> + <string name="role_assistant_description" msgid="6622458130459922952">"小幫手應用程式可根據當下的螢幕內容提供協助。某些應用程式同時支援啟動器和語音輸入服務，服務更完善。"</string> <string name="role_browser_label" msgid="2877796144554070207">"預設瀏覽器應用程式"</string> <string name="role_browser_short_label" msgid="6745009127123292296">"瀏覽器應用程式"</string> - <string name="role_browser_description" msgid="3465253637499842671">"你可以透過這類應用程式連上網際網路，也可以輕觸顯示的連結"</string> + <string name="role_browser_description" msgid="3465253637499842671">"透過這類應用程式你可以連上網際網路和顯示你輕觸的連結"</string> <string name="role_browser_request_title" msgid="2895200507835937192">"要將 <xliff:g id="APP_NAME">%1$s</xliff:g> 設為預設的瀏覽器應用程式嗎？"</string> <string name="role_browser_request_description" msgid="5888803407905985941">"無需任何權限"</string> <string name="role_dialer_label" msgid="1100224146343237968">"預設電話應用程式"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"開啟連結"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"預設的工作應用程式"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"私人空間的預設應用程式"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"已針對裝置最佳化"</string> + <string name="default_app_others" msgid="7793029848126079876">"其他"</string> <string name="default_app_none" msgid="9084592086808194457">"無"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(系統預設)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"沒有可用的應用程式"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求上傳偵錯資訊。"</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"要分享偵錯資料嗎？"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"系統偵測到問題。"</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"「<xliff:g id="APP_NAME_0">%1$s</xliff:g>」要求上傳這個裝置在 <xliff:g id="DATE">%2$s</xliff:g><xliff:g id="TIME">%3$s</xliff:g> 取得的錯誤報告。錯誤報告包含與裝置相關或由應用程式記錄的個人資訊，例如：使用者名稱、位置資料、裝置 ID 和網路資訊。請務必只與你信任的使用者和應用程式分享錯誤報告。要允許「<xliff:g id="APP_NAME_1">%4$s</xliff:g>」上傳錯誤報告嗎？"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"「<xliff:g id="APP_NAME_0">%1$s</xliff:g>」要求上傳這部裝置中的錯誤報告 (取得時間 <xliff:g id="DATE">%2$s</xliff:g><xliff:g id="TIME">%3$s</xliff:g>)。錯誤報告包含與裝置相關的個人資訊，或是應用程式記錄的個人資訊，例如使用者名稱、位置資料、裝置 ID 和網路資訊。請務必只與你信任的使用者和應用程式分享錯誤報告。\n\n要允許「<xliff:g id="APP_NAME_1">%4$s</xliff:g>」上傳錯誤報告嗎？"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"處理「<xliff:g id="APP_NAME">%1$s</xliff:g>」的錯誤報告時發生錯誤，因此系統已拒絕分享詳細的偵錯資料。不便之處，敬請見諒。"</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"允許"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"拒絕"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"解除受限制的設定"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"受限制的設定"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"為了安全起見，目前無法使用這項設定。"</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"無法在通話期間執行這項操作"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"通話期間不允許應用程式安裝其他應用程式。\n\n詐騙者經常會在電話對話中要求這類操作，因此系統加以封鎖來保護你的安全。如果有陌生人引導你採取這類操作，請提高警覺，這可能是詐騙行為。"</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"通話期間無法完成動作"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"為保護裝置和資料，系統已封鎖這項設定。<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>詐騙者可能會要求你從新的來源安裝不明應用程式，試圖安裝有害應用程式。"</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>詐騙者可能會要求你授權讓應用程式存取無障礙功能，試圖控制你的裝置。"</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"系統已拒絕授予應用程式「<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>」存取權"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"這個應用程式要求取得私密資訊權限，授予這項權限可能導致你的個人資訊和財務資訊面臨風險。<xliff:g id="ID_1"><br><br></xliff:g>如果未取得這項受限制權限，應用程式可能無法正常運作。<a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>瞭解如何授予權限</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"系統已拒絕授予應用程式做為預設「<xliff:g id="ROLE_NAME">%1$s</xliff:g>」的存取權"</string> diff --git a/PermissionController/res/values-zu-v33/strings.xml b/PermissionController/res/values-zu-v33/strings.xml index 2b1861644..71ca1c68d 100644 --- a/PermissionController/res/values-zu-v33/strings.xml +++ b/PermissionController/res/values-zu-v33/strings.xml @@ -30,6 +30,7 @@ <string name="safety_center_more_issues_card_title" msgid="7425844746197493312">"Ezinye izexwayiso"</string> <string name="safety_center_dismissed_issues_card_title" msgid="2340129842725145733">"Chitha izexwayiso"</string> <string name="safety_center_more_issues_card_expand_action" msgid="7109451851052272946">"{count,plural, =1{Nweba futhi ubone esinye isexwayiso}one{Nweba futhi ubone ezinye izexwayiso ezingu-#}other{Nweba futhi ubone ezinye izexwayiso ezingu-#}}"</string> + <string name="safety_center_more_issues_card_collapse_action" msgid="7485597582198474637">"Goqa"</string> <string name="safety_center_issue_card_prefix_content_description" msgid="1447445289637043544">"Isexwayiso. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>"</string> <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Isenzo siqediwe"</string> <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Hlola amasethingi angangeza ukuvikeleka kudivayisi yakho"</string> diff --git a/PermissionController/res/values-zu/strings.xml b/PermissionController/res/values-zu/strings.xml index 95f837307..92bbe3d8c 100644 --- a/PermissionController/res/values-zu/strings.xml +++ b/PermissionController/res/values-zu/strings.xml @@ -202,6 +202,8 @@ <string name="app_permission_header_with_device_name" msgid="7193042925656173271">"Ukufinyelela kwe-<xliff:g id="PERM">%1$s</xliff:g> kwale app kuvuliwe ku-<xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Bona zonke izimvume ze-<xliff:g id="APP">%1$s</xliff:g>"</string> <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Bona zonke izinhlelo zokusebenza ngale mvume"</string> + <string name="app_permission_info_button" msgid="8973692370208562556">"Ulwazi"</string> + <string name="app_permission_settings_button" msgid="4582916817451973752">"Amasethingi"</string> <string name="assistant_mic_label" msgid="1011432357152323896">"Bonisa ukusetshenziswa kwe-microphone kamsizi"</string> <string name="unused_apps_category_title" msgid="2988455616845243901">"Amasethingi we-app engasetshenziswanga"</string> <string name="auto_revoke_label" msgid="5068393642936571656">"Susa izimvume uma uhlelo lokusebenza lungasetshenziswa"</string> @@ -438,6 +440,8 @@ <string name="default_apps_manage_domain_urls" msgid="6775566451561036069">"Ivula amalinki"</string> <string name="default_apps_for_work" msgid="4970308943596201811">"Okuzenzakalelayo kokusebenza"</string> <string name="default_apps_for_private_profile" msgid="2022024112144880785">"Okuzenzakalelayo kwendawo engasese"</string> + <string name="default_app_recommended" msgid="5669584821778942909">"Ilungiselelwe idivayisi"</string> + <string name="default_app_others" msgid="7793029848126079876">"Amanye"</string> <string name="default_app_none" msgid="9084592086808194457">"Lutho"</string> <string name="default_app_system_default" msgid="6218386768175513760">"(Okuzenzakalelayo kwesistimu)"</string> <string name="default_app_no_apps" msgid="115720991680586885">"Azikho izinhlelo zokusebenza"</string> @@ -456,7 +460,7 @@ <string name="incident_report_notification_text" msgid="3376480583513587923">"I-<xliff:g id="APP_NAME">%1$s</xliff:g> ingathanda ukulayisha ulwazi lokususa iphutha."</string> <string name="incident_report_dialog_title" msgid="669104389325204095">"Yabelana ngedatha yokulungisa amaphutha?"</string> <string name="incident_report_dialog_intro" msgid="5897733669850951832">"Isistimu ithole inkinga."</string> - <string name="incident_report_dialog_text" msgid="5675553296891757523">"I-<xliff:g id="APP_NAME_0">%1$s</xliff:g> icela ukulayisha umbiko wesiphazamisi kusukela kule divayisi othathwe ngomhla ka-<xliff:g id="DATE">%2$s</xliff:g> ngo-<xliff:g id="TIME">%3$s</xliff:g>. Imibiko yesiphazamisi ifaka ulwazi lomuntu siqu olumayelana nedivayisi yakho noma olufakwe ngezinhlelo zokusebenza, isibonelo, amagama abasebenzisi, idatha yendawo, izikhombi zedivayisi, nolwazi lwedivayisi. Yabelana kuphela ngemibiko yesiphazamisi nabantu nezinhlelo zokusebenza ozithembayo ngalolu lwazi. Vumela i-<xliff:g id="APP_NAME_1">%4$s</xliff:g> ukuthi ilayishe umbiko wesiphazamisi?"</string> + <string name="incident_report_dialog_text" msgid="1819244417678973362">"I-<xliff:g id="APP_NAME_0">%1$s</xliff:g> icela ukulayisha umbiko wesiphazamisi ovela kule divayisi othathwe ngomhla ka-<xliff:g id="DATE">%2$s</xliff:g> ngo-<xliff:g id="TIME">%3$s</xliff:g>. Imibiko yesiphazamisi ifaka ulwazi lomuntu siqu olumayelana nedivayisi yakho noma olufakwe ngama-app, ngokwesibonelo, amagama abasebenzisi, idatha yendawo, izikhombi zedivayisi, nolwazi lwedivayisi. Yabelana kuphela ngemibiko yesiphazamisi nabantu nama-app owathembayo ngalolu lwazi.\n\n Vumela i-<xliff:g id="APP_NAME_1">%4$s</xliff:g> ukuthi ilayishe umbiko wesiphazamisi?"</string> <string name="incident_report_error_dialog_text" msgid="4189647113387092272">"Kube nephutha ukucubungula umbiko wesiphazamisi we-<xliff:g id="APP_NAME">%1$s</xliff:g>. Ngakho-ke ukwabelana ngedatha yokususa isiphazamiso inqatshiwe. Uxolo ngokuphazamisa."</string> <string name="incident_report_dialog_allow_label" msgid="2970242967721155239">"Vumela"</string> <string name="incident_report_dialog_deny_label" msgid="3535314290677579383">"Phika"</string> @@ -674,8 +678,15 @@ <string name="allow_restricted_settings" msgid="8073000189478396881">"Vumela amasethingi akhawulelwe"</string> <string name="enhanced_confirmation_dialog_title" msgid="7562437438040966351">"Amasethingi akhawulelwe"</string> <string name="enhanced_confirmation_dialog_desc" msgid="5921240234843839219">"Ukuze uphephe, leli sethingi okwamanje alitholakali."</string> - <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5230100829862738467">"Isenzo asitholakali ngenkathi ufona"</string> - <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="8782160971908273849">"Ukuvumela ama-app ukuthi afake amanye ama-app akuvunyelwe phakathi nekholi yefoni.\n\n Amaqola, ngokuvamile acela lolu hlobo lwesenzo phakathi nezingxoxo zekholi, ngakho-ke kuvinjiwe ukuze uvikeleke. Uma uqondiswa ukuthi wenze lesi senzo ngumuntu ongamazi, kungase kube umkhonyovu."</string> + <string name="enhanced_confirmation_phone_state_dialog_title" msgid="5054064107559019689">"Ayikwazi ukuqedela isenzo phakathi nekholi"</string> + <string name="enhanced_confirmation_phone_state_dialog_desc" msgid="3803423079498712549">"Leli sethingi livinjiwe ukuze kuvikelwe idivayisi yakho nedatha.<xliff:g id="SCAM_USE_SETTING_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="enhanced_confirmation_phone_state_dialog_install_desc" msgid="6400007048943674066">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Amaqola angase azame ukufaka ama-app ayingozi ngokukucela ukuthi ufake ama-app angaziwa avela emthonjeni omusha."</string> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc" msgid="6567523001053288057">"<xliff:g id="EMPTY_LINE"> + +</xliff:g>Amaqola angase azame ukulawula idivayisi yakho ngokukucela ukuthi uvumele ukufinyelela ukutholakala kwe-app."</string> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" msgid="158278816955957088"></string> <string name="enhanced_confirmation_dialog_title_permission" msgid="2149144789394238266">"I-app inqatshelwe ukufinyelela ku-<xliff:g id="PERMISSION_NAME">%1$s</xliff:g>"</string> <string name="enhanced_confirmation_dialog_desc_permission" msgid="3150778951946468945">"I-app icele ukufinyelela emvumweni ezwelayo okungabeka imininingwane yakho siqu neyezimali engozini.<xliff:g id="ID_1"><br><br></xliff:g>Kungenzeka ukuthi i-app ingasebenzi kahle ngaphandle kwemvume enomkhawulo. <a href=<xliff:g id="LEARN_MORE_LINK">%1$s</xliff:g>>Funda ukuthi ungakuvumela kanjani ukufinyelela</a>"</string> <string name="enhanced_confirmation_dialog_title_role" msgid="1737023798483772780">"I-app iye yanqatshelwa ukufinyelela ukuze ibe yi-<xliff:g id="ROLE_NAME">%1$s</xliff:g> ezenzakalelayo"</string> diff --git a/PermissionController/res/values/config.xml b/PermissionController/res/values/config.xml index 675368cba..657dc07dd 100644 --- a/PermissionController/res/values/config.xml +++ b/PermissionController/res/values/config.xml @@ -19,6 +19,15 @@ <bool name="config_showBrowserRole">true</bool> <bool name="config_showDialerRole">true</bool> <bool name="config_showSmsRole">true</bool> + <!-- + ~ Semicolon separated list of packages that are recommended for the assistant role. + ~ <p> + ~ This follows the same format as config_defaultAssistant and also requires a signing + ~ certificate digest (separated by a colon from the package name) if the app is not a system + ~ app. + --> + <string name="config_recommendedAssistants"></string> + <bool name="config_useAlternativePermGroupSummary">false</bool> <bool name="config_useWindowBlur">false</bool> <bool name="config_useMaterial3PermissionGrantDialog">false</bool> diff --git a/PermissionController/res/values/integers.xml b/PermissionController/res/values/integers.xml new file mode 100644 index 000000000..c65ec99de --- /dev/null +++ b/PermissionController/res/values/integers.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2025 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. +--> +<resources> + <integer name="mirror_x_scale">1</integer> +</resources> diff --git a/PermissionController/res/values/overlayable.xml b/PermissionController/res/values/overlayable.xml index ea7929746..72896fcdb 100644 --- a/PermissionController/res/values/overlayable.xml +++ b/PermissionController/res/values/overlayable.xml @@ -371,14 +371,15 @@ <item type="style" name="ThemeOverlay.PermissionSettings" /> <!-- END THEMES --> - <!-- START VISIBILITY CONFIGS --> - <!-- Assistant role uses: config_showDefaultAssistant --> - <!-- Home role uses: config_showDefaultHome --> - <!-- Emergency role uses: config_showDefaultEmergency --> + <!-- START ROLE CONFIGS --> + <!-- Assistant role uses android:bool/config_showDefaultAssistant --> + <!-- Home role uses android:bool/config_showDefaultHome --> + <!-- Emergency role uses android:bool/config_showDefaultEmergency --> <item type="bool" name="config_showBrowserRole" /> <item type="bool" name="config_showDialerRole" /> <item type="bool" name="config_showSmsRole" /> - <!-- END VISIBILITY CONFIGS --> + <item type="string" name="config_recommendedAssistants" /> + <!-- END ROLE CONFIGS --> <!-- START CAR DIMENS --> <item type="dimen" name="car_action_bar_height" /> @@ -461,89 +462,6 @@ <item type="style" name="AppDataSharingUpdateSettingsIcon" /> <!-- END SAFETY LABELS STYLE --> - <!--START WEAR SPECIFIC MATERIAL2 FONT STRINGS --> - <item type="string" name="wear_material_compose_display_1_font_family" /> - <item type="string" name="wear_material_compose_display_2_font_family" /> - <item type="string" name="wear_material_compose_display_3_font_family" /> - <item type="string" name="wear_material_compose_title_1_font_family" /> - <item type="string" name="wear_material_compose_title_2_font_family" /> - <item type="string" name="wear_material_compose_title_3_font_family" /> - <item type="string" name="wear_material_compose_body_1_font_family" /> - <item type="string" name="wear_material_compose_body_2_font_family" /> - <item type="string" name="wear_material_compose_button_font_family" /> - <item type="string" name="wear_material_compose_caption_1_font_family" /> - <item type="string" name="wear_material_compose_caption_2_font_family" /> - <item type="string" name="wear_material_compose_caption_3_font_family" /> - <!--END WEAR SPECIFIC MATERIAL2 FONT STRINGS --> - - <!--START WEAR SPECIFIC MATERIAL3 FONT FACE TOKENS--> - <item type="string" name="wear_compose_material3_arc_small_font_family" /> - <item type="string" name="wear_compose_material3_arc_medium_font_family" /> - <item type="string" name="wear_compose_material3_arc_large_font_family" /> - - <item type="string" name="wear_compose_material3_body_extra_small_font_family" /> - <item type="string" name="wear_compose_material3_body_small_font_family" /> - <item type="string" name="wear_compose_material3_body_medium_font_family" /> - <item type="string" name="wear_compose_material3_body_large_font_family" /> - - <item type="string" name="wear_compose_material3_display_small_font_family" /> - <item type="string" name="wear_compose_material3_display_medium_font_family" /> - <item type="string" name="wear_compose_material3_display_large_font_family" /> - - <item type="string" name="wear_compose_material3_label_small_font_family" /> - <item type="string" name="wear_compose_material3_label_medium_font_family" /> - <item type="string" name="wear_compose_material3_label_large_font_family" /> - - <item type="string" name="wear_compose_material3_numeral_extra_small_font_family" /> - <item type="string" name="wear_compose_material3_numeral_small_font_family" /> - <item type="string" name="wear_compose_material3_numeral_medium_font_family" /> - <item type="string" name="wear_compose_material3_numeral_large_font_family" /> - <item type="string" name="wear_compose_material3_numeral_extra_large_font_family" /> - - <item type="string" name="wear_compose_material3_title_small_font_family" /> - <item type="string" name="wear_compose_material3_title_medium_font_family" /> - <item type="string" name="wear_compose_material3_title_large_font_family" /> - <!--END WEAR SPECIFIC MATERIAL3 FONT FACE TOKENS--> - - - <!--START WEAR SPECIFIC MATERIAL3 FONT SIZE TOKENS--> - <item type="dimen" name="wear_compose_material3_arc_small_font_size" /> - <item type="dimen" name="wear_compose_material3_arc_medium_font_size" /> - <item type="dimen" name="wear_compose_material3_arc_large_font_size" /> - - <item type="dimen" name="wear_compose_material3_body_extra_small_font_size" /> - <item type="dimen" name="wear_compose_material3_body_small_font_size" /> - <item type="dimen" name="wear_compose_material3_body_medium_font_size" /> - <item type="dimen" name="wear_compose_material3_body_large_font_size" /> - - <item type="dimen" name="wear_compose_material3_display_small_font_size" /> - <item type="dimen" name="wear_compose_material3_display_medium_font_size" /> - <item type="dimen" name="wear_compose_material3_display_large_font_size" /> - - <item type="dimen" name="wear_compose_material3_label_small_font_size" /> - <item type="dimen" name="wear_compose_material3_label_medium_font_size" /> - <item type="dimen" name="wear_compose_material3_label_large_font_size" /> - - <item type="dimen" name="wear_compose_material3_numeral_extra_small_font_size" /> - <item type="dimen" name="wear_compose_material3_numeral_small_font_size" /> - <item type="dimen" name="wear_compose_material3_numeral_medium_font_size" /> - <item type="dimen" name="wear_compose_material3_numeral_large_font_size" /> - <item type="dimen" name="wear_compose_material3_numeral_extra_large_font_size" /> - - <item type="dimen" name="wear_compose_material3_title_small_font_size" /> - <item type="dimen" name="wear_compose_material3_title_medium_font_size" /> - <item type="dimen" name="wear_compose_material3_title_large_font_size" /> - <!--END WEAR SPECIFIC MATERIAL3 FONT SIZE TOKENS--> - - <!--START WEAR SPECIFIC MATERIAL3 SHAPE TOKENS--> - <item type="dimen" name="wear_compose_material3_shape_corner_extra_small_size" /> - <item type="dimen" name="wear_compose_material3_shape_corner_small_size" /> - <item type="dimen" name="wear_compose_material3_shape_corner_medium_size" /> - <item type="dimen" name="wear_compose_material3_shape_corner_large_size" /> - <item type="dimen" name="wear_compose_material3_shape_corner_extra_large_size" /> - <!--END WEAR SPECIFIC MATERIAL3 SHAPE TOKENS--> - - <!-- START ENHANCED CONFIRMATION DIALOG --> <item type="style" name="Theme.EnhancedConfirmationDialog" /> <item type="style" name="Theme.EnhancedConfirmationDialogFragment" /> diff --git a/PermissionController/res/values/strings.xml b/PermissionController/res/values/strings.xml index 82c7889c6..f5a997674 100644 --- a/PermissionController/res/values/strings.xml +++ b/PermissionController/res/values/strings.xml @@ -638,6 +638,12 @@ <!-- Text for linking to the page that shows the apps with a given permission [CHAR LIMIT=none] --> <string name="app_permission_footer_permission_apps_link">See all apps with this permission</string> + <!-- Content description for button with an info icon [CHAR LIMIT=none] --> + <string name="app_permission_info_button">Information</string> + + <!-- Content description for button with a settings icon [CHAR LIMIT=none] --> + <string name="app_permission_settings_button">Settings</string> + <!-- Label for the assistant mic display switch [CHAR LIMIT=60] --> <string name="assistant_mic_label">Show assistant microphone usage</string> @@ -1331,6 +1337,12 @@ <!-- Title for category of default apps for private profile [CHAR LIMIT=50] --> <string name="default_apps_for_private_profile">Default for private space</string> + <!-- Title for category of apps that are optimized for the device [CHAR LIMIT=50] --> + <string name="default_app_recommended">Optimized for device</string> + + <!-- Title for category of other apps [CHAR LIMIT=50] --> + <string name="default_app_others">Others</string> + <!-- Summary of a default app when there is no app set [CHAR LIMIT=60] --> <string name="default_app_none">None</string> @@ -1397,9 +1409,7 @@ <!-- Content for dialog shown when the user should confirm an incident / bug report. [CHAR LIMIT=none] --> - <string name="incident_report_dialog_text">"<xliff:g id="app_name" example="Gmail">%1$s</xliff:g> is requesting to upload a bug report from this device taken on <xliff:g id="date" example="December 26, 2018">%2$s</xliff:g> at <xliff:g id="time" example="1:20 PM">%3$s</xliff:g>. Bug reports include personal information about your device or logged by apps, for example, user names, location data, device identifiers, and network information. Only share bug reports with people and apps you trust with this information. - -Allow <xliff:g id="app_name" example="Gmail">%4$s</xliff:g> to upload a bug report?"</string> + <string name="incident_report_dialog_text">"<xliff:g id="app_name" example="Gmail">%1$s</xliff:g> is requesting to upload a bug report from this device taken on <xliff:g id="date" example="December 26, 2018">%2$s</xliff:g> at <xliff:g id="time" example="1:20 PM">%3$s</xliff:g>. Bug reports include personal information about your device or logged by apps, for example, user names, location data, device identifiers, and network information. Only share bug reports with people and apps you trust with this information.\n\nAllow <xliff:g id="app_name" example="Gmail">%4$s</xliff:g> to upload a bug report?"</string> <!-- Content for dialog shown when there was an error parsing the incident / bug report. [CHAR LIMIT=none] --> @@ -2017,11 +2027,17 @@ Allow <xliff:g id="app_name" example="Gmail">%4$s</xliff:g> to upload a bug repo <string name="enhanced_confirmation_dialog_desc">For your security, this setting is currently unavailable.</string> <!--Title for dialog displayed to tell user that settings are blocked due to the phone state (such as being in a call with an unknown number) [CHAR LIMIT=50] --> - <string name="enhanced_confirmation_phone_state_dialog_title">Action not available while on a phone call</string> + <string name="enhanced_confirmation_phone_state_dialog_title">Can\u2019t complete action during call</string> <!--Content for dialog displayed to tell user that settings are blocked due to the phone state (such as being in a call with an unknown number) [CHAR LIMIT=NONE] --> - <string name="enhanced_confirmation_phone_state_dialog_desc">Allowing apps to install other apps is not allowed during a phone call.\n\n - Scammers often request this type of action during phone call conversations, so it\u2019s blocked to protect you. If you are being guided to take this action - by someone you don\u2019t know, it might be a scam.</string> + <string name="enhanced_confirmation_phone_state_dialog_desc">This setting is blocked to protect your device and data.<xliff:g id="scam_use_setting_description" example="scammers may ask you to allow apps to install other apps">%1$s</xliff:g></string> + + <!--Content explaining that the "install other apps" setting is blocked due to the phone state in a dialog displayed to the user [CHAR LIMIT=NONE] --> + <string name="enhanced_confirmation_phone_state_dialog_install_desc"><xliff:g id="empty_line">\n\n</xliff:g>Scammers may try to install harmful apps by asking you to install unknown apps from a new source.</string> + + <!--Content explaining that the "enable accessibility service" setting is blocked due to the phone state in a dialog displayed to the user [CHAR LIMIT=NONE] --> + <string name="enhanced_confirmation_phone_state_dialog_a11y_desc"><xliff:g id="empty_line">\n\n</xliff:g>Scammers may try to take control of your device by asking you to allow accessibility access for an app.</string> + <!--Content explaining that a generic setting is blocked due to the phone state in a dialog displayed to the user. currently empty [CHAR LIMIT=NONE] --> + <string name="enhanced_confirmation_phone_state_dialog_generic_desc" /> <!--Title for dialog displayed to tell user that permissions are blocked by setting restrictions [CHAR LIMIT=50] --> <string name="enhanced_confirmation_dialog_title_permission">App was denied access to <xliff:g id="permission_name" example="contacts">%1$s</xliff:g></string> diff --git a/PermissionController/res/values/styles.xml b/PermissionController/res/values/styles.xml index c764e776e..9d280c38a 100644 --- a/PermissionController/res/values/styles.xml +++ b/PermissionController/res/values/styles.xml @@ -1488,7 +1488,7 @@ <style name="EnhancedConfirmationDialogDesc" parent="@android:style/TextAppearance.Material.Body1"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">wrap_content</item> - <item name="android:gravity">left</item> + <item name="android:gravity">start</item> <item name="android:fontFamily">google-sans-text</item> <item name="android:textSize">14sp</item> <item name="android:lineSpacingMultiplier">1.2</item> diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml index 3d858a9c5..ae8adc5ab 100644 --- a/PermissionController/res/xml/roles.xml +++ b/PermissionController/res/xml/roles.xml @@ -155,9 +155,13 @@ minSdkVersion="35" optionalMinSdkVersion="34" /> <permission name="android.permission.EMBED_ANY_APP_IN_UNTRUSTED_MODE" minSdkVersion="35" /> + <permission name="android.permission.READ_SYSTEM_PREFERENCES" + featureFlag="com.android.settingslib.flags.Flags.settingsCatalyst" /> </permissions> <app-op-permissions> <app-op-permission name="android.permission.SYSTEM_ALERT_WINDOW" /> + <app-op-permission name="android.permission.WRITE_SYSTEM_PREFERENCES" + featureFlag="com.android.settingslib.flags.Flags.writeSystemPreferencePermissionEnabled" /> </app-op-permissions> </role> @@ -654,6 +658,12 @@ minSdkVersion="33" /> <permission name="android.permission.MANAGE_SAFETY_CENTER" minSdkVersion="33" /> + <permission name="android.permission.ASSOCIATE_COMPANION_DEVICES" minSdkVersion="36" /> + <permission name="android.permission.CREATE_VIRTUAL_DEVICE" minSdkVersion="33" /> + <permission name="android.permission.ADD_TRUSTED_DISPLAY" minSdkVersion="33" /> + <permission name="android.permission.ADD_ALWAYS_UNLOCKED_DISPLAY" minSdkVersion="33" /> + <permission name="android.permission.ADD_MIRROR_DISPLAY" + featureFlag="android.companion.virtualdevice.flags.Flags.enableLimitedVdmRole" /> <permission name="android.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE" minSdkVersion="33" /> <permission name="android.permission.MANAGE_DEVICE_POLICY_ACCOUNT_MANAGEMENT" @@ -716,15 +726,14 @@ minSdkVersion="35" /> <permission name="android.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING" minSdkVersion="35" /> - <permission name="android.permission.EXECUTE_APP_FUNCTIONS" - featureFlag="android.app.appfunctions.flags.Flags.enableAppFunctionManager" /> - <permission name="android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED" - featureFlag="android.app.appfunctions.flags.Flags.enableAppFunctionManager" /> - <permission name="android.permission.COPY_ACCOUNTS" - featureFlag="android.app.admin.flags.Flags.splitCreateManagedProfileEnabled" /> - <permission name="android.permission.REMOVE_ACCOUNTS" - featureFlag="android.app.admin.flags.Flags.splitCreateManagedProfileEnabled" /> + <permission name="android.permission.MANAGE_DEVICE_POLICY_MTE" + minSdkVersion="36" /> </permissions> + <!-- App ops needed to allow background access to audio APIs for CTS --> + <app-ops> + <app-op name="android:control_audio" mode="allowed" minSdkVersion="36"/> + <app-op name="android:control_audio_partial" mode="allowed" minSdkVersion="36"/> + </app-ops> </role> <role @@ -895,8 +904,8 @@ <permission name="android.permission.READ_SMS" minSdkVersion="33" /> <permission name="android.permission.READ_PEOPLE_DATA" /> <permission name="android.permission.READ_GLOBAL_APP_SEARCH_DATA" /> - <permission name="android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED" - featureFlag="android.app.appfunctions.flags.Flags.enableAppFunctionManager" /> + <permission name="android.permission.READ_BLOCKED_NUMBERS" + featureFlag="android.permission.flags.Flags.grantReadBlockedNumbersToSystemUiIntelligence" /> </permissions> </role> @@ -1032,6 +1041,8 @@ <!-- If this role holder has a NotificationListenerService, let that service receive notifications with sensitive content unredacted--> <permission name="android.permission.RECEIVE_SENSITIVE_NOTIFICATIONS" minSdkVersion="35"/> + <permission name="android.permission.ACCESS_TEXT_CLASSIFIER_BY_TYPE" minSdkVersion="36" + featureFlag="android.permission.flags.Flags.textClassifierChoiceApiEnabled"/> </permissions> <app-ops> <app-op name="android:receive_sensitive_notifications" mode="allowed" minSdkVersion="35"/> @@ -1226,7 +1237,6 @@ --> <role name="android.app.role.COMPANION_DEVICE_APP_STREAMING" - allowBypassingQualification="true" behavior="v33.CompanionDeviceAppStreamingRoleBehavior" description="@string/role_app_streaming_description" exclusive="false" @@ -1302,7 +1312,7 @@ <role name="android.app.role.COMPANION_DEVICE_NEARBY_DEVICE_STREAMING" - allowBypassingQualification="true" + behavior="v34.CompanionDeviceNearbyDeviceStreamingRoleBehavior" exclusive="false" exclusivity="none" minSdkVersion="34" @@ -1491,10 +1501,8 @@ <permission name="android.permission.MANAGE_DEVICE_POLICY_SMS" minSdkVersion="35" /> <permission name="android.permission.MANAGE_DEVICE_POLICY_APP_FUNCTIONS" featureFlag="android.app.appfunctions.flags.Flags.enableAppFunctionManager" /> - <permission name="android.permission.COPY_ACCOUNTS" - featureFlag="android.app.admin.flags.Flags.splitCreateManagedProfileEnabled" /> - <permission name="android.permission.REMOVE_ACCOUNTS" - featureFlag="android.app.admin.flags.Flags.splitCreateManagedProfileEnabled" /> + <permission name="android.permission.MANAGE_DEFAULT_APPLICATIONS" minSdkVersion="36" + featureFlag="com.android.permission.flags.Flags.crossUserRoleEnabled" /> </permissions> </role> @@ -1834,7 +1842,7 @@ defaultHolders="config_defaultWallet" description="@string/role_wallet_description" exclusive="true" - exclusivity="user" + exclusivity="profileGroup" label="@string/role_wallet_label" minSdkVersion="35" overrideUserWhenGranting="true" @@ -1874,19 +1882,21 @@ --> <role name="android.app.role.RESERVED_FOR_TESTING_PROFILE_GROUP_EXCLUSIVITY" - behavior="ReservedForTestingProfileGroupExclusivityRoleBehavior" + behavior="v36.ReservedForTestingProfileGroupExclusivityRoleBehavior" description="@string/role_for_testing_profile_group_exclusivity_description" exclusive="true" exclusivity="profileGroup" fallBackToDefaultHolder="true" featureFlag="com.android.permission.flags.Flags.crossUserRoleEnabled" label="@string/role_for_testing_profile_group_exclusivity_label" + minSdkVersion="36" requestable="true" requestDescription="@string/role_for_testing_profile_group_exclusivity_request_description" requestTitle="@string/role_for_testing_profile_group_exclusivity_request_title" shortLabel="@string/role_for_testing_profile_group_exclusivity_short_label" showNone="true" - visible="true"/> + uiBehavior="v36.ReservedForTestingProfileGroupExclusivityRoleUiBehavior" + visible="false"/> <!--- ~ A role for the vendor package that provides privacy-preserving intelligent processor for @@ -1921,9 +1931,27 @@ systemOnly="true" visible="false"> <permissions> - <permission name="android.permission.READ_GLOBAL_APP_SEARCH_DATA" /> - <permission name="android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED" - featureFlag="android.app.appfunctions.flags.Flags.enableAppFunctionManager" /> + <permission name="android.permission.ACCESS_BACKGROUND_LOCATION" /> + <permission name="android.permission.ACCESS_COARSE_LOCATION" /> + <permission name="android.permission.ACCESS_FINE_LOCATION" /> + <permission name="android.permission.READ_MEDIA_IMAGES" /> + <permission name="android.permission.READ_MEDIA_VIDEO" /> + </permissions> + </role> + + <role + name="android.app.role.COMPANION_DEVICE_VIRTUAL_DEVICE" + allowBypassingQualification="true" + exclusive="false" + exclusivity="none" + featureFlag="android.companion.virtualdevice.flags.Flags.enableLimitedVdmRole" + systemOnly="true" + visible="false"> + <permissions> + <permission-set name="nearby_devices" /> + <permission-set name="notifications" /> + <permission name="android.permission.CREATE_VIRTUAL_DEVICE"/> </permissions> </role> + </roles> diff --git a/PermissionController/role-controller/Android.bp b/PermissionController/role-controller/Android.bp index 9f217660a..f89fd140c 100644 --- a/PermissionController/role-controller/Android.bp +++ b/PermissionController/role-controller/Android.bp @@ -32,6 +32,7 @@ java_library { ], static_libs: [ "modules-utils-build_system", + "aconfig_settingslib_exported_flags_java_lib", "android.app.appfunctions.exported-flags-aconfig-java", "android.companion.virtualdevice.flags-aconfig-java-export", "android.content.pm.flags-aconfig-java-export", diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/AssistantRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/AssistantRoleBehavior.java index d025d1b03..a99b1ade2 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/behavior/AssistantRoleBehavior.java +++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/AssistantRoleBehavior.java @@ -17,7 +17,6 @@ package com.android.role.controller.behavior; import android.app.ActivityManager; -import android.app.appfunctions.flags.Flags; import android.app.role.RoleManager; import android.content.Context; import android.content.Intent; @@ -37,18 +36,15 @@ import android.util.Xml; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.android.role.controller.model.Permissions; import com.android.role.controller.model.Role; import com.android.role.controller.model.RoleBehavior; import com.android.role.controller.model.VisibilityMixin; -import com.android.role.controller.util.PackageUtils; import com.android.role.controller.util.UserUtils; import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Set; @@ -59,14 +55,6 @@ public class AssistantRoleBehavior implements RoleBehavior { private static final String LOG_TAG = AssistantRoleBehavior.class.getSimpleName(); - /** - * Permissions to be granted if the application fulfilling the assistant role is also a system - * or preinstalled app. - */ - private static final List<String> SYSTEM_ASSISTANT_PERMISSIONS = Arrays.asList( - android.Manifest.permission.EXECUTE_APP_FUNCTIONS - ); - @Override public void onRoleAddedAsUser(@NonNull Role role, @NonNull UserHandle user, @NonNull Context context) { @@ -88,28 +76,6 @@ public class AssistantRoleBehavior implements RoleBehavior { return !UserUtils.isProfile(user, context); } - @Override - public void grantAsUser(@NonNull Role role, @NonNull String packageName, - @NonNull UserHandle user, @NonNull Context context) { - if (Flags.enableAppFunctionManager()) { - if (PackageUtils.isSystemPackageAsUser(packageName, user, context)) { - Permissions.grantAsUser(packageName, SYSTEM_ASSISTANT_PERMISSIONS, false, false, - true, false, false, user, context); - } - } - } - - @Override - public void revokeAsUser(@NonNull Role role, @NonNull String packageName, - @NonNull UserHandle user, @NonNull Context context) { - if (Flags.enableAppFunctionManager()) { - if (PackageUtils.isSystemPackageAsUser(packageName, user, context)) { - Permissions.revokeAsUser(packageName, SYSTEM_ASSISTANT_PERMISSIONS, true, false, - false, user, context); - } - } - } - @Nullable @Override public List<String> getQualifyingPackagesAsUser(@NonNull Role role, @NonNull UserHandle user, @@ -230,7 +196,7 @@ public class AssistantRoleBehavior implements RoleBehavior { } @Override - public boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, + public Boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, @NonNull Context context) { return VisibilityMixin.isVisible("config_showDefaultAssistant", false, user, context); } diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/BrowserRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/BrowserRoleBehavior.java index 0261e1eee..95b86f0ca 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/behavior/BrowserRoleBehavior.java +++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/BrowserRoleBehavior.java @@ -157,7 +157,7 @@ public class BrowserRoleBehavior implements RoleBehavior { } @Override - public boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, + public Boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, @NonNull Context context) { return VisibilityMixin.isVisible("config_showBrowserRole", true, user, context); } diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/DialerRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/DialerRoleBehavior.java index 153f4a6b4..aa0902136 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/behavior/DialerRoleBehavior.java +++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/DialerRoleBehavior.java @@ -80,7 +80,7 @@ public class DialerRoleBehavior implements RoleBehavior { } @Override - public boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, + public Boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, @NonNull Context context) { return VisibilityMixin.isVisible("config_showDialerRole", true, user, context); } diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/EmergencyRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/EmergencyRoleBehavior.java index f19c86596..4a52b0b03 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/behavior/EmergencyRoleBehavior.java +++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/EmergencyRoleBehavior.java @@ -71,7 +71,7 @@ public class EmergencyRoleBehavior implements RoleBehavior { } @Override - public boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, + public Boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, @NonNull Context context) { return VisibilityMixin.isVisible("config_showDefaultEmergency", false, user, context); } diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/HomeRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/HomeRoleBehavior.java index 8c1446b50..b226674a0 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/behavior/HomeRoleBehavior.java +++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/HomeRoleBehavior.java @@ -186,7 +186,7 @@ public class HomeRoleBehavior implements RoleBehavior { } @Override - public boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, + public Boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, @NonNull Context context) { return VisibilityMixin.isVisible("config_showDefaultHome", false, user, context); } diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/ReservedForTestingProfileGroupExclusivityRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/ReservedForTestingProfileGroupExclusivityRoleBehavior.java deleted file mode 100644 index a9be00806..000000000 --- a/PermissionController/role-controller/java/com/android/role/controller/behavior/ReservedForTestingProfileGroupExclusivityRoleBehavior.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2024 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.role.controller.behavior; - -import android.app.role.RoleManager; -import android.content.Context; -import android.os.UserHandle; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.android.role.controller.model.Role; -import com.android.role.controller.model.RoleBehavior; -import com.android.role.controller.util.RoleFlags; -import com.android.role.controller.util.UserUtils; - -import java.util.List; - -public class ReservedForTestingProfileGroupExclusivityRoleBehavior implements RoleBehavior { - @Nullable - @Override - public List<String> getDefaultHoldersAsUser(@NonNull Role role, @NonNull UserHandle user, - @NonNull Context context) { - if (RoleFlags.isProfileGroupExclusivityAvailable()) { - Context userContext = UserUtils.getUserContext(context, user); - RoleManager roleManager = userContext.getSystemService(RoleManager.class); - return roleManager.getDefaultHoldersForTest(role.getName()); - } else { - return null; - } - } - - @Override - public boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, - @NonNull Context context) { - if (RoleFlags.isProfileGroupExclusivityAvailable()) { - Context userContext = UserUtils.getUserContext(context, user); - RoleManager roleManager = userContext.getSystemService(RoleManager.class); - return roleManager.isRoleVisibleForTest(role.getName()); - } else { - return false; - } - } -} diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/SmsRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/SmsRoleBehavior.java index 4aff8a163..ee429c10e 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/behavior/SmsRoleBehavior.java +++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/SmsRoleBehavior.java @@ -133,7 +133,7 @@ public class SmsRoleBehavior implements RoleBehavior { } @Override - public boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, + public Boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, @NonNull Context context) { return VisibilityMixin.isVisible("config_showSmsRole", true, user, context); } diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/CompanionDeviceAppStreamingRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/CompanionDeviceAppStreamingRoleBehavior.java index 275387d57..85c4be569 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/CompanionDeviceAppStreamingRoleBehavior.java +++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/CompanionDeviceAppStreamingRoleBehavior.java @@ -20,7 +20,9 @@ import android.content.Context; import android.os.UserHandle; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.android.modules.utils.build.SdkLevel; import com.android.role.controller.model.Role; import com.android.role.controller.model.RoleBehavior; import com.android.role.controller.util.NotificationUtils; @@ -46,4 +48,10 @@ public class CompanionDeviceAppStreamingRoleBehavior implements RoleBehavior { NotificationUtils.revokeNotificationAccessForPackageAsUser(packageName, user, context); } } + + @Override + @Nullable + public Boolean shouldAllowBypassingQualification(@NonNull Role role, @NonNull Context context) { + return !SdkLevel.isAtLeastB(); + } } diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/v34/CompanionDeviceNearbyDeviceStreamingRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v34/CompanionDeviceNearbyDeviceStreamingRoleBehavior.java new file mode 100644 index 000000000..f941ec68d --- /dev/null +++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v34/CompanionDeviceNearbyDeviceStreamingRoleBehavior.java @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2025 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.role.controller.behavior.v34; + +import android.content.Context; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.android.modules.utils.build.SdkLevel; +import com.android.role.controller.model.Role; +import com.android.role.controller.model.RoleBehavior; + +/** + * Class for behavior of the "Nearby Device Streaming" Companion device profile role. + */ +public class CompanionDeviceNearbyDeviceStreamingRoleBehavior implements RoleBehavior { + + @Override + @Nullable + public Boolean shouldAllowBypassingQualification(@NonNull Role role, @NonNull Context context) { + return !SdkLevel.isAtLeastB(); + } +} diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/v35/WalletRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v35/WalletRoleBehavior.java index d01e59456..aed71564d 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/behavior/v35/WalletRoleBehavior.java +++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v35/WalletRoleBehavior.java @@ -41,6 +41,7 @@ import com.android.modules.utils.build.SdkLevel; import com.android.role.controller.model.Role; import com.android.role.controller.model.RoleBehavior; import com.android.role.controller.util.CollectionUtils; +import com.android.role.controller.util.RoleFlags; import com.android.role.controller.util.UserUtils; import org.xmlpull.v1.XmlPullParserException; @@ -62,8 +63,25 @@ public class WalletRoleBehavior implements RoleBehavior { @Override public boolean isAvailableAsUser(@NonNull Role role, @NonNull UserHandle user, @NonNull Context context) { - return SdkLevel.isAtLeastV() && Flags.walletRoleEnabled() - && !UserUtils.isProfile(user, context); + if (!(SdkLevel.isAtLeastV() && Flags.walletRoleEnabled())) { + return false; + } + + if (Flags.walletRoleCrossUserEnabled() && RoleFlags.isProfileGroupExclusivityAvailable()) { + return !UserUtils.isPrivateProfile(user, context); + } else { + return !UserUtils.isProfile(user, context); + } + } + + @Nullable + @Override + public Integer getExclusivity() { + if (Flags.walletRoleCrossUserEnabled() && RoleFlags.isProfileGroupExclusivityAvailable()) { + return Role.EXCLUSIVITY_PROFILE_GROUP; + } + + return Role.EXCLUSIVITY_USER; } @Nullable diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/v36/ReservedForTestingProfileGroupExclusivityRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v36/ReservedForTestingProfileGroupExclusivityRoleBehavior.java new file mode 100644 index 000000000..e50f33ffd --- /dev/null +++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v36/ReservedForTestingProfileGroupExclusivityRoleBehavior.java @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2024 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.role.controller.behavior.v36; + +import android.app.role.RoleManager; +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.os.Build; +import android.os.UserHandle; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; + +import com.android.role.controller.model.Role; +import com.android.role.controller.model.RoleBehavior; +import com.android.role.controller.util.PackageUtils; +import com.android.role.controller.util.RoleFlags; +import com.android.role.controller.util.UserUtils; + +import java.util.ArrayList; +import java.util.List; + +@RequiresApi(Build.VERSION_CODES.BAKLAVA) +public class ReservedForTestingProfileGroupExclusivityRoleBehavior implements RoleBehavior { + @Nullable + @Override + public List<String> getDefaultHoldersAsUser(@NonNull Role role, @NonNull UserHandle user, + @NonNull Context context) { + if (RoleFlags.isProfileGroupExclusivityAvailable()) { + Context userContext = UserUtils.getUserContext(context, user); + RoleManager userRoleManager = userContext.getSystemService(RoleManager.class); + return userRoleManager.getDefaultHoldersForTest(role.getName()); + } else { + return null; + } + } + + @Override + public Boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, + @NonNull Context context) { + if (RoleFlags.isProfileGroupExclusivityAvailable()) { + Context userContext = UserUtils.getUserContext(context, user); + RoleManager userRoleManager = userContext.getSystemService(RoleManager.class); + return userRoleManager.isRoleVisibleForTest(role.getName()); + } else { + return false; + } + } + + @Nullable + @Override + public List<String> getQualifyingPackagesAsUser(@NonNull Role role, @NonNull UserHandle user, + @NonNull Context context) { + if (RoleFlags.isProfileGroupExclusivityAvailable()) { + Context userContext = UserUtils.getUserContext(context, user); + RoleManager userRoleManager = userContext.getSystemService(RoleManager.class); + List<String> qualifyingPackageNames = + userRoleManager.getDefaultHoldersForTest(role.getName()); + + // When getQualifyingPackagesAsUser returns a package that isn't installed, Default App + // Settings fails to load. Only return available packages. + List<String> availableQualifyingPackageNames = new ArrayList<>(); + for (int i = 0; i < qualifyingPackageNames.size(); i++) { + String qualifyingPackage = qualifyingPackageNames.get(i); + ApplicationInfo applicationInfo = + PackageUtils.getApplicationInfoAsUser(qualifyingPackage, user, context); + if (applicationInfo != null) { + availableQualifyingPackageNames.add(qualifyingPackage); + } + } + return availableQualifyingPackageNames; + } else { + return null; + } + } +} diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/AppOp.java b/PermissionController/role-controller/java/com/android/role/controller/model/AppOp.java index 56c4944a0..a0007dcc0 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/model/AppOp.java +++ b/PermissionController/role-controller/java/com/android/role/controller/model/AppOp.java @@ -137,8 +137,8 @@ public class AppOp { return false; } return Build.VERSION.SDK_INT >= mMinSdkVersion - // Workaround to match the value 35 for V in roles.xml before SDK finalization. - || (mMinSdkVersion == 35 && SdkLevel.isAtLeastV()); + // Workaround to match the value 36 for B in roles.xml before SDK finalization. + || (mMinSdkVersion == 36 && SdkLevel.isAtLeastB()); } private boolean isAvailableAsUser(@NonNull String packageName, diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/Permission.java b/PermissionController/role-controller/java/com/android/role/controller/model/Permission.java index 05b19ff94..c3404be8b 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/model/Permission.java +++ b/PermissionController/role-controller/java/com/android/role/controller/model/Permission.java @@ -97,8 +97,8 @@ public class Permission { return false; } if (Build.VERSION.SDK_INT >= mMinSdkVersion - // Workaround to match the value 35 for V in roles.xml before SDK finalization. - || (mMinSdkVersion == 35 && SdkLevel.isAtLeastV())) { + // Workaround to match the value 36 for B in roles.xml before SDK finalization. + || (mMinSdkVersion == 36 && SdkLevel.isAtLeastB())) { return true; } if (Build.VERSION.SDK_INT >= mOptionalMinSdkVersion) { diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/Role.java b/PermissionController/role-controller/java/com/android/role/controller/model/Role.java index 02fa0d455..0c2d51c80 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/model/Role.java +++ b/PermissionController/role-controller/java/com/android/role/controller/model/Role.java @@ -26,7 +26,6 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.SharedLibraryInfo; -import android.content.pm.Signature; import android.content.res.Resources; import android.os.Build; import android.os.UserHandle; @@ -47,9 +46,11 @@ import androidx.annotation.VisibleForTesting; import com.android.modules.utils.build.SdkLevel; import com.android.role.controller.util.CollectionUtils; +import com.android.role.controller.util.IntentCompat; import com.android.role.controller.util.PackageUtils; import com.android.role.controller.util.RoleFlags; import com.android.role.controller.util.RoleManagerCompat; +import com.android.role.controller.util.SignedPackageUtils; import com.android.role.controller.util.UserUtils; import java.lang.annotation.Retention; @@ -84,10 +85,6 @@ public class Role { private static final String PACKAGE_NAME_ANDROID_SYSTEM = "android"; - private static final String DEFAULT_HOLDER_SEPARATOR = ";"; - - private static final String CERTIFICATE_SEPARATOR = ":"; - @Retention(RetentionPolicy.SOURCE) @IntDef({ EXCLUSIVITY_NONE, @@ -343,15 +340,19 @@ public class Role { Integer exclusivity = mBehavior.getExclusivity(); if (exclusivity != null) { if (!sExclusivityValues.get(exclusivity)) { - throw new IllegalArgumentException("Invalid exclusivity: " + exclusivity); + throw new IllegalArgumentException( + "Role " + mName + " has invalid exclusivity: " + + exclusivity); } if (mShowNone && exclusivity == EXCLUSIVITY_NONE) { throw new IllegalArgumentException( - "Role cannot be non-exclusive when showNone is true: " + exclusivity); + "Role " + mName + " cannot be non-exclusive when showNone is true: " + + exclusivity); } if (!mPreferredActivities.isEmpty() && exclusivity == EXCLUSIVITY_PROFILE_GROUP) { throw new IllegalArgumentException( - "Role cannot have preferred activities when exclusivity is profileGroup"); + "Role " + mName + " cannot have preferred activities when exclusivity is " + + "profileGroup"); } return exclusivity; } @@ -472,25 +473,21 @@ public class Role { if (!isAvailableByFeatureFlagAndSdkVersion()) { return false; } + if (getExclusivity() == EXCLUSIVITY_PROFILE_GROUP) { + if (UserUtils.isPrivateProfile(user, context)) { + return false; + } - if (getExclusivity() == EXCLUSIVITY_PROFILE_GROUP - && UserUtils.isPrivateProfile(user, context)) { - return false; + // A profile group exclusive role may only be available in a profile when it's + // available in the profile parent. + UserHandle profileParent = UserUtils.getProfileParentOrSelf(user, context); + if (!Objects.equals(user, profileParent) + && !isAvailableAsUser(profileParent, context)) { + return false; + } } - if (mBehavior != null) { - boolean isAvailableAsUser = mBehavior.isAvailableAsUser(this, user, context); - // Ensure that cross-user role is only available if also available for - // the profile-group's full user - if (isAvailableAsUser && getExclusivity() == EXCLUSIVITY_PROFILE_GROUP) { - UserHandle profileParent = UserUtils.getProfileParentOrSelf(user, context); - if (!Objects.equals(profileParent, user) - && !mBehavior.isAvailableAsUser(this, profileParent, context)) { - throw new IllegalArgumentException("Role is not available for profile parent: " - + profileParent.getIdentifier()); - } - } - return isAvailableAsUser; + return mBehavior.isAvailableAsUser(this, user, context); } return true; } @@ -506,13 +503,19 @@ public class Role { return false; } return (Build.VERSION.SDK_INT >= mMinSdkVersion - // Workaround to match the value 35 for V in roles.xml before SDK finalization. - || (mMinSdkVersion == 35 && SdkLevel.isAtLeastV())) + // Workaround to match the value 36 for B in roles.xml before SDK finalization. + || (mMinSdkVersion == 36 && SdkLevel.isAtLeastB())) && Build.VERSION.SDK_INT <= mMaxSdkVersion; } - public boolean isStatic() { - return mStatic; + /** + * Check whether this role is static, which may change due to bypassing qualification. + * + * @param context the {@code Context} to retrieve system services + * @return whether this role is static + */ + public boolean isStatic(@NonNull Context context) { + return mStatic && !isBypassingQualification(context); } /** @@ -564,69 +567,11 @@ public class Role { } if (isExclusive()) { - String packageName = getQualifiedDefaultHolderPackageNameAsUser(defaultHolders, user, - context); - if (packageName == null) { - return Collections.emptyList(); - } - return Collections.singletonList(packageName); - } else { - List<String> packageNames = new ArrayList<>(); - for (String defaultHolder : defaultHolders.split(DEFAULT_HOLDER_SEPARATOR)) { - String packageName = getQualifiedDefaultHolderPackageNameAsUser(defaultHolder, - user, context); - if (packageName != null) { - packageNames.add(packageName); - } - } - return packageNames; - } - } - - @Nullable - private String getQualifiedDefaultHolderPackageNameAsUser(@NonNull String defaultHolder, - @NonNull UserHandle user, @NonNull Context context) { - String packageName; - byte[] certificate; - int certificateSeparatorIndex = defaultHolder.indexOf(CERTIFICATE_SEPARATOR); - if (certificateSeparatorIndex != -1) { - packageName = defaultHolder.substring(0, certificateSeparatorIndex); - String certificateString = defaultHolder.substring(certificateSeparatorIndex + 1); - try { - certificate = new Signature(certificateString).toByteArray(); - } catch (IllegalArgumentException e) { - Log.w(LOG_TAG, "Cannot parse signing certificate: " + defaultHolder, e); - return null; - } - } else { - packageName = defaultHolder; - certificate = null; - } - - if (certificate != null) { - Context userContext = UserUtils.getUserContext(context, user); - PackageManager userPackageManager = userContext.getPackageManager(); - if (!userPackageManager.hasSigningCertificate(packageName, certificate, - PackageManager.CERT_INPUT_SHA256)) { - Log.w(LOG_TAG, "Default holder doesn't have required signing certificate: " - + defaultHolder); - return null; - } + return CollectionUtils.singletonOrEmpty( + SignedPackageUtils.getPackageNameAsUser(defaultHolders, user, context)); } else { - ApplicationInfo applicationInfo = PackageUtils.getApplicationInfoAsUser(packageName, - user, context); - if (applicationInfo == null) { - Log.w(LOG_TAG, "Cannot get ApplicationInfo for default holder: " + packageName); - return null; - } - if ((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) { - Log.w(LOG_TAG, "Default holder didn't specify a signing certificate and isn't a" - + " system app: " + packageName); - return null; - } + return SignedPackageUtils.getPackageNamesAsUser(defaultHolders, user, context); } - - return packageName; } /** @@ -685,6 +630,12 @@ public class Role { return mAllowBypassingQualification; } + private boolean isBypassingQualification(@NonNull Context context) { + RoleManager roleManager = context.getSystemService(RoleManager.class); + return shouldAllowBypassingQualification(context) + && RoleManagerCompat.isBypassingRoleQualification(roleManager); + } + /** * Check whether a package is qualified for this role, i.e. whether it contains all the required * components (plus meeting some other general restrictions). @@ -697,9 +648,7 @@ public class Role { */ public boolean isPackageQualifiedAsUser(@NonNull String packageName, @NonNull UserHandle user, @NonNull Context context) { - RoleManager roleManager = context.getSystemService(RoleManager.class); - if (shouldAllowBypassingQualification(context) - && RoleManagerCompat.isBypassingRoleQualification(roleManager)) { + if (isBypassingQualification(context)) { return true; } @@ -1047,7 +996,14 @@ public class Role { */ public void onHolderAddedAsUser(@NonNull String packageName, @NonNull UserHandle user, @NonNull Context context) { - RoleManagerCompat.setRoleFallbackEnabledAsUser(this, true, user, context); + if (RoleFlags.isProfileGroupExclusivityAvailable() + && com.android.permission.flags.Flags.crossUserRoleUxBugfixEnabled() + && getExclusivity() == Role.EXCLUSIVITY_PROFILE_GROUP) { + UserHandle profileParent = UserUtils.getProfileParentOrSelf(user, context); + RoleManagerCompat.setRoleFallbackEnabledAsUser(this, true, profileParent, context); + } else { + RoleManagerCompat.setRoleFallbackEnabledAsUser(this, true, user, context); + } } /** @@ -1086,6 +1042,11 @@ public class Role { */ public void onNoneHolderSelectedAsUser(@NonNull UserHandle user, @NonNull Context context) { RoleManagerCompat.setRoleFallbackEnabledAsUser(this, false, user, context); + if (RoleFlags.isProfileGroupExclusivityAvailable() + && getExclusivity() == Role.EXCLUSIVITY_PROFILE_GROUP) { + RoleManager roleManager = context.getSystemService(RoleManager.class); + roleManager.setActiveUserForRole(mName, user, 0); + } } /** @@ -1097,11 +1058,23 @@ public class Role { * @return whether this role should be visible to user */ public boolean isVisibleAsUser(@NonNull UserHandle user, @NonNull Context context) { - RoleBehavior behavior = getBehavior(); - if (behavior == null) { - return isVisible(); + if (mBehavior != null) { + Boolean isVisibleAsUser = mBehavior.isVisibleAsUser(this, user, context); + if (isVisibleAsUser != null) { + if (isVisibleAsUser && mStatic) { + throw new IllegalArgumentException("static=\"true\" is invalid for a visible " + + "role: " + mName); + } + if (isVisibleAsUser && (mDescriptionResource == 0 + || mLabelResource == 0 + || mShortLabelResource == 0)) { + throw new IllegalArgumentException("description, label, and shortLabel are " + + "required for a visible role: " + mName); + } + return isVisibleAsUser; + } } - return isVisible() && behavior.isVisibleAsUser(this, user, context); + return isVisible(); } /** @@ -1138,12 +1111,37 @@ public class Role { @Nullable public Intent getRestrictionIntentAsUser(@NonNull UserHandle user, @NonNull Context context) { if (SdkLevel.isAtLeastU() && isExclusive()) { - UserManager userManager = context.getSystemService(UserManager.class); - if (userManager.hasUserRestrictionForUser(UserManager.DISALLOW_CONFIG_DEFAULT_APPS, - user)) { - return new Intent(Settings.ACTION_SHOW_ADMIN_SUPPORT_DETAILS) - .putExtra(DevicePolicyManager.EXTRA_RESTRICTION, - UserManager.DISALLOW_CONFIG_DEFAULT_APPS); + boolean crossUserRoleUxBugfixEnabled = + com.android.permission.flags.Flags.crossUserRoleUxBugfixEnabled(); + if (crossUserRoleUxBugfixEnabled && getExclusivity() == EXCLUSIVITY_PROFILE_GROUP) { + DevicePolicyManager devicePolicyManager = + context.getSystemService(DevicePolicyManager.class); + if (!devicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile()) { + // For profileGroup exclusive roles users on BYOD are free to choose personal or + // work profile app regardless of DISALLOW_CONFIG_DEFAULT_APPS + return null; + } + } + + // Otherwise if role is profileGroup exclusive check DISALLOW_CONFIG_DEFAULT_APPS for + // all users + List<UserHandle> profiles = + (crossUserRoleUxBugfixEnabled && getExclusivity() == EXCLUSIVITY_PROFILE_GROUP) + ? UserUtils.getUserProfiles(user, context, true) + : List.of(user); + final int profilesSize = profiles.size(); + for (int i = 0; i < profilesSize; i++) { + UserHandle profile = profiles.get(i); + UserManager userManager = context.getSystemService(UserManager.class); + if (userManager.hasUserRestrictionForUser( + UserManager.DISALLOW_CONFIG_DEFAULT_APPS, profile)) { + return new Intent(Settings.ACTION_SHOW_ADMIN_SUPPORT_DETAILS) + .putExtra( + DevicePolicyManager.EXTRA_RESTRICTION, + UserManager.DISALLOW_CONFIG_DEFAULT_APPS) + .putExtra(Intent.EXTRA_USER, profile) + .putExtra(IntentCompat.EXTRA_USER_ID, profile.getIdentifier()); + } } } return null; diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/RoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/model/RoleBehavior.java index 86ca8e2ce..3b08265d1 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/model/RoleBehavior.java +++ b/PermissionController/role-controller/java/com/android/role/controller/model/RoleBehavior.java @@ -23,7 +23,6 @@ import android.os.UserHandle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import java.util.Collections; import java.util.List; /** @@ -129,11 +128,12 @@ public interface RoleBehavior { * @param user the user to check for * @param context the `Context` to retrieve system services * - * @return whether this role should be visible to user + * @return whether this role should be visible to user, or {@code null} if not overridden */ - default boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, + @Nullable + default Boolean isVisibleAsUser(@NonNull Role role, @NonNull UserHandle user, @NonNull Context context) { - return true; + return null; } /** diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java b/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java index 4b05554e3..f0a730647 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java +++ b/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java @@ -413,6 +413,9 @@ public class RoleParser { skipCurrentTag(parser); return null; } + } else if (behavior != null) { + labelResource = getAttributeResourceValue(parser, ATTRIBUTE_LABEL, 0); + shortLabelResource = getAttributeResourceValue(parser, ATTRIBUTE_SHORT_LABEL, 0); } else { labelResource = 0; shortLabelResource = 0; @@ -433,10 +436,9 @@ public class RoleParser { exclusivity = Role.EXCLUSIVITY_USER; break; case EXCLUSIVITY_PROFILE_GROUP: - // TODO(b/372743073): change to isAtLeastB once available // EXCLUSIVITY_PROFILE behavior only available for B+ // fallback to default of EXCLUSIVITY_USER - exclusivity = SdkLevel.isAtLeastV() + exclusivity = SdkLevel.isAtLeastB() ? Role.EXCLUSIVITY_PROFILE_GROUP : Role.EXCLUSIVITY_USER; break; diff --git a/PermissionController/role-controller/java/com/android/role/controller/service/RoleControllerServiceImpl.java b/PermissionController/role-controller/java/com/android/role/controller/service/RoleControllerServiceImpl.java index d00fd47af..1a0c83ab8 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/service/RoleControllerServiceImpl.java +++ b/PermissionController/role-controller/java/com/android/role/controller/service/RoleControllerServiceImpl.java @@ -173,7 +173,7 @@ public class RoleControllerServiceImpl extends RoleControllerService { // or fallback holders, if any. currentPackageNames = mUserRoleManager.getRoleHolders(roleName); currentPackageNamesSize = currentPackageNames.size(); - boolean isStaticRole = role.isStatic(); + boolean isStaticRole = role.isStatic(mContext); if (currentPackageNamesSize == 0 || isStaticRole) { List<String> packageNamesToAdd = null; if (addedRoleNames.contains(roleName) || isStaticRole) { diff --git a/PermissionController/role-controller/java/com/android/role/controller/util/IntentCompat.java b/PermissionController/role-controller/java/com/android/role/controller/util/IntentCompat.java new file mode 100644 index 000000000..9771ad4cf --- /dev/null +++ b/PermissionController/role-controller/java/com/android/role/controller/util/IntentCompat.java @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2025 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.role.controller.util; + +/** Compat class for {@link android.content.Intent} */ +public final class IntentCompat { + /** + * An int representing the user ID to be used. Copy of + * {@link android.content.Intent#EXTRA_USER_ID} + */ + public static final String EXTRA_USER_ID = "android.intent.extra.USER_ID"; +} diff --git a/PermissionController/role-controller/java/com/android/role/controller/util/PackageUtils.java b/PermissionController/role-controller/java/com/android/role/controller/util/PackageUtils.java index cbffd451a..512015972 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/util/PackageUtils.java +++ b/PermissionController/role-controller/java/com/android/role/controller/util/PackageUtils.java @@ -57,7 +57,7 @@ public final class PackageUtils { } /** - * Retrieve if a package is a system package. + * Check whether a package is a system package. * * @param packageName the name of the package * @param user the user of the package @@ -93,4 +93,22 @@ public final class PackageUtils { return null; } } + + /** + * Check whether a package has a signing certificate. + * + * @param packageName the name of the package + * @param certificate the signing certificate + * @param user the user of the package + * @param context the {@code Context} to retrieve system services + * + * @return whether the package has the signing certificate. + */ + public static boolean hasSigningCertificateAsUser(@NonNull String packageName, + @NonNull byte[] certificate, @NonNull UserHandle user, @NonNull Context context) { + Context userContext = UserUtils.getUserContext(context, user); + PackageManager userPackageManager = userContext.getPackageManager(); + return userPackageManager.hasSigningCertificate(packageName, certificate, + PackageManager.CERT_INPUT_SHA256); + } } diff --git a/PermissionController/role-controller/java/com/android/role/controller/util/RoleFlags.java b/PermissionController/role-controller/java/com/android/role/controller/util/RoleFlags.java index 2c5a247b6..23e3a2c65 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/util/RoleFlags.java +++ b/PermissionController/role-controller/java/com/android/role/controller/util/RoleFlags.java @@ -20,7 +20,7 @@ import android.os.Build; import androidx.annotation.ChecksSdkIntAtLeast; -import java.util.Objects; +import com.android.modules.utils.build.SdkLevel; /** Util class for getting shared feature flag check logic. */ public final class RoleFlags { @@ -32,14 +32,6 @@ public final class RoleFlags { */ @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.BAKLAVA) public static boolean isProfileGroupExclusivityAvailable() { - // TODO(b/372743073): change to isAtLeastB once available - return isAtLeastB() && com.android.permission.flags.Flags.crossUserRoleEnabled(); - } - - // TODO(b/372743073): remove once SdkLevel.isAtLeastB available - @ChecksSdkIntAtLeast(api = 36 /* BUILD_VERSION_CODES.Baklava */) - public static boolean isAtLeastB() { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA - || Objects.equals(Build.VERSION.CODENAME, "Baklava"); + return SdkLevel.isAtLeastB() && com.android.permission.flags.Flags.crossUserRoleEnabled(); } } diff --git a/PermissionController/role-controller/java/com/android/role/controller/util/SignedPackage.java b/PermissionController/role-controller/java/com/android/role/controller/util/SignedPackage.java new file mode 100644 index 000000000..b13ac3731 --- /dev/null +++ b/PermissionController/role-controller/java/com/android/role/controller/util/SignedPackage.java @@ -0,0 +1,188 @@ +/* + * Copyright (C) 2025 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.role.controller.util; + +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.content.pm.Signature; +import android.os.UserHandle; +import android.text.TextUtils; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + +/** + * A package name with an optional signing certificate. + */ +public class SignedPackage { + + private static final String LOG_TAG = SignedPackage.class.getSimpleName(); + + private static final String SIGNED_PACKAGE_SEPARATOR = ";"; + private static final String CERTIFICATE_SEPARATOR = ":"; + + /** + * The name of the package. + */ + @NonNull + private final String mPackageName; + + /** + * The signing certificate of the package. + */ + @Nullable + private final byte[] mCertificate; + + public SignedPackage(@NonNull String packageName, @Nullable byte[] certificate) { + mPackageName = packageName; + mCertificate = certificate; + } + + @NonNull + public String getPackageName() { + return mPackageName; + } + + @Nullable + public byte[] getCertificate() { + return mCertificate; + } + + /** + * Parse a {@link SignedPackage} from a string input. + * + * @param input the package name, optionally followed by a colon and a signing certificate + * digest if it's not a system app + * + * @return the parsed {@link SignedPackage}, or {@code null} if the input is invalid + */ + @Nullable + public static SignedPackage parse(@NonNull String input) { + String packageName; + byte[] certificate; + int certificateSeparatorIndex = input.indexOf(CERTIFICATE_SEPARATOR); + if (certificateSeparatorIndex != -1) { + packageName = input.substring(0, certificateSeparatorIndex); + String certificateString = input.substring(certificateSeparatorIndex + 1); + try { + certificate = new Signature(certificateString).toByteArray(); + } catch (IllegalArgumentException e) { + Log.w(LOG_TAG, "Cannot parse signing certificate: " + input, e); + return null; + } + } else { + packageName = input; + certificate = null; + } + return new SignedPackage(packageName, certificate); + } + + /** + * Parse a list of {@link SignedPackage}s from a string input. + * + * @param input the package names, each optionally followed by a colon and a signing certificate + * digest if it's not a system app + * + * @return the parsed list of valid {@link SignedPackage}s + */ + @NonNull + public static List<SignedPackage> parseList(@NonNull String input) { + if (TextUtils.isEmpty(input)) { + return Collections.emptyList(); + } + List<SignedPackage> signedPackages = new ArrayList<>(); + for (String signedPackageInput : input.split(SIGNED_PACKAGE_SEPARATOR)) { + SignedPackage signedPackage = parse(signedPackageInput); + if (signedPackage != null) { + signedPackages.add(signedPackage); + } + } + return signedPackages; + } + + /** + * Checks whether this signed package is available, i.e. it is installed, and either has the + * specified signing certificate or is a system app if no signing certificate is specified. + * + * @param user the user of the package + * @param context the {@code Context} to retrieve system services + * + * @return whether this signed package is available + */ + public boolean isAvailableAsUser(@NonNull UserHandle user, @NonNull Context context) { + if (mCertificate != null) { + if (!PackageUtils.hasSigningCertificateAsUser(mPackageName, mCertificate, user, + context)) { + Log.w(LOG_TAG, "Package doesn't have required signing certificate: " + + mPackageName); + return false; + } + } else { + ApplicationInfo applicationInfo = + PackageUtils.getApplicationInfoAsUser(mPackageName, user, context); + if (applicationInfo == null) { + Log.w(LOG_TAG, "Cannot get ApplicationInfo for package: " + mPackageName); + return false; + } + if ((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) { + Log.w(LOG_TAG, "Package didn't specify a signing certificate and isn't a" + + " system app: " + mPackageName); + return false; + } + } + return true; + } + + /** + * Checks whether an {@link ApplicationInfo} matches this signed package, i.e. it has the same + * package name, and either has the specified signing certificate or is a system app if no + * signing certificate is specified. + * + * @param applicationInfo the {@link ApplicationInfo} to check for + * @param context the {@code Context} to retrieve system services + * + * @return whether the {@link ApplicationInfo} matches this signed package + */ + public boolean matches(@NonNull ApplicationInfo applicationInfo, @NonNull Context context) { + if (!Objects.equals(applicationInfo.packageName, mPackageName)) { + return false; + } + if (mCertificate != null) { + UserHandle user = UserHandle.getUserHandleForUid(applicationInfo.uid); + if (!PackageUtils.hasSigningCertificateAsUser(mPackageName, mCertificate, user, + context)) { + Log.w(LOG_TAG, "Package doesn't have required signing certificate: " + + mPackageName); + return false; + } + } else { + if ((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) { + Log.w(LOG_TAG, "Package didn't specify a signing certificate and isn't a" + + " system app: " + mPackageName); + return false; + } + } + return true; + } +} diff --git a/PermissionController/role-controller/java/com/android/role/controller/util/SignedPackageUtils.java b/PermissionController/role-controller/java/com/android/role/controller/util/SignedPackageUtils.java new file mode 100644 index 000000000..169bed347 --- /dev/null +++ b/PermissionController/role-controller/java/com/android/role/controller/util/SignedPackageUtils.java @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2025 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.role.controller.util; + +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.os.UserHandle; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import java.util.ArrayList; +import java.util.List; + +/** + * Utility methods about {@link SignedPackage}. + */ +public final class SignedPackageUtils { + + private SignedPackageUtils() {} + + /** + * Get a list of package names from a string input for {@link SignedPackage}s. + * <p> + * This method only returns packages that are + * {@link SignedPackage#isAvailableAsUser(UserHandle, Context) available}. + * + * @param input the string input + * @param user the user of the packages + * @param context the {@code Context} to retrieve system services + * + * @return the package names + */ + @NonNull + public static List<String> getPackageNamesAsUser(@NonNull String input, + @NonNull UserHandle user, @NonNull Context context) { + List<SignedPackage> signedPackages = SignedPackage.parseList(input); + List<String> packageNames = new ArrayList<>(); + int signedPackagesSize = signedPackages.size(); + for (int i = 0; i < signedPackagesSize; i++) { + SignedPackage signedPackage = signedPackages.get(i); + if (signedPackage.isAvailableAsUser(user, context)) { + packageNames.add(signedPackage.getPackageName()); + } + } + return packageNames; + } + + /** + * Get a package name from a string input for a {@link SignedPackage}. + * <p> + * This method only returns a package if it is + * {@link SignedPackage#isAvailableAsUser(UserHandle, Context) available}. + * + * @param input the string input + * @param user the user of the package + * @param context the {@code Context} to retrieve system services + * + * @return the package name, or {@code null} otherwise + */ + @Nullable + public static String getPackageNameAsUser(@NonNull String input, @NonNull UserHandle user, + @NonNull Context context) { + SignedPackage signedPackage = SignedPackage.parse(input); + if (signedPackage == null || !signedPackage.isAvailableAsUser(user, context)) { + return null; + } + return signedPackage.getPackageName(); + } + + /** + * Check whether an {@link ApplicationInfo} matches any of the {@link SignedPackage}s. + * + * @param applicationInfo the {@link ApplicationInfo} to check for + * @param signedPackages the list of {@link SignedPackage}s to check against + * @param context the {@code Context} to retrieve system services + * + * @return whether the {@link ApplicationInfo} matches any of the {@link SignedPackage}s + */ + public static boolean matchesAny(@NonNull ApplicationInfo applicationInfo, + @NonNull List<SignedPackage> signedPackages, @NonNull Context context) { + int signedPackagesSize = signedPackages.size(); + for (int i = 0; i < signedPackagesSize; i++) { + SignedPackage signedPackage = signedPackages.get(i); + if (signedPackage.matches(applicationInfo, context)) { + return true; + } + } + return false; + } +} diff --git a/PermissionController/role-controller/java/com/android/role/controller/util/UserUtils.java b/PermissionController/role-controller/java/com/android/role/controller/util/UserUtils.java index f3cb7926a..00ec67569 100644 --- a/PermissionController/role-controller/java/com/android/role/controller/util/UserUtils.java +++ b/PermissionController/role-controller/java/com/android/role/controller/util/UserUtils.java @@ -18,7 +18,6 @@ package com.android.role.controller.util; import android.content.Context; import android.os.Build; -import android.os.Flags; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; @@ -28,6 +27,9 @@ import androidx.annotation.Nullable; import com.android.modules.utils.build.SdkLevel; +import java.util.ArrayList; +import java.util.List; + /** Utility class to deal with Android users. */ public final class UserUtils { @@ -88,7 +90,7 @@ public final class UserUtils { * allowed from Android V+ only, so this method will return false on Sdk levels below that. */ public static boolean isPrivateProfile(@NonNull UserHandle user, @NonNull Context context) { - if (!SdkLevel.isAtLeastV() || !Flags.allowPrivateProfile()) { + if (!SdkLevel.isAtLeastV()) { return false; } Context userContext = getUserContext(context, user); @@ -127,9 +129,36 @@ public final class UserUtils { /** Returns the parent of a given user. */ @Nullable - private static UserHandle getProfileParent(UserHandle user, @NonNull Context context) { + public static UserHandle getProfileParent(UserHandle user, @NonNull Context context) { Context userContext = getUserContext(context, user); UserManager userManager = userContext.getSystemService(UserManager.class); return userManager.getProfileParent(user); } + + /** + * Returns all the enabled user profiles on the device + * + * @param user the {@link UserHandle} to get profiles for + * @param context the {@link Context} + * @param excludePrivate {@code true} to exclude private profiles from returned list of users + */ + @NonNull + public static List<UserHandle> getUserProfiles(@NonNull UserHandle user, + @NonNull Context context, boolean excludePrivate) { + Context userContext = getUserContext(context, user); + UserManager userUserManager = userContext.getSystemService(UserManager.class); + List<UserHandle> profiles = userUserManager.getUserProfiles(); + if (!excludePrivate) { + return profiles; + } + List<UserHandle> filteredProfiles = new ArrayList<>(); + final int profilesSize = profiles.size(); + for (int i = 0; i < profilesSize; i++) { + UserHandle profile = profiles.get(i); + if (!isPrivateProfile(profile, userContext)) { + filteredProfiles.add(profile); + } + } + return filteredProfiles; + } } diff --git a/PermissionController/src/com/android/permissioncontroller/appops/data/repository/v31/AppOpRepository.kt b/PermissionController/src/com/android/permissioncontroller/appops/data/repository/v31/AppOpRepository.kt index 3057f05e9..7a59aa2bc 100644 --- a/PermissionController/src/com/android/permissioncontroller/appops/data/repository/v31/AppOpRepository.kt +++ b/PermissionController/src/com/android/permissioncontroller/appops/data/repository/v31/AppOpRepository.kt @@ -27,7 +27,6 @@ import android.app.AppOpsManager.OP_FLAG_TRUSTED_PROXIED import android.app.AppOpsManager.OP_FLAG_TRUSTED_PROXY import android.app.Application import android.os.UserHandle -import android.permission.flags.Flags import android.util.Log import com.android.modules.utils.build.SdkLevel import com.android.permissioncontroller.DeviceUtils @@ -74,7 +73,7 @@ interface AppOpRepository { */ fun getDiscreteOps( opNames: List<String>, - coroutineScope: CoroutineScope + coroutineScope: CoroutineScope, ): Flow<List<DiscretePackageOpsModel>> companion object { @@ -82,7 +81,7 @@ interface AppOpRepository { fun getInstance( application: Application, - permissionRepository: PermissionRepository + permissionRepository: PermissionRepository, ): AppOpRepository = instance ?: synchronized(this) { @@ -104,7 +103,7 @@ class AppOpRepositoryImpl( override fun getDiscreteOps( opNames: List<String>, - coroutineScope: CoroutineScope + coroutineScope: CoroutineScope, ): Flow<List<DiscretePackageOpsModel>> { return callbackFlow { var job: Job? = null @@ -112,7 +111,7 @@ class AppOpRepositoryImpl( fun sendUpdate() { if (job == null || job?.isActive == false) { - job = coroutineScope.launch { trySend(getDiscreteOps(opNames)) } + job = coroutineScope.launch(dispatcher) { trySend(getDiscreteOps(opNames)) } } } @@ -227,10 +226,10 @@ class AppOpRepositoryImpl( packageOps.ops.map { opEntry -> AppOpUsageModel( opEntry.opStr, - opEntry.getLastAccessTime(OPS_LAST_ACCESS_FLAGS) + opEntry.getLastAccessTime(OPS_LAST_ACCESS_FLAGS), ) }, - UserHandle.getUserHandleForUid(packageOps.uid).identifier + UserHandle.getUserHandleForUid(packageOps.uid).identifier, ) } } @@ -252,7 +251,7 @@ class AppOpRepositoryImpl( if (SdkLevel.isAtLeastT()) { opNames.add(AppOpsManager.OPSTR_RECEIVE_AMBIENT_TRIGGER_AUDIO) } - if (SdkLevel.isAtLeastV() && Flags.locationBypassPrivacyDashboardEnabled()) { + if (SdkLevel.isAtLeastV()) { opNames.add(AppOpsManager.OPSTR_EMERGENCY_LOCATION) } return opNames diff --git a/PermissionController/src/com/android/permissioncontroller/ecm/EnhancedConfirmationDialogActivity.kt b/PermissionController/src/com/android/permissioncontroller/ecm/EnhancedConfirmationDialogActivity.kt index e6cf094e3..c5191938e 100644 --- a/PermissionController/src/com/android/permissioncontroller/ecm/EnhancedConfirmationDialogActivity.kt +++ b/PermissionController/src/com/android/permissioncontroller/ecm/EnhancedConfirmationDialogActivity.kt @@ -55,6 +55,7 @@ import com.android.role.controller.model.Roles class EnhancedConfirmationDialogActivity : FragmentActivity() { companion object { private const val KEY_WAS_CLEAR_RESTRICTION_ALLOWED = "KEY_WAS_CLEAR_RESTRICTION_ALLOWED" + private const val REASON_PHONE_STATE = "phone_state" } private var wasClearRestrictionAllowed: Boolean = false @@ -77,6 +78,7 @@ class EnhancedConfirmationDialogActivity : FragmentActivity() { val packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME) val settingIdentifier = intent.getStringExtra(Intent.EXTRA_SUBJECT) val isEcmInApp = intent.getBooleanExtra(EXTRA_IS_ECM_IN_APP, false) + val reason = intent.getStringExtra(Intent.EXTRA_REASON) require(uid != Process.INVALID_UID) { "EXTRA_UID cannot be null or invalid" } require(!packageName.isNullOrEmpty()) { "EXTRA_PACKAGE_NAME cannot be null or empty" } @@ -84,9 +86,9 @@ class EnhancedConfirmationDialogActivity : FragmentActivity() { wasClearRestrictionAllowed = setClearRestrictionAllowed(packageName, UserHandle.getUserHandleForUid(uid)) - val setting = Setting.fromIdentifier(this, settingIdentifier, isEcmInApp) + val setting = Setting.fromIdentifier(this, settingIdentifier, isEcmInApp, reason) if ( - SettingType.fromIdentifier(this, settingIdentifier, isEcmInApp) == + SettingType.fromIdentifier(this, settingIdentifier, isEcmInApp, reason) == SettingType.BLOCKED_DUE_TO_PHONE_STATE && !Flags.unknownCallPackageInstallBlockingEnabled() ) { @@ -127,8 +129,10 @@ class EnhancedConfirmationDialogActivity : FragmentActivity() { context: Context, settingIdentifier: String, isEcmInApp: Boolean, + reason: String?, ): Setting { - val settingType = SettingType.fromIdentifier(context, settingIdentifier, isEcmInApp) + val settingType = + SettingType.fromIdentifier(context, settingIdentifier, isEcmInApp, reason) val label = when (settingType) { SettingType.PLATFORM_PERMISSION -> @@ -149,7 +153,8 @@ class EnhancedConfirmationDialogActivity : FragmentActivity() { var message: CharSequence? if (settingType == SettingType.BLOCKED_DUE_TO_PHONE_STATE) { title = settingType.titleRes?.let { context.getString(it) } - message = settingType.messageRes?.let { context.getString(it) } + val settingMessage = getPhoneStateSettingMessage(context, settingIdentifier) + message = settingType.messageRes?.let { context.getString(it, settingMessage) } } else { val url = context.getString(R.string.help_url_action_disabled_by_restricted_settings) @@ -159,6 +164,21 @@ class EnhancedConfirmationDialogActivity : FragmentActivity() { } return Setting(title, message) } + + private fun getPhoneStateSettingMessage( + context: Context, + settingsIdentifier: String, + ): String { + return context.getString( + when (settingsIdentifier) { + AppOpsManager.OPSTR_BIND_ACCESSIBILITY_SERVICE -> + R.string.enhanced_confirmation_phone_state_dialog_a11y_desc + AppOpsManager.OPSTR_REQUEST_INSTALL_PACKAGES -> + R.string.enhanced_confirmation_phone_state_dialog_install_desc + else -> R.string.enhanced_confirmation_phone_state_dialog_generic_desc + } + ) + } } } @@ -189,10 +209,10 @@ class EnhancedConfirmationDialogActivity : FragmentActivity() { context: Context, settingIdentifier: String, isEcmInApp: Boolean, + restrictionReason: String?, ): SettingType { return when { - settingIdentifier == AppOpsManager.OPSTR_REQUEST_INSTALL_PACKAGES -> - BLOCKED_DUE_TO_PHONE_STATE + restrictionReason == REASON_PHONE_STATE -> BLOCKED_DUE_TO_PHONE_STATE !isEcmInApp -> OTHER PermissionMapping.isRuntimePlatformPermission(settingIdentifier) && PermissionMapping.getGroupOfPlatformPermission(settingIdentifier) != null -> @@ -257,7 +277,7 @@ class EnhancedConfirmationDialogActivity : FragmentActivity() { return AlertDialog.Builder(dialogActivity) .setView(createDialogView(dialogActivity, title, message)) - .setPositiveButton(R.string.enhanced_confirmation_dialog_ok) { _, _ -> + .setPositiveButton(R.string.dialog_close) { _, _ -> dialogActivity.onDialogResult(DialogResult.Okay) } .create() diff --git a/PermissionController/src/com/android/permissioncontroller/incident/wear/WearConfirmationScreen.kt b/PermissionController/src/com/android/permissioncontroller/incident/wear/WearConfirmationScreen.kt index 8e58d48d9..2428abb4a 100644 --- a/PermissionController/src/com/android/permissioncontroller/incident/wear/WearConfirmationScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/incident/wear/WearConfirmationScreen.kt @@ -29,14 +29,15 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.ComposeView -import androidx.wear.compose.foundation.lazy.ScalingLazyListState import androidx.wear.compose.material.CircularProgressIndicator -import com.android.permissioncontroller.permission.ui.wear.elements.AlertDialog -import com.android.permissioncontroller.permission.ui.wear.elements.SingleButtonAlertDialog -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionTheme +import com.android.permissioncontroller.wear.permission.components.material3.DialogButtonContent +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionConfirmationDialog +import com.android.permissioncontroller.wear.permission.components.theme.ResourceHelper +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionTheme @Composable fun WearConfirmationScreen(viewModel: WearConfirmationActivityViewModel) { + val materialUIVersion = ResourceHelper.materialUIVersionInSettings // Wear screen doesn't show incident/bug report's optional reasons and images. val showDialog = viewModel.showDialogLiveData.observeAsState(false) val showDenyReport = viewModel.showDenyReportLiveData.observeAsState(false) @@ -47,27 +48,25 @@ fun WearConfirmationScreen(viewModel: WearConfirmationActivityViewModel) { if (isLoading) { CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) } else { - if (showDenyReport.value) { - contentArgs.value?.let { - SingleButtonAlertDialog( - showDialog = showDialog.value, - title = it.title, - message = it.message, - onButtonClick = it.onDenyClick, - scalingLazyListState = ScalingLazyListState(0) + contentArgs.value?.apply { + if (showDenyReport.value) { + WearPermissionConfirmationDialog( + materialUIVersion = materialUIVersion, + show = showDialog.value, + title = title, + message = message, + positiveButtonContent = DialogButtonContent(onClick = onDenyClick), + ) + } else { + WearPermissionConfirmationDialog( + materialUIVersion = materialUIVersion, + show = showDialog.value, + title = title, + message = message, + positiveButtonContent = DialogButtonContent(onClick = onOkClick), + negativeButtonContent = DialogButtonContent(onClick = onCancelClick), ) } - return - } - contentArgs.value?.let { - AlertDialog( - showDialog = showDialog.value, - title = it.title, - message = it.message, - onOKButtonClick = it.onOkClick, - onCancelButtonClick = it.onCancelClick, - scalingLazyListState = ScalingLazyListState(0) - ) } } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/compat/AppPermissionFragmentCompat.java b/PermissionController/src/com/android/permissioncontroller/permission/compat/AppPermissionFragmentCompat.java index de7404ead..50e3688e2 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/compat/AppPermissionFragmentCompat.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/compat/AppPermissionFragmentCompat.java @@ -44,8 +44,8 @@ public class AppPermissionFragmentCompat { */ @NonNull public static PreferenceFragmentCompat createFragment(@NonNull Context context) { - if (SdkLevel.isAtLeastV() && (Flags.appPermissionFragmentUsesPreferences() - || context.getResources().getBoolean( + if ((SdkLevel.isAtLeastB() && Flags.appPermissionFragmentUsesPreferences()) + || (SdkLevel.isAtLeastV() && context.getResources().getBoolean( R.bool.config_usePreferenceForAppPermissionSettings))) { return new AppPermissionFragment(); } else { diff --git a/PermissionController/src/com/android/permissioncontroller/permission/data/AppPermGroupUiInfoLiveData.kt b/PermissionController/src/com/android/permissioncontroller/permission/data/AppPermGroupUiInfoLiveData.kt index 394cb3eb7..ad356d5f7 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/data/AppPermGroupUiInfoLiveData.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/data/AppPermGroupUiInfoLiveData.kt @@ -18,6 +18,7 @@ package com.android.permissioncontroller.permission.data import android.Manifest import android.Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED +import android.Manifest.permission_group.READ_MEDIA_VISUAL import android.Manifest.permission_group.STORAGE import android.app.AppOpsManager import android.app.Application @@ -66,13 +67,8 @@ private constructor( private val isHealth = Utils.isHealthPermissionGroup(permGroupName) init { - isSpecialLocation = - LocationUtils.isLocationGroupAndProvider(app, permGroupName, packageName) || - LocationUtils.isLocationGroupAndControllerExtraPackage( - app, - permGroupName, - packageName - ) + isSpecialLocation = LightAppPermGroupLiveData + .isSpecialLocationGranted(app, packageName, permGroupName, user) != null addSource(packageInfoLiveData) { update() } @@ -258,9 +254,14 @@ private constructor( allPermInfos: Map<String, LightPermInfo>, pkg: LightPackageInfo ): PermGrantState { - val specialLocationState = getIsSpecialLocationState() + val specialLocationState = LightAppPermGroupLiveData + .isSpecialLocationGranted(app, packageName, permGroupName, user) + val specialFixedStorage = LightAppPermGroupLiveData + .isSpecialFixedStorageGranted(app, packageName, permGroupName, pkg.uid) if (isStorage && isFullFilesAccessGranted(pkg)) { return PermGrantState.PERMS_ALLOWED + } else if (permGroupName == READ_MEDIA_VISUAL && specialFixedStorage) { + return PermGrantState.PERMS_ALLOWED } var hasPermWithBackground = false @@ -332,29 +333,6 @@ private constructor( return PermGrantState.PERMS_DENIED } - private fun getIsSpecialLocationState(): Boolean? { - if (!isSpecialLocation) { - return null - } - - val userContext = Utils.getUserContext(app, user) - if (LocationUtils.isLocationGroupAndProvider(userContext, permGroupName, packageName)) { - return LocationUtils.isLocationEnabled(userContext) - } - // The permission of the extra location controller package is determined by the - // status of the controller package itself. - if ( - LocationUtils.isLocationGroupAndControllerExtraPackage( - userContext, - permGroupName, - packageName - ) - ) { - return LocationUtils.isExtraLocationControllerPackageEnabled(userContext) - } - return null - } - private fun isFullFilesAccessGranted(pkg: LightPackageInfo): Boolean { val packageState = if (!FullStoragePermissionAppsLiveData.isStale) { diff --git a/PermissionController/src/com/android/permissioncontroller/permission/data/LightAppPermGroupLiveData.kt b/PermissionController/src/com/android/permissioncontroller/permission/data/LightAppPermGroupLiveData.kt index 67b765097..d66d6ec6c 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/data/LightAppPermGroupLiveData.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/data/LightAppPermGroupLiveData.kt @@ -16,7 +16,13 @@ package com.android.permissioncontroller.permission.data +import android.Manifest.permission_group.READ_MEDIA_VISUAL +import android.Manifest.permission_group.STORAGE +import android.app.AppOpsManager +import android.app.AppOpsManager.MODE_ALLOWED +import android.app.AppOpsManager.OPSTR_WRITE_MEDIA_IMAGES import android.app.Application +import android.app.role.RoleManager import android.content.pm.PackageManager import android.content.pm.PermissionInfo import android.os.Build @@ -121,19 +127,6 @@ private constructor( LightPermission(packageInfo, permInfo, permState, foregroundPerms) } - // Determine if this app permission group is a special location package or provider - var specialLocationGrant: Boolean? = null - val userContext = Utils.getUserContext(app, user) - if (LocationUtils.isLocationGroupAndProvider(userContext, permGroupName, packageName)) { - specialLocationGrant = LocationUtils.isLocationEnabled(userContext) - } else if ( - LocationUtils.isLocationGroupAndControllerExtraPackage(app, permGroupName, packageName) - ) { - // The permission of the extra location controller package is determined by the status - // of the controller package itself. - specialLocationGrant = - LocationUtils.isExtraLocationControllerPackageEnabled(userContext) - } val hasInstallToRuntimeSplit = hasInstallToRuntimeSplit(packageInfo, permissionMap) value = @@ -142,7 +135,8 @@ private constructor( permGroup.groupInfo, permissionMap, hasInstallToRuntimeSplit, - specialLocationGrant + isSpecialLocationGranted(app, packageName, permGroupName, user), + isSpecialFixedStorageGranted(app, packageName, permGroupName, packageInfo.uid) ) } @@ -234,5 +228,56 @@ private constructor( deviceId ) } + + private const val SYSTEM_GALLERY_ROLE_NAME = "android.app.role.SYSTEM_GALLERY" + + // Returns true if this app is the location provider or location extra package, and location + // access is granted, false if it is the provider/extra, and location is not granted, and + // null if it is not a special package + fun isSpecialLocationGranted( + app: Application, + packageName: String, + permGroupName: String, + user: UserHandle + ): Boolean? { + val userContext = Utils.getUserContext(app, user) + return if ( + LocationUtils.isLocationGroupAndProvider(userContext, permGroupName, packageName) + ) { + LocationUtils.isLocationEnabled(userContext) + } else if ( + LocationUtils.isLocationGroupAndControllerExtraPackage(app, permGroupName, packageName) + ) { + // The permission of the extra location controller package is determined by the status + // of the controller package itself. + LocationUtils.isExtraLocationControllerPackageEnabled(userContext) + } else { + null + } + } + + // Gallery role is static, so we only need to get the set gallery app once + private val systemGalleryApps: List<String> by lazy { + val roleManager = PermissionControllerApplication.get() + .getSystemService(RoleManager::class.java) ?: return@lazy emptyList() + roleManager.getRoleHolders(SYSTEM_GALLERY_ROLE_NAME) + } + + fun isSpecialFixedStorageGranted( + app: Application, + packageName: String, + permGroupName: String, + uid: Int + ): Boolean { + if (permGroupName != READ_MEDIA_VISUAL && permGroupName != STORAGE) { + return false + } + if (packageName !in systemGalleryApps) { + return false + } + // This is the storage group, and the gallery app. Check the write media app op + val appOps = app.getSystemService(AppOpsManager::class.java) + return appOps.checkOpNoThrow(OPSTR_WRITE_MEDIA_IMAGES, uid, packageName) == MODE_ALLOWED + } } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/data/v31/AllLightHistoricalPackageOpsLiveData.kt b/PermissionController/src/com/android/permissioncontroller/permission/data/v31/AllLightHistoricalPackageOpsLiveData.kt deleted file mode 100644 index a3fc40232..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/data/v31/AllLightHistoricalPackageOpsLiveData.kt +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Copyright (C) 2022 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.permissioncontroller.permission.data.v31 - -import android.app.AppOpsManager -import android.app.AppOpsManager.HISTORY_FLAG_DISCRETE -import android.app.AppOpsManager.HISTORY_FLAG_GET_ATTRIBUTION_CHAINS -import android.app.AppOpsManager.HistoricalOps -import android.app.AppOpsManager.HistoricalOpsRequest -import android.app.AppOpsManager.OP_FLAG_SELF -import android.app.AppOpsManager.OP_FLAG_TRUSTED_PROXIED -import android.app.Application -import android.os.UserHandle -import android.os.UserManager -import com.android.modules.utils.build.SdkLevel -import com.android.permissioncontroller.permission.data.SmartAsyncMediatorLiveData -import com.android.permissioncontroller.permission.model.livedatatypes.v31.LightHistoricalPackageOps -import java.util.concurrent.TimeUnit -import kotlin.coroutines.suspendCoroutine -import kotlinx.coroutines.Job - -/** - * LiveData class tracking [LightHistoricalPackageOps] for all packages on the device and for the - * provided app ops. - * - * App ops data is retrieved from [AppOpsManager] and is updated whenever app ops data changes are - * heard. - */ -class AllLightHistoricalPackageOpsLiveData(app: Application, val opNames: Set<String>) : - SmartAsyncMediatorLiveData<Map<Pair<String, UserHandle>, LightHistoricalPackageOps>>(), - AppOpsManager.OnOpActiveChangedListener, - AppOpsManager.OnOpNotedListener, - AppOpsManager.OnOpChangedListener { - - private val appOpsManager = app.getSystemService(AppOpsManager::class.java)!! - private val userManager = app.getSystemService(UserManager::class.java)!! - - override fun onActive() { - super.onActive() - - opNames.forEach { opName -> - // TODO(b/262035952): We watch each active op individually as startWatchingActive only - // registers the callback if all ops are valid. Fix this behavior so if one op is - // invalid it doesn't affect the other ops. - try { - appOpsManager.startWatchingActive(arrayOf(opName), { it.run() }, this) - } catch (ignored: IllegalArgumentException) { - // Older builds may not support all requested app ops. - } - - try { - appOpsManager.startWatchingMode(opName, /* all packages */ null, this) - } catch (ignored: IllegalArgumentException) { - // Older builds may not support all requested app ops. - } - - if (SdkLevel.isAtLeastU()) { - try { - appOpsManager.startWatchingNoted(arrayOf(opName), this) - } catch (ignored: IllegalArgumentException) { - // Older builds may not support all requested app ops. - } - } - } - } - - override fun onInactive() { - super.onInactive() - - appOpsManager.stopWatchingActive(this) - appOpsManager.stopWatchingMode(this) - } - - override suspend fun loadDataAndPostValue(job: Job) { - if (job.isCancelled) { - return - } - - val allLightHistoricalPackageOps = - mutableMapOf<Pair<String, UserHandle>, LightHistoricalPackageOps>() - - val endTimeMillis = System.currentTimeMillis() - val beginTimeMillis = endTimeMillis - TimeUnit.DAYS.toMillis(7) - - val allProfilesInCurrentUser = userManager.userProfiles - - val request = - HistoricalOpsRequest.Builder(beginTimeMillis, endTimeMillis) - .setFlags(OP_FLAG_SELF or OP_FLAG_TRUSTED_PROXIED) - .setHistoryFlags(HISTORY_FLAG_DISCRETE or HISTORY_FLAG_GET_ATTRIBUTION_CHAINS) - .build() - - val historicalOps = suspendCoroutine { - appOpsManager.getHistoricalOps(request, { it.run() }) { ops: HistoricalOps -> - it.resumeWith(Result.success(ops)) - } - } - - for (i in 0 until historicalOps.uidCount) { - val historicalUidOps = historicalOps.getUidOpsAt(i) - val userHandle = UserHandle.getUserHandleForUid(historicalUidOps.uid) - if (userHandle !in allProfilesInCurrentUser) { - continue - } - for (j in 0 until historicalUidOps.packageCount) { - val historicalPackageOps = historicalUidOps.getPackageOpsAt(j) - allLightHistoricalPackageOps[Pair(historicalPackageOps.packageName, userHandle)] = - LightHistoricalPackageOps(historicalPackageOps, userHandle, opNames) - } - } - - postValue(allLightHistoricalPackageOps) - } - - override fun onOpChanged(op: String?, packageName: String?) { - update() - } - - override fun onOpActiveChanged(op: String, uid: Int, packageName: String, active: Boolean) { - update() - } - - override fun onOpNoted( - code: String, - uid: Int, - packageName: String, - attributionTag: String?, - flags: Int, - result: Int - ) { - update() - } -} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/domain/usecase/v31/GetPermissionGroupUsageDetailsUseCase.kt b/PermissionController/src/com/android/permissioncontroller/permission/domain/usecase/v31/GetPermissionGroupUsageDetailsUseCase.kt index 5ba649fd3..cc49b4ef3 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/domain/usecase/v31/GetPermissionGroupUsageDetailsUseCase.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/domain/usecase/v31/GetPermissionGroupUsageDetailsUseCase.kt @@ -227,8 +227,7 @@ class GetPermissionGroupUsageDetailsUseCase( } } - private fun isLocationByPassEnabled(): Boolean = - SdkLevel.isAtLeastV() && Flags.locationBypassPrivacyDashboardEnabled() + private fun isLocationByPassEnabled(): Boolean = SdkLevel.isAtLeastV() /** * Determine if an op should be in its own cluster and hence display as an individual entry in diff --git a/PermissionController/src/com/android/permissioncontroller/permission/domain/usecase/v31/PermissionUsageUtils.kt b/PermissionController/src/com/android/permissioncontroller/permission/domain/usecase/v31/PermissionUsageUtils.kt index 7f5910ac1..9526d0bdd 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/domain/usecase/v31/PermissionUsageUtils.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/domain/usecase/v31/PermissionUsageUtils.kt @@ -21,7 +21,6 @@ import android.content.pm.ApplicationInfo import android.content.pm.PackageInfo import android.content.pm.PackageManager import android.os.UserHandle -import android.permission.flags.Flags import androidx.annotation.VisibleForTesting import com.android.modules.utils.build.SdkLevel import com.android.permissioncontroller.permission.data.repository.v31.PermissionRepository @@ -99,5 +98,4 @@ private fun isTelecomPackage(packageName: String, permissionGroup: String): Bool permissionGroup == Manifest.permission_group.MICROPHONE) } -fun isLocationByPassEnabled(): Boolean = - SdkLevel.isAtLeastV() && Flags.locationBypassPrivacyDashboardEnabled() +fun isLocationByPassEnabled(): Boolean = SdkLevel.isAtLeastV() diff --git a/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/LightAppPermGroup.kt b/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/LightAppPermGroup.kt index 61a604de8..18f4ce203 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/LightAppPermGroup.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/LightAppPermGroup.kt @@ -35,19 +35,24 @@ import com.android.permissioncontroller.permission.utils.Utils * @param specialLocationGrant If this package is the location provider, or the extra location * package, then the grant state of the group is not determined by the grant state of individual * permissions, but by other system properties + * @param specialFixedStorageGrant If this package holds the SYSTEM_GALLERY role, and has the + * WRITE_MEDIA_IMAGES app op granted, then we should show the grant state of the storage + * permissions as system fixed and granted. + * */ data class LightAppPermGroup( val packageInfo: LightPackageInfo, val permGroupInfo: LightPermGroupInfo, val allPermissions: Map<String, LightPermission>, val hasInstallToRuntimeSplit: Boolean, - val specialLocationGrant: Boolean? + val specialLocationGrant: Boolean?, + val specialFixedStorageGrant: Boolean, ) { constructor( pI: LightPackageInfo, pGI: LightPermGroupInfo, perms: Map<String, LightPermission> - ) : this(pI, pGI, perms, false, null) + ) : this(pI, pGI, perms, false, null, false) /** All unrestricted permissions. Usually restricted permissions are ignored */ val permissions: Map<String, LightPermission> = @@ -83,7 +88,8 @@ data class LightAppPermGroup( permissions.filter { it.key in foregroundPermNames }, packageInfo, isPlatformPermissionGroup, - specialLocationGrant + specialLocationGrant, + specialFixedStorageGrant ) val background = @@ -91,7 +97,8 @@ data class LightAppPermGroup( permissions.filter { it.key in backgroundPermNames }, packageInfo, isPlatformPermissionGroup, - specialLocationGrant + specialLocationGrant, + specialFixedStorageGrant ) /** Whether or not this App Permission Group has a permission which has a background mode */ @@ -167,18 +174,20 @@ data class LightAppPermGroup( * contained in the full group * @param isPlatformPermissionGroup Whether this is a platform permission group * @param specialLocationGrant Whether this is a special location package + * @param specialFixedStorageGrant Whether this is a special storage grant */ data class AppPermSubGroup internal constructor( private val permissions: Map<String, LightPermission>, private val packageInfo: LightPackageInfo, private val isPlatformPermissionGroup: Boolean, - private val specialLocationGrant: Boolean? + private val specialLocationGrant: Boolean?, + private val specialFixedStorageGrant: Boolean ) { /** Whether any of this App Permission SubGroup's permissions are granted */ val isGranted = specialLocationGrant - ?: permissions.any { + ?: specialFixedStorageGrant || permissions.any { val mayGrantByPlatformOrSystem = !isPlatformPermissionGroup || it.value.isPlatformOrSystem it.value.isGranted && mayGrantByPlatformOrSystem @@ -216,7 +225,7 @@ data class LightAppPermGroup( val isPolicyFixed = permissions.any { it.value.isPolicyFixed } /** Whether any of this App Permission Subgroup's permissions are fixed by the system */ - val isSystemFixed = permissions.any { it.value.isSystemFixed } + val isSystemFixed = permissions.any { it.value.isSystemFixed } || specialFixedStorageGrant /** Whether any of this App Permission Subgroup's permissions are fixed by the user */ val isUserFixed = permissions.any { it.value.isUserFixed } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/AppPermissionId.kt b/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/AppPermissionId.kt deleted file mode 100644 index 061bcb8a3..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/AppPermissionId.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.android.permissioncontroller.permission.model.livedatatypes.v31 - -import android.os.UserHandle - -/** Identifier for an app permission group combination. */ -data class AppPermissionId( - val packageName: String, - val userHandle: UserHandle, - val permissionGroup: String, -) diff --git a/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/LightHistoricalPackageOps.kt b/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/LightHistoricalPackageOps.kt deleted file mode 100644 index 04cc8a796..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/LightHistoricalPackageOps.kt +++ /dev/null @@ -1,241 +0,0 @@ -/* - * Copyright (C) 2022 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.permissioncontroller.permission.model.livedatatypes.v31 - -import android.app.AppOpsManager.AttributedHistoricalOps -import android.app.AppOpsManager.AttributedOpEntry -import android.app.AppOpsManager.HistoricalOp -import android.app.AppOpsManager.HistoricalPackageOps -import android.app.AppOpsManager.OP_FLAG_SELF -import android.app.AppOpsManager.OP_FLAG_TRUSTED_PROXIED -import android.app.AppOpsManager.OP_FLAG_TRUSTED_PROXY -import android.app.AppOpsManager.OpEventProxyInfo -import android.os.UserHandle -import com.android.permissioncontroller.permission.utils.PermissionMapping.getPlatformPermissionGroupForOp - -/** - * Light version of [HistoricalPackageOps] class, tracking the last permission access for system - * permission groups. - */ -data class LightHistoricalPackageOps( - /** Name of the package. */ - val packageName: String, - /** [UserHandle] running the package. */ - val userHandle: UserHandle, - /** - * Data about permission accesses, one [AppPermissionDiscreteAccesses] for each permission - * group. - */ - // TODO(b/262042582): Consider removing this field and using attributed accesses aggregated over - // attribution tags instead. - val appPermissionDiscreteAccesses: List<AppPermissionDiscreteAccesses>, - /** - * Attributed data about permission accesses, one [AttributedAppPermissionDiscreteAccesses] for - * each permission group. - */ - val attributedAppPermissionDiscreteAccesses: List<AttributedAppPermissionDiscreteAccesses> -) { - constructor( - historicalPackageOps: HistoricalPackageOps, - userHandle: UserHandle, - opNames: Set<String> - ) : this( - historicalPackageOps.packageName, - userHandle, - historicalPackageOps.getAppPermissionDiscreteAccesses(userHandle, opNames), - historicalPackageOps.getAttributedAppPermissionDiscreteAccesses(userHandle, opNames), - ) - - /** Companion object for [LightHistoricalPackageOps]. */ - companion object { - /** String to represent the absence of an attribution tag. */ - const val NO_ATTRIBUTION_TAG = "no_attribution_tag" - /** String to represent the absence of a permission group. */ - private const val NO_PERM_GROUP = "no_perm_group" - private const val DISCRETE_ACCESS_OP_FLAGS = - OP_FLAG_SELF or OP_FLAG_TRUSTED_PROXIED or OP_FLAG_TRUSTED_PROXY - - /** - * Creates a list of [AppPermissionDiscreteAccesses] for the provided package, user and ops. - */ - private fun HistoricalPackageOps.getAppPermissionDiscreteAccesses( - userHandle: UserHandle, - opNames: Set<String> - ): List<AppPermissionDiscreteAccesses> { - val permissionsToOpNames = partitionOpsByPermission(opNames) - val appPermissionDiscreteAccesses = mutableListOf<AppPermissionDiscreteAccesses>() - for (permissionToOpNames in permissionsToOpNames.entries) { - this.getDiscreteAccesses(permissionToOpNames.value)?.let { - appPermissionDiscreteAccesses.add( - AppPermissionDiscreteAccesses( - AppPermissionId(packageName, userHandle, permissionToOpNames.key), - it - ) - ) - } - } - - return appPermissionDiscreteAccesses - } - - /** - * Creates a list of [AttributedAppPermissionDiscreteAccesses] for the provided package, - * user and ops. - */ - private fun HistoricalPackageOps.getAttributedAppPermissionDiscreteAccesses( - userHandle: UserHandle, - opNames: Set<String> - ): List<AttributedAppPermissionDiscreteAccesses> { - val permissionsToOpNames = partitionOpsByPermission(opNames) - val attributedAppPermissionDiscreteAccesses = - mutableMapOf<AppPermissionId, MutableMap<String, List<DiscreteAccess>>>() - - val attributedHistoricalOpsList = mutableListOf<AttributedHistoricalOps>() - for (i in 0 until attributedOpsCount) { - attributedHistoricalOpsList.add(getAttributedOpsAt(i)) - } - - for (permissionToOpNames in permissionsToOpNames.entries) { - attributedHistoricalOpsList.forEach { attributedHistoricalOps -> - attributedHistoricalOps.getDiscreteAccesses(permissionToOpNames.value)?.let { - discAccessData -> - val appPermissionId = - AppPermissionId(packageName, userHandle, permissionToOpNames.key) - if (!attributedAppPermissionDiscreteAccesses.containsKey(appPermissionId)) { - attributedAppPermissionDiscreteAccesses[appPermissionId] = - mutableMapOf() - } - attributedAppPermissionDiscreteAccesses[appPermissionId]?.put( - attributedHistoricalOps.tag ?: NO_ATTRIBUTION_TAG, - discAccessData - ) - } - } - } - - return attributedAppPermissionDiscreteAccesses.map { - AttributedAppPermissionDiscreteAccesses(it.key, it.value) - } - } - - /** - * Retrieves all discrete accesses for the provided op names, if any. - * - * Returns null if there are no accesses. - */ - private fun HistoricalPackageOps.getDiscreteAccesses( - opNames: List<String> - ): List<DiscreteAccess>? { - if (opCount == 0) { - return null - } - - val historicalOps = mutableListOf<HistoricalOp>() - for (opName in opNames) { - getOp(opName)?.let { historicalOps.add(it) } - } - - val discreteAccessList = mutableListOf<DiscreteAccess>() - historicalOps.forEach { - for (i in 0 until it.discreteAccessCount) { - val opEntry: AttributedOpEntry = it.getDiscreteAccessAt(i) - discreteAccessList.add( - DiscreteAccess( - it.opName, - opEntry.getLastAccessTime(DISCRETE_ACCESS_OP_FLAGS), - opEntry.getLastDuration(DISCRETE_ACCESS_OP_FLAGS), - opEntry.getLastProxyInfo(DISCRETE_ACCESS_OP_FLAGS) - ) - ) - } - } - - if (discreteAccessList.isEmpty()) { - return null - } - return discreteAccessList.sortedWith(compareBy { -it.accessTimeMs }) - } - - /** - * Retrieves all discrete accesses for the provided op names, if any. - * - * Returns null if there are no accesses. - */ - private fun AttributedHistoricalOps.getDiscreteAccesses( - opNames: List<String> - ): List<DiscreteAccess>? { - if (opCount == 0) { - return null - } - - val historicalOps = mutableListOf<HistoricalOp>() - for (opName in opNames) { - getOp(opName)?.let { historicalOps.add(it) } - } - - val discreteAccessList = mutableListOf<DiscreteAccess>() - historicalOps.forEach { - for (i in 0 until it.discreteAccessCount) { - val attributedOpEntry: AttributedOpEntry = it.getDiscreteAccessAt(i) - discreteAccessList.add( - DiscreteAccess( - it.opName, - attributedOpEntry.getLastAccessTime(DISCRETE_ACCESS_OP_FLAGS), - attributedOpEntry.getLastDuration(DISCRETE_ACCESS_OP_FLAGS), - attributedOpEntry.getLastProxyInfo(DISCRETE_ACCESS_OP_FLAGS) - ) - ) - } - } - - if (discreteAccessList.isEmpty()) { - return null - } - return discreteAccessList.sortedWith(compareBy { -it.accessTimeMs }) - } - - private fun partitionOpsByPermission(ops: Set<String>): Map<String, List<String>> = - ops.groupBy { getPlatformPermissionGroupForOp(it) ?: NO_PERM_GROUP } - .filter { it.key != NO_PERM_GROUP } - } - - /** - * Data class representing permissions accesses for a particular permission group by a - * particular package and user. - */ - data class AppPermissionDiscreteAccesses( - val appPermissionId: AppPermissionId, - val discreteAccesses: List<DiscreteAccess> - ) - - /** - * Data class representing permissions accesses for a particular permission group by a - * particular package and user, partitioned by attribution tag. - */ - data class AttributedAppPermissionDiscreteAccesses( - val appPermissionId: AppPermissionId, - val attributedDiscreteAccesses: Map<String, List<DiscreteAccess>> - ) - - /** Data class representing a discrete permission access. */ - data class DiscreteAccess( - val opName: String, - val accessTimeMs: Long, - val accessDurationMs: Long, - val proxy: OpEventProxyInfo? - ) -} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/LightPackageOps.kt b/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/LightPackageOps.kt deleted file mode 100644 index b65fda5ea..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/LightPackageOps.kt +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2022 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.permissioncontroller.permission.model.livedatatypes.v31 - -import android.app.AppOpsManager.OP_FLAG_SELF -import android.app.AppOpsManager.OP_FLAG_TRUSTED_PROXIED -import android.app.AppOpsManager.OP_FLAG_TRUSTED_PROXY -import android.app.AppOpsManager.PackageOps -import android.os.UserHandle -import com.android.permissioncontroller.permission.utils.PermissionMapping.getPlatformPermissionGroupForOp - -/** - * Light version of [PackageOps] class, tracking the last permission access for system permission - * groups. - */ -data class LightPackageOps( - /** Name of the package. */ - val packageName: String, - /** [UserHandle] running the package. */ - val userHandle: UserHandle, - /** - * Mapping of permission group name to the last access time of any op backing a permission in - * the group. - */ - val lastPermissionGroupAccessTimesMs: Map<String, Long> -) { - constructor( - ops: Set<String>, - packageOps: PackageOps - ) : this( - packageOps.packageName, - UserHandle.getUserHandleForUid(packageOps.uid), - createLastPermissionGroupAccessTimesMap(ops, packageOps) - ) - - /** Companion object for [LightPackageOps]. */ - companion object { - /** Flags to use for querying an op's last access time. */ - private const val OPS_LAST_ACCESS_FLAGS = - OP_FLAG_SELF or OP_FLAG_TRUSTED_PROXIED or OP_FLAG_TRUSTED_PROXY - - /** Creates a mapping from permission group to the last time it was accessed. */ - private fun createLastPermissionGroupAccessTimesMap( - opNames: Set<String>, - packageOps: PackageOps - ): Map<String, Long> { - val lastAccessTimeMs = mutableMapOf<String, Long>() - // Add keys for all permissions groups covered by the provided ops, regardless of - // whether they have been observed recently. - for (permissionGroup in - opNames.mapNotNull { getPlatformPermissionGroupForOp(it) }.toSet()) { - lastAccessTimeMs[permissionGroup] = -1 - } - - for (opEntry in packageOps.ops) { - val permissionGroupOfOp = getPlatformPermissionGroupForOp(opEntry.opStr) ?: continue - lastAccessTimeMs[permissionGroupOfOp] = - maxOf( - lastAccessTimeMs[permissionGroupOfOp] ?: -1, - opEntry.getLastAccessTime(OPS_LAST_ACCESS_FLAGS) - ) - } - - return lastAccessTimeMs - } - } -} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/RuntimePermissionsUpgradeController.kt b/PermissionController/src/com/android/permissioncontroller/permission/service/RuntimePermissionsUpgradeController.kt index 85145f346..184c37921 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/service/RuntimePermissionsUpgradeController.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/service/RuntimePermissionsUpgradeController.kt @@ -503,7 +503,8 @@ object RuntimePermissionsUpgradeController { bgApp.permGroupInfo, allPermissionsWithxemption, bgApp.hasInstallToRuntimeSplit, - bgApp.specialLocationGrant + bgApp.specialLocationGrant, + bgApp.specialFixedStorageGrant, ) } @@ -683,7 +684,8 @@ object RuntimePermissionsUpgradeController { bgSensorsGroup.permGroupInfo, allPermissionsWithExemption, bgSensorsGroup.hasInstallToRuntimeSplit, - bgSensorsGroup.specialLocationGrant + bgSensorsGroup.specialLocationGrant, + bgSensorsGroup.specialFixedStorageGrant, ) // Grant the background permission only if foreground permission is granted. diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java index c1479caf2..0dd07ffd0 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java @@ -262,6 +262,9 @@ public class GrantPermissionsActivity extends SettingsActivity if (DeviceUtils.isWear(this)) { // Do not grab input focus and hide keyboard. getWindow().addFlags(FLAG_ALT_FOCUSABLE_IM); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + overrideActivityTransition(OVERRIDE_TRANSITION_OPEN, 0, 0); + } } if (PackageManager.ACTION_REQUEST_PERMISSIONS_FOR_OTHER.equals(getIntent().getAction())) { @@ -308,10 +311,8 @@ public class GrantPermissionsActivity extends SettingsActivity PackageManager.EXTRA_REQUEST_PERMISSIONS_DEVICE_ID, ContextCompat.DEVICE_ID_DEFAULT); - if (mTargetDeviceId != ContextCompat.DEVICE_ID_DEFAULT) { - mPackageManager = ContextCompat.createDeviceContext(this, mTargetDeviceId) - .getPackageManager(); - } + mPackageManager = ContextCompat.createDeviceContext(this, mTargetDeviceId) + .getPackageManager(); // When the permission grant dialog is streamed to a virtual device, and when requested // permissions include both device-aware permissions and non-device aware permissions, @@ -334,21 +335,6 @@ public class GrantPermissionsActivity extends SettingsActivity new Intent(this, PermissionDialogStreamingBlockedActivity.class)); return; } - } else if (mTargetDeviceId != ContextCompat.DEVICE_ID_DEFAULT) { - // On the default device, when requested permissions are for a remote device, - // filter out non-device aware permissions. - for (int i = mRequestedPermissions.size() - 1; i >= 0; i--) { - if (!MultiDeviceUtils.isPermissionDeviceAware( - getApplicationContext(), - mTargetDeviceId, - mRequestedPermissions.get(i))) { - Log.e( - LOG_TAG, - "non-device aware permission is requested for a remote device: " - + mRequestedPermissions.get(i)); - mRequestedPermissions.remove(i); - } - } } } @@ -712,6 +698,18 @@ public class GrantPermissionsActivity extends SettingsActivity onRequestInfoLoad(mRequestInfos); return; } else if (info.getPrompt() == Prompt.NO_UI_HEALTH_REDIRECT) { + // Clear UI on current PermissionController screen to avoid flashing back to previous + // permission group UI when returned from Health&Fitness. + mViewHandler.updateUi( + /* groupName= */ "", + /* groupCount= */ 0, + /* groupIndex= */ 0, + /* icon= */ null, + /* message= */ "", + /* detailMessage= */ "", + /* permissionRationaleMessage= */ "", + /* buttonVisibilities= */ new boolean[] {}, + /* locationVisibilities=*/ new boolean[] {}); mViewModel.handleHealthConnectPermissions(this); return; } @@ -725,7 +723,7 @@ public class GrantPermissionsActivity extends SettingsActivity int dialogDisplayDeviceId = ContextCompat.getDeviceId(this); boolean isMessageDeviceAware = dialogDisplayDeviceId != ContextCompat.DEVICE_ID_DEFAULT - || dialogDisplayDeviceId != mTargetDeviceId; + || dialogDisplayDeviceId != info.getDeviceId(); int messageId = getMessageId(info.getGroupName(), info.getPrompt(), isMessageDeviceAware); CharSequence message = @@ -1117,17 +1115,9 @@ public class GrantPermissionsActivity extends SettingsActivity if ((mDelegated || (mViewModel != null && mViewModel.shouldReturnPermissionState())) && mTargetPackage != null) { - PackageManager defaultDevicePackageManager = SdkLevel.isAtLeastV() - && mTargetDeviceId != ContextCompat.DEVICE_ID_DEFAULT - ? createDeviceContext(ContextCompat.DEVICE_ID_DEFAULT).getPackageManager() - : mPackageManager; - PackageManager targetDevicePackageManager = mPackageManager; for (int i = 0; i < resultPermissions.length; i++) { String permission = resultPermissions[i]; - PackageManager pm = MultiDeviceUtils.isPermissionDeviceAware( - getApplicationContext(), mTargetDeviceId, permission) - ? targetDevicePackageManager : defaultDevicePackageManager; - grantResults[i] = pm.checkPermission(resultPermissions[i], mTargetPackage); + grantResults[i] = mPackageManager.checkPermission(permission, mTargetPackage); } } else { grantResults = new int[0]; diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java index 36917fbf1..0af7cf2ec 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java @@ -42,6 +42,7 @@ import android.os.Bundle; import android.os.Process; import android.os.UserHandle; import android.permission.PermissionManager; +import android.permission.flags.Flags; import android.provider.Settings; import android.safetycenter.SafetyCenterManager; import android.safetycenter.SafetyEvent; @@ -450,7 +451,15 @@ public final class ManagePermissionsActivity extends SettingsActivity { if (Utils.isHealthPermissionUiEnabled() && permissionGroupName .equals(HEALTH_PERMISSION_GROUP)) { - Utils.navigateToHealthConnectSettings(this); + // On Handheld, PrivacyDashboard and PermissionManager have the same UI. + // On Wear, PrivacyDashboard and PermissionManager have different UI, + // PermissionController needs to add an extra in the intent to instruct + // HealthConnect how to differentiate. + if (DeviceUtils.isWear(this) && Flags.replaceBodySensorPermissionEnabled()) { + Utils.navigateToWearHealthConnectSettingsPrivacyDashboard(this); + } else { + Utils.navigateToHealthConnectSettings(this); + } finishAfterTransition(); return; } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java index 026f108fa..39ca24a71 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java @@ -182,10 +182,8 @@ public class AutoAppPermissionFragment extends AutoSettingsFrameFragment if (SdkLevel.isAtLeastV()) { mSensorPrivacyManager = requireContext().getSystemService(SensorPrivacyManager.class); mCameraPrivacyAllowlist = mSensorPrivacyManager.getCameraPrivacyAllowlist(); - if (Flags.addBannersToPrivacySensitiveAppsForAaos()) { - mAutomotiveLocationBypassAllowlist = - LocationUtils.getAutomotiveLocationBypassAllowlist(requireContext()); - } + mAutomotiveLocationBypassAllowlist = + LocationUtils.getAutomotiveLocationBypassAllowlist(requireContext()); } } @@ -317,13 +315,11 @@ public class AutoAppPermissionFragment extends AutoSettingsFrameFragment if (Manifest.permission_group.CAMERA.equals(mPermGroupName)) { mViewModel.getSensorStatusLiveData().observe(this, this::setSensorStatus); } - if (Flags.addBannersToPrivacySensitiveAppsForAaos()) { - if (Manifest.permission_group.LOCATION.equals(mPermGroupName)) { - mViewModel.getSensorStatusLiveData().observe(this, this::setSensorStatus); - } - if (Manifest.permission_group.MICROPHONE.equals(mPermGroupName)) { - mViewModel.getSensorStatusLiveData().observe(this, this::setSensorStatus); - } + if (Manifest.permission_group.LOCATION.equals(mPermGroupName)) { + mViewModel.getSensorStatusLiveData().observe(this, this::setSensorStatus); + } + if (Manifest.permission_group.MICROPHONE.equals(mPermGroupName)) { + mViewModel.getSensorStatusLiveData().observe(this, this::setSensorStatus); } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/dashboard/AutoPermissionUsageDetailsFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/dashboard/AutoPermissionUsageDetailsFragment.kt index 8edd39913..2ecf40ce2 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/dashboard/AutoPermissionUsageDetailsFragment.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/dashboard/AutoPermissionUsageDetailsFragment.kt @@ -35,7 +35,6 @@ import com.android.permissioncontroller.R import com.android.permissioncontroller.auto.AutoSettingsFrameFragment import com.android.permissioncontroller.permission.ui.ManagePermissionsActivity import com.android.permissioncontroller.permission.ui.auto.AutoDividerPreference -import com.android.permissioncontroller.permission.ui.model.v31.BasePermissionUsageDetailsViewModel import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.AppPermissionAccessUiInfo import com.android.permissioncontroller.permission.utils.KotlinUtils.getPermGroupLabel @@ -80,7 +79,7 @@ class AutoPermissionUsageDetailsFragment : AutoSettingsFrameFragment() { private val SESSION_ID_KEY = (AutoPermissionUsageFragment::class.java.name + KEY_SESSION_ID) - private lateinit var usageViewModel: BasePermissionUsageDetailsViewModel + private lateinit var usageViewModel: PermissionUsageDetailsViewModel private lateinit var filterGroup: String private var showSystem = false @@ -119,11 +118,10 @@ class AutoPermissionUsageDetailsFragment : AutoSettingsFrameFragment() { val factory = PermissionUsageDetailsViewModel.PermissionUsageDetailsViewModelFactory( PermissionControllerApplication.get(), - this, filterGroup, ) usageViewModel = - ViewModelProvider(this, factory)[BasePermissionUsageDetailsViewModel::class.java] + ViewModelProvider(this, factory)[PermissionUsageDetailsViewModel::class.java] usageViewModel.getPermissionUsagesDetailsInfoUiLiveData().observe(this, this::updateUI) } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionGroupsFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionGroupsFragment.java index 969ac17eb..e995588b2 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionGroupsFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionGroupsFragment.java @@ -492,7 +492,7 @@ public final class AppPermissionGroupsFragment extends SettingsWithLargeHeader i } private boolean isArchivingEnabled() { - return SdkLevel.isAtLeastV() && Flags.archivingReadOnly(); + return SdkLevel.isAtLeastV(); } private void setAutoRevokeToggleState(HibernationSettingState state) { diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/max35/LegacyAppPermissionFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/max35/LegacyAppPermissionFragment.java index 35650defb..f852baa13 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/max35/LegacyAppPermissionFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/max35/LegacyAppPermissionFragment.java @@ -584,7 +584,8 @@ public class LegacyAppPermissionFragment extends SettingsWithLargeHeader // If the permissions are individually controlled, also show a link to the page that // lets you control them. mDivider.setVisibility(View.VISIBLE); - showRightIcon(R.drawable.ic_settings); + showRightIcon(R.drawable.ic_settings, getContext().getString( + R.string.app_permission_settings_button)); Bundle args = AllAppPermissionsFragment.createArgs(mPackageName, mPermGroupName, mUser); mWidgetFrame.setOnClickListener(v -> mViewModel.showAllPermissions(this, args)); mPermissionDetails.setText(getPreferenceManager().getContext().getString( @@ -599,7 +600,8 @@ public class LegacyAppPermissionFragment extends SettingsWithLargeHeader private void setAdminSupportDetail(EnforcedAdmin admin) { if (admin != null) { - showRightIcon(R.drawable.ic_info); + showRightIcon(R.drawable.ic_info, getContext().getString( + R.string.app_permission_info_button)); mWidgetFrame.setOnClickListener(v -> RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), admin) ); @@ -613,10 +615,11 @@ public class LegacyAppPermissionFragment extends SettingsWithLargeHeader * * @param iconId the resourceId of the drawable to use. */ - private void showRightIcon(int iconId) { + private void showRightIcon(int iconId, @NonNull String contentDescription) { mWidgetFrame.removeAllViews(); ImageView imageView = new ImageView(getPreferenceManager().getContext()); imageView.setImageResource(iconId); + imageView.setContentDescription(contentDescription); mWidgetFrame.addView(imageView); mWidgetFrame.setVisibility(View.VISIBLE); } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionHistoryPreference.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionHistoryPreference.java index 933911bff..3be9434b2 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionHistoryPreference.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionHistoryPreference.java @@ -195,6 +195,7 @@ public class PermissionHistoryPreference extends Preference { Intent intent = getViewPermissionUsageForPeriodIntent(); if (intent != null) { dividerVerticalBar.setVisibility(View.VISIBLE); + widgetView.setVisibility(View.VISIBLE); widgetView.setImageDrawable(mContext.getDrawable(R.drawable.ic_info_outline)); widgetView.setOnClickListener(v -> { write(PERMISSION_DETAILS_INTERACTION, @@ -214,6 +215,7 @@ public class PermissionHistoryPreference extends Preference { } else { dividerVerticalBar.setVisibility(View.GONE); widgetView.setImageDrawable(null); + widgetView.setVisibility(View.GONE); } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java index 3a904c466..9078f1a0a 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v31/PermissionUsageDetailsFragment.java @@ -54,7 +54,7 @@ import com.android.permissioncontroller.PermissionControllerApplication; import com.android.permissioncontroller.R; import com.android.permissioncontroller.permission.ui.ManagePermissionsActivity; import com.android.permissioncontroller.permission.ui.handheld.SettingsWithLargeHeader; -import com.android.permissioncontroller.permission.ui.model.v31.BasePermissionUsageDetailsViewModel; +import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel; import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.AppPermissionAccessUiInfo; import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.PermissionUsageDetailsUiState; import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.PermissionUsageDetailsViewModelFactory; @@ -89,7 +89,7 @@ public class PermissionUsageDetailsFragment extends SettingsWithLargeHeader { private MenuItem mShow7DaysDataMenu; private MenuItem mShow24HoursDataMenu; - private BasePermissionUsageDetailsViewModel mViewModel; + private PermissionUsageDetailsViewModel mViewModel; private long mSessionId; @@ -103,9 +103,9 @@ public class PermissionUsageDetailsFragment extends SettingsWithLargeHeader { } PermissionUsageDetailsViewModelFactory factory = new PermissionUsageDetailsViewModelFactory( - PermissionControllerApplication.get(), this, mPermissionGroup); + PermissionControllerApplication.get(), mPermissionGroup); mViewModel = - new ViewModelProvider(this, factory).get(BasePermissionUsageDetailsViewModel.class); + new ViewModelProvider(this, factory).get(PermissionUsageDetailsViewModel.class); if (savedInstanceState != null) { mSessionId = savedInstanceState.getLong(SESSION_ID_KEY); diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v36/AppPermissionFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v36/AppPermissionFragment.java index 4fde26c9d..768b00e39 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v36/AppPermissionFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v36/AppPermissionFragment.java @@ -553,14 +553,14 @@ public class AppPermissionFragment extends SettingsWithLargeHeader if (detailResIds.getSecond() != null) { // If the permissions are individually controlled, also show a link to the page that // lets you control them. - mDetails.setExtraWidgetIconRes(R.drawable.ic_settings); + mDetails.setExtraWidgetIcon(R.drawable.ic_settings, getContext().getString( + R.string.app_permission_settings_button)); Bundle args = AllAppPermissionsFragment.createArgs(mPackageName, mPermGroupName, mUser); mDetails.setOnSecondTargetClickListener((v) -> mViewModel.showAllPermissions(this, args)); mDetails.setSummary(getPreferenceManager().getContext().getString( detailResIds.getFirst(), detailResIds.getSecond())); } else { - mDetails.setOnSecondTargetClickListener(null); mDetails.setSummary(getPreferenceManager().getContext().getString( detailResIds.getFirst())); } @@ -569,7 +569,8 @@ public class AppPermissionFragment extends SettingsWithLargeHeader private void setAdminSupportDetail(EnforcedAdmin admin) { if (admin != null) { - mDetails.setExtraWidgetIconRes(R.drawable.ic_info_outline); + mDetails.setExtraWidgetIcon(R.drawable.ic_info_outline, getContext().getString( + R.string.app_permission_info_button)); mDetails.setOnSecondTargetClickListener((v) -> RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), admin)); } else { diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v36/PermissionTwoTargetPreference.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v36/PermissionTwoTargetPreference.kt index cf6585f4d..a3a3172e8 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v36/PermissionTwoTargetPreference.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/v36/PermissionTwoTargetPreference.kt @@ -68,6 +68,7 @@ class PermissionTwoTargetPreference : TwoTargetPreference { } @DrawableRes private var extraWidgetIconRes = 0 + private var extraWidgetContentDescription: String? = null private var secondTargetClickListener: OnSecondTargetClickListener? = null override fun onBindViewHolder(holder: PreferenceViewHolder) { @@ -76,6 +77,9 @@ class PermissionTwoTargetPreference : TwoTargetPreference { if (extraWidgetIconRes != 0) { settingsButton.setImageResource(extraWidgetIconRes) } + if (extraWidgetContentDescription != null) { + settingsButton.contentDescription = extraWidgetContentDescription + } if (secondTargetClickListener != null) { settingsButton.setOnClickListener { secondTargetClickListener!!.onSecondTargetClick(this) @@ -94,8 +98,9 @@ class PermissionTwoTargetPreference : TwoTargetPreference { notifyChanged() } - fun setExtraWidgetIconRes(@DrawableRes extraWidgetIconRes: Int) { - this.extraWidgetIconRes = extraWidgetIconRes + fun setExtraWidgetIcon(@DrawableRes iconRes: Int, contentDescription: String) { + this.extraWidgetIconRes = iconRes + this.extraWidgetContentDescription = contentDescription notifyChanged() } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/BasePermissionUsageDetailsViewModel.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/BasePermissionUsageDetailsViewModel.kt deleted file mode 100644 index 64c5c6927..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/BasePermissionUsageDetailsViewModel.kt +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (C) 2024 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.permissioncontroller.permission.ui.model.v31 - -import android.app.Application -import android.graphics.drawable.Drawable -import android.os.UserHandle -import androidx.lifecycle.AndroidViewModel -import androidx.lifecycle.LiveData -import com.android.permissioncontroller.R -import com.android.permissioncontroller.permission.ui.handheld.v31.getDurationUsedStr -import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.Companion.CLUSTER_SPACING_MINUTES -import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.PermissionUsageDetailsUiState -import com.android.permissioncontroller.permission.utils.KotlinUtils -import java.util.concurrent.TimeUnit - -abstract class BasePermissionUsageDetailsViewModel(val app: Application) : AndroidViewModel(app) { - abstract fun getPermissionUsagesDetailsInfoUiLiveData(): LiveData<PermissionUsageDetailsUiState> - - abstract fun getShowSystem(): Boolean - - abstract val showSystemLiveData: LiveData<Boolean> - - abstract fun getShow7Days(): Boolean - - abstract fun updateShowSystemAppsToggle(showSystem: Boolean) - - abstract fun updateShow7DaysToggle(show7Days: Boolean) - - private val packageIconCache: MutableMap<Pair<String, UserHandle>, Drawable> = mutableMapOf() - private val packageLabelCache: MutableMap<String, String> = mutableMapOf() - - /** - * Returns the label for the provided package name, by first searching the cache otherwise - * retrieving it from the app's [android.content.pm.ApplicationInfo]. - */ - fun getPackageLabel(packageName: String, user: UserHandle): String { - if (packageLabelCache.containsKey(packageName)) { - return requireNotNull(packageLabelCache[packageName]) - } - val packageLabel = getPackageLabel(app, packageName, user) - packageLabelCache[packageName] = packageLabel - return packageLabel - } - - open fun getPackageLabel(app: Application, packageName: String, user: UserHandle): String { - return KotlinUtils.getPackageLabel(app, packageName, user) - } - - /** - * Returns the icon for the provided package name and user, by first searching the cache - * otherwise retrieving it from the app's [android.content.pm.ApplicationInfo]. - */ - fun getBadgedPackageIcon(packageName: String, userHandle: UserHandle): Drawable? { - val packageNameWithUser: Pair<String, UserHandle> = Pair(packageName, userHandle) - if (packageIconCache.containsKey(packageNameWithUser)) { - return requireNotNull(packageIconCache[packageNameWithUser]) - } - val packageIcon = getBadgedPackageIcon(app, packageName, userHandle) - if (packageIcon != null) packageIconCache[packageNameWithUser] = packageIcon - - return packageIcon - } - - open fun getBadgedPackageIcon( - app: Application, - packageName: String, - user: UserHandle - ): Drawable? { - return KotlinUtils.getBadgedPackageIcon(app, packageName, user) - } - - fun getDurationSummary(durationMs: Long): String? { - // Only show the duration summary if it is at least (CLUSTER_SPACING_MINUTES + 1) minutes. - // Displaying a time that is shorter than the cluster granularity - // (CLUSTER_SPACING_MINUTES) will not convey useful information. - if (durationMs >= TimeUnit.MINUTES.toMillis(CLUSTER_SPACING_MINUTES + 1)) { - return getDurationUsedStr(app, durationMs) - } - return null - } - - fun buildUsageSummary( - subAttributionLabel: String?, - proxyPackageLabel: String?, - durationSummary: String? - ): String? { - val subTextStrings: MutableList<String> = mutableListOf() - subAttributionLabel?.let { subTextStrings.add(subAttributionLabel) } - proxyPackageLabel?.let { subTextStrings.add(it) } - durationSummary?.let { subTextStrings.add(it) } - return when (subTextStrings.size) { - 3 -> - app.getString( - R.string.history_preference_subtext_3, - subTextStrings[0], - subTextStrings[1], - subTextStrings[2] - ) - 2 -> - app.getString( - R.string.history_preference_subtext_2, - subTextStrings[0], - subTextStrings[1] - ) - 1 -> subTextStrings[0] - else -> null - } - } -} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageDetailsViewModel.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageDetailsViewModel.kt index 497e5cc35..d8eeb8fd9 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageDetailsViewModel.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageDetailsViewModel.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 The Android Open Source Project + * Copyright (C) 2024 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. @@ -13,677 +13,287 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:Suppress("DEPRECATION") package com.android.permissioncontroller.permission.ui.model.v31 import android.Manifest import android.app.AppOpsManager +import android.app.AppOpsManager.OPSTR_EMERGENCY_LOCATION import android.app.AppOpsManager.OPSTR_PHONE_CALL_CAMERA import android.app.AppOpsManager.OPSTR_PHONE_CALL_MICROPHONE import android.app.Application -import android.app.role.RoleManager import android.content.ComponentName import android.content.Context import android.content.Intent import android.content.pm.PackageManager -import android.content.res.Resources import android.graphics.drawable.Drawable import android.location.LocationManager import android.os.Build -import android.os.Bundle import android.os.UserHandle -import android.os.UserManager -import android.permission.flags.Flags -import android.util.Log import androidx.annotation.RequiresApi -import androidx.lifecycle.AbstractSavedStateViewModelFactory +import androidx.annotation.VisibleForTesting +import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel -import androidx.savedstate.SavedStateRegistryOwner +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.application +import androidx.lifecycle.asLiveData +import androidx.lifecycle.createSavedStateHandle +import androidx.lifecycle.viewModelScope +import androidx.lifecycle.viewmodel.CreationExtras import com.android.modules.utils.build.SdkLevel import com.android.permissioncontroller.DeviceUtils import com.android.permissioncontroller.R +import com.android.permissioncontroller.appops.data.repository.v31.AppOpRepository import com.android.permissioncontroller.permission.compat.IntentCompat -import com.android.permissioncontroller.permission.data.AppPermGroupUiInfoLiveData -import com.android.permissioncontroller.permission.data.LightPackageInfoLiveData -import com.android.permissioncontroller.permission.data.SmartUpdateMediatorLiveData -import com.android.permissioncontroller.permission.data.get -import com.android.permissioncontroller.permission.data.v31.AllLightHistoricalPackageOpsLiveData -import com.android.permissioncontroller.permission.model.livedatatypes.LightPackageInfo -import com.android.permissioncontroller.permission.model.livedatatypes.v31.AppPermissionId -import com.android.permissioncontroller.permission.model.livedatatypes.v31.LightHistoricalPackageOps -import com.android.permissioncontroller.permission.model.livedatatypes.v31.LightHistoricalPackageOps.AppPermissionDiscreteAccesses -import com.android.permissioncontroller.permission.model.livedatatypes.v31.LightHistoricalPackageOps.AttributedAppPermissionDiscreteAccesses -import com.android.permissioncontroller.permission.model.livedatatypes.v31.LightHistoricalPackageOps.Companion.NO_ATTRIBUTION_TAG -import com.android.permissioncontroller.permission.model.livedatatypes.v31.LightHistoricalPackageOps.DiscreteAccess +import com.android.permissioncontroller.permission.data.repository.v31.PermissionRepository +import com.android.permissioncontroller.permission.domain.model.v31.PermissionTimelineUsageModel +import com.android.permissioncontroller.permission.domain.model.v31.PermissionTimelineUsageModelWrapper +import com.android.permissioncontroller.permission.domain.usecase.v31.GetPermissionGroupUsageDetailsUseCase import com.android.permissioncontroller.permission.ui.handheld.v31.getDurationUsedStr -import com.android.permissioncontroller.permission.ui.handheld.v31.shouldShowSubattributionInPermissionsDashboard import com.android.permissioncontroller.permission.utils.PermissionMapping -import com.android.permissioncontroller.permission.utils.Utils -import com.android.permissioncontroller.permission.utils.v31.SubattributionUtils +import com.android.permissioncontroller.pm.data.repository.v31.PackageRepository +import com.android.permissioncontroller.role.data.repository.v31.RoleRepository +import com.android.permissioncontroller.user.data.repository.v31.UserRepository import java.time.Instant import java.util.Objects import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit.DAYS +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.stateIn -/** [ViewModel] for the Permission Usage Details page. */ -@RequiresApi(Build.VERSION_CODES.S) class PermissionUsageDetailsViewModel( - private val application: Application, + app: Application, + private val getPermissionUsageDetailsUseCase: GetPermissionGroupUsageDetailsUseCase, private val state: SavedStateHandle, private val permissionGroup: String, -) : BasePermissionUsageDetailsViewModel(application) { - - val allLightHistoricalPackageOpsLiveData = - AllLightHistoricalPackageOpsLiveData(application, opNames) - private val appPermGroupUiInfoLiveDataList = - mutableMapOf<AppPermissionId, AppPermGroupUiInfoLiveData>() - private val lightPackageInfoLiveDataMap = - mutableMapOf<Pair<String, UserHandle>, LightPackageInfoLiveData>() - - override val showSystemLiveData = state.getLiveData(SHOULD_SHOW_SYSTEM_KEY, false) - val show7DaysLiveData = state.getLiveData(SHOULD_SHOW_7_DAYS_KEY, false) - - private val roleManager = - Utils.getSystemServiceSafe(application.applicationContext, RoleManager::class.java) - private val userManager = - Utils.getSystemServiceSafe(application.applicationContext, UserManager::class.java) + scope: CoroutineScope? = null, + private val defaultDispatcher: CoroutineDispatcher = Dispatchers.Default, + private val packageRepository: PackageRepository = PackageRepository.getInstance(app), +) : AndroidViewModel(app) { + private val coroutineScope = scope ?: viewModelScope + private val context = app + + private val packageIconCache: MutableMap<Pair<String, UserHandle>, Drawable> = mutableMapOf() + private val packageLabelCache: MutableMap<String, String> = mutableMapOf() + + private val showSystemFlow = MutableStateFlow(state[SHOULD_SHOW_SYSTEM_KEY] ?: false) + private val show7DaysFlow = MutableStateFlow(state[SHOULD_SHOW_7_DAYS_KEY] ?: false) + + private val permissionTimelineUsagesFlow: + StateFlow<PermissionTimelineUsageModelWrapper> by lazy { + getPermissionUsageDetailsUseCase(coroutineScope) + .flowOn(defaultDispatcher) + .stateIn( + coroutineScope, + SharingStarted.WhileSubscribed(5000), + PermissionTimelineUsageModelWrapper.Loading, + ) + } - /** Updates whether system app permissions usage should be displayed in the UI. */ - override fun updateShowSystemAppsToggle(showSystem: Boolean) { - if (showSystem != state[SHOULD_SHOW_SYSTEM_KEY]) { - state[SHOULD_SHOW_SYSTEM_KEY] = showSystem - } + @VisibleForTesting + val permissionUsageDetailsUiStateFlow: Flow<PermissionUsageDetailsUiState> by lazy { + combine(permissionTimelineUsagesFlow, showSystemFlow, show7DaysFlow) { + permissionTimelineUsages, + showSystem, + show7Days -> + permissionTimelineUsages.buildPermissionUsageDetailsUiInfo(showSystem, show7Days) + } + .flowOn(defaultDispatcher) } - /** Updates whether 7 days usage or 1 day usage should be displayed in the UI. */ - override fun updateShow7DaysToggle(show7Days: Boolean) { - if (show7Days != state[SHOULD_SHOW_7_DAYS_KEY]) { - state[SHOULD_SHOW_7_DAYS_KEY] = show7Days - } + fun getPermissionUsagesDetailsInfoUiLiveData(): LiveData<PermissionUsageDetailsUiState> { + return permissionUsageDetailsUiStateFlow.asLiveData( + context = coroutineScope.coroutineContext + ) } - /** Creates a [PermissionUsageDetailsUiState] containing all information to render the UI. */ - fun buildPermissionUsageDetailsUiInfo(): PermissionUsageDetailsUiState { - val showSystem: Boolean = state[SHOULD_SHOW_SYSTEM_KEY] ?: false - val show7Days: Boolean = state[SHOULD_SHOW_7_DAYS_KEY] ?: false - val showPermissionUsagesDuration = - if (show7Days && DeviceUtils.isHandheld()) { - TIME_7_DAYS_DURATION - } else { - TIME_24_HOURS_DURATION - } + private fun PermissionTimelineUsageModelWrapper.buildPermissionUsageDetailsUiInfo( + showSystem: Boolean, + show7Days: Boolean, + ): PermissionUsageDetailsUiState { + if (this is PermissionTimelineUsageModelWrapper.Loading) { + return PermissionUsageDetailsUiState.Loading + } + val timelineUsageModels = + (this as PermissionTimelineUsageModelWrapper.Success).timelineUsageModels val startTime = - (System.currentTimeMillis() - showPermissionUsagesDuration).coerceAtLeast( + (System.currentTimeMillis() - getUsageDuration(show7Days)).coerceAtLeast( Instant.EPOCH.toEpochMilli() ) + val permissionTimelineUsageModels = + timelineUsageModels.filter { it.accessEndMillis > startTime } + val containsSystemUsages = permissionTimelineUsageModels.any { !it.isUserSensitive } + val result = + permissionTimelineUsageModels + .filter { showSystem || it.isUserSensitive } + .map { clusterOps -> + val durationSummaryLabel = + if (clusterOps.durationMillis > 0) { + getDurationSummary(clusterOps.durationMillis) + } else { + null + } + val proxyLabel = getProxyPackageLabel(clusterOps) + val isEmergencyLocationAccess = + isLocationByPassEnabled() && + clusterOps.opNames.any { it == OPSTR_EMERGENCY_LOCATION } + val subAttributionLabel = + if (isEmergencyLocationAccess) { + emergencyLocationAttributionLabel + } else { + clusterOps.attributionLabel + } + val showingSubAttribution = !subAttributionLabel.isNullOrEmpty() + val summary = + buildUsageSummary(subAttributionLabel, proxyLabel, durationSummaryLabel) + PermissionUsageDetailsViewModel.AppPermissionAccessUiInfo( + UserHandle.of(clusterOps.userId), + clusterOps.packageName, + getPackageLabel(clusterOps.packageName, UserHandle.of(clusterOps.userId)), + permissionGroup, + clusterOps.accessStartMillis, + clusterOps.accessEndMillis, + summary, + showingSubAttribution, + clusterOps.attributionTags ?: emptySet(), + getBadgedPackageIcon( + clusterOps.packageName, + UserHandle.of(clusterOps.userId), + ), + isEmergencyLocationAccess, + ) + } + .sortedBy { -1 * it.accessStartTime } return PermissionUsageDetailsUiState.Success( - buildAppPermissionAccessUiInfoList( - allLightHistoricalPackageOpsLiveData, - startTime, - showSystem - ), - containsSystemAppUsages(allLightHistoricalPackageOpsLiveData, startTime), + result, + containsSystemUsages, showSystem, - show7Days + show7Days, ) } - /** - * Returns whether the "show/hide system" toggle should be displayed in the UI for the provided - * [AllLightHistoricalPackageOpsLiveData]. - */ - private fun containsSystemAppUsages( - allLightHistoricalPackageOpsLiveData: AllLightHistoricalPackageOpsLiveData, - startTime: Long - ): Boolean { - return allLightHistoricalPackageOpsLiveData - .getLightHistoricalPackageOps() - ?.flatMap { - it.appPermissionDiscreteAccesses - .map { it.withLabel() } - .filterOutExemptAppPermissions(true) - .filterAccessesLaterThan(startTime) - } - ?.any { isAppPermissionSystem(it.appPermissionId) } ?: false + private val emergencyLocationAttributionLabel: String by lazy { + context.getString(R.string.privacy_dashboard_emergency_location_enforced_attribution_label) } - private fun isPermissionRequestedByApp(appPermissionId: AppPermissionId): Boolean { - val appRequestedPermissions = - lightPackageInfoLiveDataMap[ - Pair(appPermissionId.packageName, appPermissionId.userHandle)] - ?.value - ?.requestedPermissions ?: listOf() - - if ( - appPermissionId.permissionGroup == Manifest.permission_group.LOCATION && - appRequestedPermissions.contains(Manifest.permission.LOCATION_BYPASS) - ) { - return true - } + fun getShowSystem(): Boolean = showSystemFlow.value - return appRequestedPermissions.any { - PermissionMapping.getGroupOfPlatformPermission(it) == appPermissionId.permissionGroup - } - } + val showSystemLiveData = showSystemFlow.asLiveData(context = coroutineScope.coroutineContext) - private fun isAppPermissionSystem(appPermissionId: AppPermissionId): Boolean { - val appPermGroupUiInfo = appPermGroupUiInfoLiveDataList[appPermissionId]?.value - - if (appPermGroupUiInfo != null) { - return appPermGroupUiInfo.isSystem - } else - // The AppPermGroupUiInfo may be null if it has either not loaded yet or if the app has not - // requested any permissions from the permission group in question. - // The Telecom doesn't request microphone or camera permissions. However, telecom app may - // use these permissions and they are considered system app permissions, so we return true - // even if the AppPermGroupUiInfo is unavailable. - if ( - appPermissionId.packageName == TELECOM_PACKAGE && - (appPermissionId.permissionGroup == Manifest.permission_group.CAMERA || - appPermissionId.permissionGroup == Manifest.permission_group.MICROPHONE) - ) { - return true + fun getShow7Days(): Boolean = show7DaysFlow.value + + private fun getUsageDuration(show7Days: Boolean): Long { + return if (show7Days && DeviceUtils.isHandheld()) { + TIME_7_DAYS_DURATION + } else { + TIME_24_HOURS_DURATION } - return false } - /** - * Extracts access data from [AllLightHistoricalPackageOpsLiveData] and composes - * [AppPermissionAccessUiInfo]s to be displayed in the UI. - */ - private fun buildAppPermissionAccessUiInfoList( - allLightHistoricalPackageOpsLiveData: AllLightHistoricalPackageOpsLiveData, - startTime: Long, - showSystem: Boolean - ): List<AppPermissionAccessUiInfo> { - return allLightHistoricalPackageOpsLiveData - .getLightHistoricalPackageOps() - ?.filter { Utils.shouldShowInSettings(it.userHandle, userManager) } - ?.flatMap { it.clusterAccesses(startTime, showSystem) } - ?.map { it.buildAppPermissionAccessUiInfo() } - ?.sortedBy { -it.accessStartTime } ?: listOf() - } + private fun getProxyPackageLabel(accessCluster: PermissionTimelineUsageModel): String? = + accessCluster.proxyPackageName?.let { proxyPackageName -> + if (accessCluster.proxyUserId != null) { + getPackageLabel(proxyPackageName, UserHandle.of(accessCluster.proxyUserId)) + } else null + } - private fun LightHistoricalPackageOps.clusterAccesses( - startTime: Long, - showSystem: Boolean - ): List<AppPermissionDiscreteAccessCluster> { - return if (!shouldShowSubAttributionForApp(getLightPackageInfo(packageName, userHandle))) - this.clusterAccessesWithoutAttribution(startTime, showSystem) - else { - this.clusterAccessesWithAttribution(startTime, showSystem) + fun updateShowSystemAppsToggle(showSystem: Boolean) { + if (showSystem != state[SHOULD_SHOW_SYSTEM_KEY]) { + state[SHOULD_SHOW_SYSTEM_KEY] = showSystem } + showSystemFlow.compareAndSet(!showSystem, showSystem) } - /** - * Clusters accesses that are close enough together in time such that they can be displayed as a - * single access to the user. - * - * Accesses are clustered taking into account any app subattribution, so each cluster will - * pertain a particular attribution label. - */ - private fun LightHistoricalPackageOps.clusterAccessesWithAttribution( - startTime: Long, - showSystem: Boolean - ): List<AppPermissionDiscreteAccessCluster> = - this.attributedAppPermissionDiscreteAccesses - .flatMap { it.groupAccessesByLabel(getLightPackageInfo(packageName, userHandle)) } - .filterOutExemptAppPermissions(showSystem) - .filterAccessesLaterThan(startTime) - .flatMap { createAccessClusters(it) } - - /** - * Clusters accesses that are close enough together in time such that they can be displayed as a - * single access to the user. - * - * Accesses are clustered disregarding any app subattribution. - */ - private fun LightHistoricalPackageOps.clusterAccessesWithoutAttribution( - startTime: Long, - showSystem: Boolean - ): List<AppPermissionDiscreteAccessCluster> = - this.appPermissionDiscreteAccesses - .map { it.withLabel() } - .filterOutExemptAppPermissions(showSystem) - .filterAccessesLaterThan(startTime) - .flatMap { createAccessClusters(it) } - - /** Filters out accesses earlier than the provided start time. */ - private fun List<AppPermissionDiscreteAccessesWithLabel>.filterAccessesLaterThan( - startTime: Long, - ): List<AppPermissionDiscreteAccessesWithLabel> = - this.mapNotNull { - val updatedDiscreteAccesses = - it.discreteAccesses.filter { access -> access.accessTimeMs > startTime } - if (updatedDiscreteAccesses.isEmpty()) null - else - AppPermissionDiscreteAccessesWithLabel( - it.appPermissionId, - it.attributionLabel, - it.attributionTags, - updatedDiscreteAccesses - ) + fun updateShow7DaysToggle(show7Days: Boolean) { + if (show7Days != state[SHOULD_SHOW_7_DAYS_KEY]) { + state[SHOULD_SHOW_7_DAYS_KEY] = show7Days } - - /** Filters out data for apps and permissions that don't need to be displayed in the UI. */ - private fun List<AppPermissionDiscreteAccessesWithLabel>.filterOutExemptAppPermissions( - showSystem: Boolean - ): List<AppPermissionDiscreteAccessesWithLabel> { - val exemptedPackages = Utils.getExemptedPackages(roleManager) - return filter { !exemptedPackages.contains(it.appPermissionId.packageName) } - .filter { it.appPermissionId.permissionGroup == permissionGroup } - .filter { isPermissionRequestedByApp(it.appPermissionId) } - .filter { showSystem || !isAppPermissionSystem(it.appPermissionId) } + show7DaysFlow.compareAndSet(!show7Days, show7Days) } /** - * Converts the provided [AppPermissionDiscreteAccesses] to a - * [AppPermissionDiscreteAccessesWithLabel] by adding a label. + * Returns the label for the provided package name, by first searching the cache otherwise + * retrieving it from the app's [android.content.pm.ApplicationInfo]. */ - private fun AppPermissionDiscreteAccesses.withLabel(): AppPermissionDiscreteAccessesWithLabel = - AppPermissionDiscreteAccessesWithLabel( - this.appPermissionId, - Resources.ID_NULL, - attributionTags = emptyList(), - this.discreteAccesses - ) - - /** Groups tag-attributed accesses for the provided app and permission by attribution label. */ - private fun AttributedAppPermissionDiscreteAccesses.groupAccessesByLabel( - lightPackageInfo: LightPackageInfo? - ): List<AppPermissionDiscreteAccessesWithLabel> { - if (lightPackageInfo == null) return emptyList() - - val appPermissionId = this.appPermissionId - val labelsToDiscreteAccesses = mutableMapOf<Int, MutableList<DiscreteAccess>>() - val labelsToTags = mutableMapOf<Int, MutableList<String>>() - - val appPermissionDiscreteAccessWithLabels = - mutableListOf<AppPermissionDiscreteAccessesWithLabel>() - - for ((tag, discreteAccesses) in this.attributedDiscreteAccesses) { - val label: Int = - if (tag == NO_ATTRIBUTION_TAG) Resources.ID_NULL - else lightPackageInfo.attributionTagsToLabels[tag] ?: Resources.ID_NULL - - if (!labelsToDiscreteAccesses.containsKey(label)) { - labelsToDiscreteAccesses[label] = mutableListOf() - } - labelsToDiscreteAccesses[label]?.addAll(discreteAccesses) - - if (!labelsToTags.containsKey(label)) { - labelsToTags[label] = mutableListOf() - } - labelsToTags[label]?.add(tag) - } - - for ((label, discreteAccesses) in labelsToDiscreteAccesses.entries) { - val tags = labelsToTags[label]?.toList() ?: listOf() - - appPermissionDiscreteAccessWithLabels.add( - AppPermissionDiscreteAccessesWithLabel( - appPermissionId, - label, - tags, - discreteAccesses.sortedBy { -1 * it.accessTimeMs } - ) - ) + fun getPackageLabel(packageName: String, user: UserHandle): String { + if (packageLabelCache.containsKey(packageName)) { + return requireNotNull(packageLabelCache[packageName]) } - - return appPermissionDiscreteAccessWithLabels + val packageLabel = packageRepository.getPackageLabel(packageName, user) + packageLabelCache[packageName] = packageLabel + return packageLabel } /** - * Clusters [DiscreteAccess]es represented by a [AppPermissionDiscreteAccessesWithLabel] into - * smaller groups to form a list of [AppPermissionDiscreteAccessCluster] instances. - * - * [DiscreteAccess]es which have accesses sufficiently close together in time will be places in - * the same cluster. + * Returns the icon for the provided package name and user, by first searching the cache + * otherwise retrieving it from the app's [android.content.pm.ApplicationInfo]. */ - private fun createAccessClusters( - appPermAccesses: AppPermissionDiscreteAccessesWithLabel, - ): List<AppPermissionDiscreteAccessCluster> { - val clusters = mutableListOf<AppPermissionDiscreteAccessCluster>() - val currentDiscreteAccesses = mutableListOf<DiscreteAccess>() - // Iterate entries in asc order based on access timestamp. - for (index in appPermAccesses.discreteAccesses.size - 1 downTo 0) { - val discreteAccess = appPermAccesses.discreteAccesses[index] - if (currentDiscreteAccesses.isEmpty()) { - currentDiscreteAccesses.add(discreteAccess) - } else if (!canAccessBeAddedToCluster(discreteAccess, currentDiscreteAccesses)) { - clusters.add( - AppPermissionDiscreteAccessCluster( - appPermAccesses.appPermissionId, - appPermAccesses.attributionLabel, - appPermAccesses.attributionTags, - currentDiscreteAccesses.toMutableList(), - if (isOpClusteredByItself(discreteAccess.opName)) discreteAccess.opName - else null - ) - ) - currentDiscreteAccesses.clear() - currentDiscreteAccesses.add(discreteAccess) - } else { - currentDiscreteAccesses.add(discreteAccess) - } + fun getBadgedPackageIcon(packageName: String, userHandle: UserHandle): Drawable? { + val packageNameWithUser: Pair<String, UserHandle> = Pair(packageName, userHandle) + if (packageIconCache.containsKey(packageNameWithUser)) { + return requireNotNull(packageIconCache[packageNameWithUser]) } - - if (currentDiscreteAccesses.isNotEmpty()) { - val opName = currentDiscreteAccesses.last().opName - clusters.add( - AppPermissionDiscreteAccessCluster( - appPermAccesses.appPermissionId, - appPermAccesses.attributionLabel, - appPermAccesses.attributionTags, - currentDiscreteAccesses.toMutableList(), - if (isOpClusteredByItself(opName)) opName else null - ) - ) + val packageIcon = packageRepository.getBadgedPackageIcon(packageName, userHandle) + if (packageIcon != null) { + packageIconCache[packageNameWithUser] = packageIcon } - return clusters - } - /** - * Returns whether the provided [DiscreteAccess] occurred close enough to those in the clustered - * list that it can be added to the cluster. - */ - private fun canAccessBeAddedToCluster( - currentAccess: DiscreteAccess, - clusteredAccesses: List<DiscreteAccess> - ): Boolean { - val clusterOp = clusteredAccesses.last().opName - if ( - (isOpClusteredByItself(currentAccess.opName) || isOpClusteredByItself(clusterOp)) && - currentAccess.opName != clusteredAccesses.last().opName - ) { - return false - } - val currentAccessMinute = currentAccess.accessTimeMs / ONE_MINUTE_MS - val prevMostRecentAccessMillis = - clusteredAccesses.maxOf { discreteAccess -> - if (discreteAccess.accessDurationMs > 0) - discreteAccess.accessTimeMs + discreteAccess.accessDurationMs - ONE_MINUTE_MS - else discreteAccess.accessTimeMs - } - val prevMostRecentAccessMinute = prevMostRecentAccessMillis / ONE_MINUTE_MS - return (currentAccessMinute - prevMostRecentAccessMinute) <= CLUSTER_SPACING_MINUTES + return packageIcon } - /** - * Determine if an op should be in its own cluster and hence display as an individual entry in - * the privacy timeline - */ - private fun isOpClusteredByItself(opName: String): Boolean { - if (isLocationByPassEnabled()) { - return opName == AppOpsManager.OPSTR_EMERGENCY_LOCATION + private fun getDurationSummary(durationMs: Long): String? { + // Only show the duration summary if it is at least (CLUSTER_SPACING_MINUTES + 1) minutes. + // Displaying a time that is shorter than the cluster granularity + // (CLUSTER_SPACING_MINUTES) will not convey useful information. + if (durationMs >= TimeUnit.MINUTES.toMillis(CLUSTER_SPACING_MINUTES + 1)) { + return getDurationUsedStr(application, durationMs) } - return false + return null } - /** - * Composes all UI information from a [AppPermissionDiscreteAccessCluster] into a - * [AppPermissionAccessUiInfo]. - */ - private fun AppPermissionDiscreteAccessCluster.buildAppPermissionAccessUiInfo(): - AppPermissionAccessUiInfo { - val context = application - // The end minute is exclusive here in terms of access, i.e. [1..5) as the private data - // was not accessed at minute 5, it helps calculate the duration correctly. - val accessEndTimeMillis = - discreteAccesses.maxOf { appOpEvent -> - if (appOpEvent.accessDurationMs > 0) - appOpEvent.accessTimeMs + appOpEvent.accessDurationMs - else appOpEvent.accessTimeMs + ONE_MINUTE_MS - } - val accessStartTimeMillis = discreteAccesses.minOf { it.accessTimeMs } - val durationMs = accessEndTimeMillis - accessStartTimeMillis - val durationSummaryLabel = - if (durationMs >= TimeUnit.MINUTES.toMillis(CLUSTER_SPACING_MINUTES + 1)) { - getDurationUsedStr(context, durationMs) - } else null - - val proxyLabel = getProxyPackageLabel(this) - val subAttributionLabel = getSubAttributionLabel(this) - val showingSubAttribution = !subAttributionLabel.isNullOrEmpty() - val summary = - buildUsageSummary(context, subAttributionLabel, proxyLabel, durationSummaryLabel) - val isEmergencyLocationAccess = - isLocationByPassEnabled() && clusteredOp == AppOpsManager.OPSTR_EMERGENCY_LOCATION - - return AppPermissionAccessUiInfo( - this.appPermissionId.userHandle, - this.appPermissionId.packageName, - getPackageLabel(this.appPermissionId.packageName, this.appPermissionId.userHandle), - permissionGroup, - accessStartTimeMillis, - // Make the end time inclusive i.e. [1..4] - accessEndTimeMillis - ONE_MINUTE_MS, - summary, - showingSubAttribution, - this.attributionTags.toSet(), - getBadgedPackageIcon(this.appPermissionId.packageName, this.appPermissionId.userHandle), - isEmergencyLocationAccess - ) - } - - /** Builds a summary of the permission access. */ private fun buildUsageSummary( - context: Context, subAttributionLabel: String?, proxyPackageLabel: String?, - durationSummary: String? + durationSummary: String?, ): String? { val subTextStrings: MutableList<String> = mutableListOf() - subAttributionLabel?.let { subTextStrings.add(subAttributionLabel) } proxyPackageLabel?.let { subTextStrings.add(it) } durationSummary?.let { subTextStrings.add(it) } return when (subTextStrings.size) { 3 -> - context.getString( + application.getString( R.string.history_preference_subtext_3, subTextStrings[0], subTextStrings[1], - subTextStrings[2] + subTextStrings[2], ) 2 -> - context.getString( + application.getString( R.string.history_preference_subtext_2, subTextStrings[0], - subTextStrings[1] + subTextStrings[1], ) 1 -> subTextStrings[0] else -> null } } - /** Returns whether app subattribution should be shown. */ - private fun shouldShowSubAttributionForApp(lightPackageInfo: LightPackageInfo?): Boolean { - return lightPackageInfo != null && - shouldShowSubattributionInPermissionsDashboard() && - SubattributionUtils.isSubattributionSupported(lightPackageInfo) - } - - /** Returns the proxied package label if the permission access was proxied. */ - private fun getProxyPackageLabel(accessCluster: AppPermissionDiscreteAccessCluster): String? = - accessCluster.discreteAccesses - .firstOrNull { it.proxy?.packageName != null } - ?.let { - getPackageLabel( - it.proxy!!.packageName!!, - UserHandle.getUserHandleForUid(it.proxy.uid) - ) - } - - /** Returns the attribution label for the permission access, if any. */ - private fun getSubAttributionLabel(accessCluster: AppPermissionDiscreteAccessCluster): String? { - // Special case for EMERGENCY_LOCATION app op. Show enforced attribution label in the - // Privacy Dashboard - if ( - isLocationByPassEnabled() && - accessCluster.clusteredOp == AppOpsManager.OPSTR_EMERGENCY_LOCATION - ) { - return application.getString( - R.string.privacy_dashboard_emergency_location_enforced_attribution_label - ) - } - - return if (accessCluster.attributionLabel == Resources.ID_NULL) null - else { - val lightPackageInfo = getLightPackageInfo(accessCluster.appPermissionId) - getSubAttributionLabels(lightPackageInfo)?.get(accessCluster.attributionLabel) - } - } - - private fun getSubAttributionLabels(lightPackageInfo: LightPackageInfo?): Map<Int, String>? = - if (lightPackageInfo == null) null - else SubattributionUtils.getAttributionLabels(application, lightPackageInfo) - - private fun getLightPackageInfo(appPermissionId: AppPermissionId) = - lightPackageInfoLiveDataMap[Pair(appPermissionId.packageName, appPermissionId.userHandle)] - ?.value - - private fun getLightPackageInfo(packageName: String, userHandle: UserHandle) = - lightPackageInfoLiveDataMap[Pair(packageName, userHandle)]?.value - - private fun AllLightHistoricalPackageOpsLiveData.getLightHistoricalPackageOps() = - this.value?.values - - /** Data used to create a preference for an app's permission usage. */ - data class AppPermissionAccessUiInfo( - val userHandle: UserHandle, - val packageName: String, - val packageLabel: String, - val permissionGroup: String, - val accessStartTime: Long, - val accessEndTime: Long, - val summaryText: CharSequence?, - val showingAttribution: Boolean, - val attributionTags: Set<String>, - val badgedPackageIcon: Drawable?, - val isEmergencyLocationAccess: Boolean - ) - - sealed class PermissionUsageDetailsUiState { - data object Loading : PermissionUsageDetailsUiState() - - data class Success( - val appPermissionAccessUiInfoList: List<AppPermissionAccessUiInfo>, - val containsSystemAppUsage: Boolean, - val showSystem: Boolean, - val show7Days: Boolean, - ) : PermissionUsageDetailsUiState() - } - - /** - * Data class representing a cluster of permission accesses close enough together to be - * displayed as a single access in the UI. - */ - private data class AppPermissionDiscreteAccessCluster( - val appPermissionId: AppPermissionId, - val attributionLabel: Int, - val attributionTags: List<String>, - val discreteAccesses: List<DiscreteAccess>, - val clusteredOp: String? - ) - - /** - * Data class representing all permission accesses for a particular package, user, permission - * and attribution label. - */ - private data class AppPermissionDiscreteAccessesWithLabel( - val appPermissionId: AppPermissionId, - val attributionLabel: Int, - val attributionTags: List<String>, - val discreteAccesses: List<DiscreteAccess> - ) - - /** [LiveData] object for [PermissionUsageDetailsUiState]. */ - private val _permissionUsagesDetailsInfoUiLiveData = - object : - SmartUpdateMediatorLiveData<@JvmSuppressWildcards PermissionUsageDetailsUiState>() { - private val getAppPermGroupUiInfoLiveData = { appPermissionId: AppPermissionId -> - AppPermGroupUiInfoLiveData[ - Triple( - appPermissionId.packageName, - appPermissionId.permissionGroup, - appPermissionId.userHandle, - )] - } - private val getLightPackageInfoLiveData = - { packageWithUserHandle: Pair<String, UserHandle> -> - LightPackageInfoLiveData[packageWithUserHandle] - } - - init { - addSource(allLightHistoricalPackageOpsLiveData) { update() } - addSource(showSystemLiveData) { update() } - addSource(show7DaysLiveData) { update() } - } - - override fun onUpdate() { - if (!allLightHistoricalPackageOpsLiveData.isInitialized) { - return - } - - val appPermissionIds = mutableSetOf<AppPermissionId>() - val allPackages: Set<Pair<String, UserHandle>> = - allLightHistoricalPackageOpsLiveData.value?.keys ?: setOf() - for (packageWithUserHandle: Pair<String, UserHandle> in allPackages) { - val appPermGroupIds = - allLightHistoricalPackageOpsLiveData.value - ?.get(packageWithUserHandle) - ?.appPermissionDiscreteAccesses - ?.map { it.appPermissionId } - ?.toSet() ?: setOf() - - appPermissionIds.addAll(appPermGroupIds) - } - - setSourcesToDifference( - appPermissionIds, - appPermGroupUiInfoLiveDataList, - getAppPermGroupUiInfoLiveData - ) { - update() - } - setSourcesToDifference( - allPackages, - lightPackageInfoLiveDataMap, - getLightPackageInfoLiveData - ) { - update() - } - - if (appPermGroupUiInfoLiveDataList.any { it.value.isStale }) { - return - } - - if (lightPackageInfoLiveDataMap.any { it.value.isStale }) { - return - } - - value = buildPermissionUsageDetailsUiInfo() - } - } - - override fun getPermissionUsagesDetailsInfoUiLiveData(): - LiveData<PermissionUsageDetailsUiState> = _permissionUsagesDetailsInfoUiLiveData - - override fun getShowSystem(): Boolean = showSystemLiveData.value ?: false - - override fun getShow7Days(): Boolean = show7DaysLiveData.value ?: false - /** Companion object for [PermissionUsageDetailsViewModel]. */ companion object { - const val ONE_HOUR_MS = 3_600_000 const val ONE_MINUTE_MS = 60_000 const val CLUSTER_SPACING_MINUTES: Long = 1L - private const val TELECOM_PACKAGE = "com.android.server.telecom" val TIME_7_DAYS_DURATION: Long = DAYS.toMillis(7) val TIME_24_HOURS_DURATION: Long = DAYS.toMillis(1) internal const val SHOULD_SHOW_SYSTEM_KEY = "showSystem" @@ -694,7 +304,7 @@ class PermissionUsageDetailsViewModel( listOf( Manifest.permission_group.CAMERA, Manifest.permission_group.LOCATION, - Manifest.permission_group.MICROPHONE + Manifest.permission_group.MICROPHONE, ) .flatMap { group -> PermissionMapping.getPlatformPermissionNamesOfGroup(group) } .mapNotNull { permName -> AppOpsManager.permissionToOp(permName) } @@ -719,7 +329,7 @@ class PermissionUsageDetailsViewModel( accessStartTime: Long, accessEndTime: Long, showingAttribution: Boolean, - attributionTags: Set<String> + attributionTags: Set<String>, ): Intent { return getManagePermissionUsageIntent( context, @@ -728,7 +338,7 @@ class PermissionUsageDetailsViewModel( accessStartTime, accessEndTime, showingAttribution, - attributionTags + attributionTags, ) ?: getDefaultManageAppPermissionsIntent(packageName, userHandle) } @@ -736,6 +346,7 @@ class PermissionUsageDetailsViewModel( * Gets an [Intent.ACTION_MANAGE_PERMISSION_USAGE] intent, or null if attribution shouldn't * be shown or the intent can't be handled. */ + @Suppress("DEPRECATION") private fun getManagePermissionUsageIntent( context: Context, packageName: String, @@ -743,7 +354,7 @@ class PermissionUsageDetailsViewModel( accessStartTime: Long, accessEndTime: Long, showingAttribution: Boolean, - attributionTags: Set<String> + attributionTags: Set<String>, ): Intent? { if ( !showingAttribution || @@ -768,13 +379,13 @@ class PermissionUsageDetailsViewModel( val resolveInfo = context.packageManager.resolveActivity( intent, - PackageManager.ResolveInfoFlags.of(0) + PackageManager.ResolveInfoFlags.of(0), ) if ( resolveInfo?.activityInfo == null || !Objects.equals( resolveInfo.activityInfo.permission, - Manifest.permission.START_VIEW_PERMISSION_USAGE + Manifest.permission.START_VIEW_PERMISSION_USAGE, ) ) { return null @@ -785,39 +396,75 @@ class PermissionUsageDetailsViewModel( private fun getDefaultManageAppPermissionsIntent( packageName: String, - userHandle: UserHandle + userHandle: UserHandle, ): Intent { + @Suppress("DEPRECATION") return Intent(Intent.ACTION_MANAGE_APP_PERMISSIONS).apply { putExtra(Intent.EXTRA_USER, userHandle) putExtra(Intent.EXTRA_PACKAGE_NAME, packageName) } } - private fun isLocationByPassEnabled(): Boolean = - SdkLevel.isAtLeastV() && Flags.locationBypassPrivacyDashboardEnabled() + private fun isLocationByPassEnabled(): Boolean = SdkLevel.isAtLeastV() + + fun create( + app: Application, + handle: SavedStateHandle, + permissionGroup: String, + ): PermissionUsageDetailsViewModel { + val permissionRepository = PermissionRepository.getInstance(app) + val packageRepository = PackageRepository.getInstance(app) + val appOpRepository = AppOpRepository.getInstance(app, permissionRepository) + val roleRepository = RoleRepository.getInstance(app) + val userRepository = UserRepository.getInstance(app) + val useCase = + GetPermissionGroupUsageDetailsUseCase( + permissionGroup, + packageRepository, + permissionRepository, + appOpRepository, + roleRepository, + userRepository, + ) + return PermissionUsageDetailsViewModel(app, useCase, handle, permissionGroup) + } + } + + /** Data used to create a preference for an app's permission usage. */ + data class AppPermissionAccessUiInfo( + val userHandle: UserHandle, + val packageName: String, + val packageLabel: String, + val permissionGroup: String, + val accessStartTime: Long, + val accessEndTime: Long, + val summaryText: CharSequence?, + val showingAttribution: Boolean, + val attributionTags: Set<String>, + val badgedPackageIcon: Drawable?, + val isEmergencyLocationAccess: Boolean, + ) + + sealed class PermissionUsageDetailsUiState { + data object Loading : PermissionUsageDetailsUiState() + + data class Success( + val appPermissionAccessUiInfoList: List<AppPermissionAccessUiInfo>, + val containsSystemAppUsage: Boolean, + val showSystem: Boolean, + val show7Days: Boolean, + ) : PermissionUsageDetailsUiState() } /** Factory for [PermissionUsageDetailsViewModel]. */ @RequiresApi(Build.VERSION_CODES.S) class PermissionUsageDetailsViewModelFactory( val app: Application, - owner: SavedStateRegistryOwner, private val permissionGroup: String, - ) : AbstractSavedStateViewModelFactory(owner, Bundle()) { - override fun <T : ViewModel> create( - key: String, - modelClass: Class<T>, - handle: SavedStateHandle, - ): T { + ) : ViewModelProvider.Factory { + override fun <T : ViewModel> create(modelClass: Class<T>, extras: CreationExtras): T { @Suppress("UNCHECKED_CAST") - return if ( - com.android.permission.flags.Flags.livedataRefactorPermissionTimelineEnabled() - ) { - Log.d("PermissionTimeline", "timeline refactor flag enabled..") - PermissionUsageDetailsViewModelV2.create(app, handle, permissionGroup) as T - } else { - PermissionUsageDetailsViewModel(app, handle, permissionGroup) as T - } + return create(app, extras.createSavedStateHandle(), permissionGroup) as T } } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageDetailsViewModelV2.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageDetailsViewModelV2.kt deleted file mode 100644 index 312a7ee20..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/model/v31/PermissionUsageDetailsViewModelV2.kt +++ /dev/null @@ -1,242 +0,0 @@ -/* - * Copyright (C) 2024 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.permissioncontroller.permission.ui.model.v31 - -import android.app.AppOpsManager.OPSTR_EMERGENCY_LOCATION -import android.app.Application -import android.graphics.drawable.Drawable -import android.os.UserHandle -import androidx.annotation.VisibleForTesting -import androidx.lifecycle.LiveData -import androidx.lifecycle.SavedStateHandle -import androidx.lifecycle.asLiveData -import androidx.lifecycle.viewModelScope -import com.android.permissioncontroller.DeviceUtils -import com.android.permissioncontroller.R -import com.android.permissioncontroller.appops.data.repository.v31.AppOpRepository -import com.android.permissioncontroller.permission.data.repository.v31.PermissionRepository -import com.android.permissioncontroller.permission.domain.model.v31.PermissionTimelineUsageModel -import com.android.permissioncontroller.permission.domain.model.v31.PermissionTimelineUsageModelWrapper -import com.android.permissioncontroller.permission.domain.usecase.v31.GetPermissionGroupUsageDetailsUseCase -import com.android.permissioncontroller.permission.domain.usecase.v31.isLocationByPassEnabled -import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.Companion.SHOULD_SHOW_7_DAYS_KEY -import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.Companion.SHOULD_SHOW_SYSTEM_KEY -import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.Companion.TIME_24_HOURS_DURATION -import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.Companion.TIME_7_DAYS_DURATION -import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.PermissionUsageDetailsUiState -import com.android.permissioncontroller.pm.data.repository.v31.PackageRepository -import com.android.permissioncontroller.role.data.repository.v31.RoleRepository -import com.android.permissioncontroller.user.data.repository.v31.UserRepository -import java.time.Instant -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.SharingStarted -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.combine -import kotlinx.coroutines.flow.flowOn -import kotlinx.coroutines.flow.stateIn - -class PermissionUsageDetailsViewModelV2( - app: Application, - private val getPermissionUsageDetailsUseCase: GetPermissionGroupUsageDetailsUseCase, - private val state: SavedStateHandle, - private val permissionGroup: String, - scope: CoroutineScope? = null, - private val defaultDispatcher: CoroutineDispatcher = Dispatchers.Default, - private val packageRepository: PackageRepository = PackageRepository.getInstance(app) -) : BasePermissionUsageDetailsViewModel(app) { - private val coroutineScope = scope ?: viewModelScope - private val context = app - - private val showSystemFlow = MutableStateFlow(state[SHOULD_SHOW_SYSTEM_KEY] ?: false) - private val show7DaysFlow = MutableStateFlow(state[SHOULD_SHOW_7_DAYS_KEY] ?: false) - - private val permissionTimelineUsagesFlow: - StateFlow<PermissionTimelineUsageModelWrapper> by lazy { - getPermissionUsageDetailsUseCase(coroutineScope) - .flowOn(defaultDispatcher) - .stateIn( - coroutineScope, - SharingStarted.WhileSubscribed(5000), - PermissionTimelineUsageModelWrapper.Loading - ) - } - - @VisibleForTesting - val permissionUsageDetailsUiStateFlow: Flow<PermissionUsageDetailsUiState> by lazy { - combine(permissionTimelineUsagesFlow, showSystemFlow, show7DaysFlow) { - permissionTimelineUsages, - showSystem, - show7Days -> - permissionTimelineUsages.buildPermissionUsageDetailsUiInfo(showSystem, show7Days) - } - .flowOn(defaultDispatcher) - } - - override fun getPermissionUsagesDetailsInfoUiLiveData(): - LiveData<PermissionUsageDetailsUiState> { - return permissionUsageDetailsUiStateFlow.asLiveData( - context = coroutineScope.coroutineContext - ) - } - - private fun PermissionTimelineUsageModelWrapper.buildPermissionUsageDetailsUiInfo( - showSystem: Boolean, - show7Days: Boolean - ): PermissionUsageDetailsUiState { - if (this is PermissionTimelineUsageModelWrapper.Loading) { - return PermissionUsageDetailsUiState.Loading - } - val timelineUsageModels = - (this as PermissionTimelineUsageModelWrapper.Success).timelineUsageModels - val startTime = - (System.currentTimeMillis() - getUsageDuration(show7Days)).coerceAtLeast( - Instant.EPOCH.toEpochMilli() - ) - - val permissionTimelineUsageModels = - timelineUsageModels.filter { it.accessEndMillis > startTime } - val containsSystemUsages = permissionTimelineUsageModels.any { !it.isUserSensitive } - val result = - permissionTimelineUsageModels - .filter { showSystem || it.isUserSensitive } - .map { clusterOps -> - val durationSummaryLabel = - if (clusterOps.durationMillis > 0) { - getDurationSummary(clusterOps.durationMillis) - } else { - null - } - val proxyLabel = getProxyPackageLabel(clusterOps) - val isEmergencyLocationAccess = - isLocationByPassEnabled() && - clusterOps.opNames.any { it == OPSTR_EMERGENCY_LOCATION } - val subAttributionLabel = - if (isEmergencyLocationAccess) { - emergencyLocationAttributionLabel - } else { - clusterOps.attributionLabel - } - val showingSubAttribution = !subAttributionLabel.isNullOrEmpty() - val summary = - buildUsageSummary(subAttributionLabel, proxyLabel, durationSummaryLabel) - PermissionUsageDetailsViewModel.AppPermissionAccessUiInfo( - UserHandle.of(clusterOps.userId), - clusterOps.packageName, - getPackageLabel(clusterOps.packageName, UserHandle.of(clusterOps.userId)), - permissionGroup, - clusterOps.accessStartMillis, - clusterOps.accessEndMillis, - summary, - showingSubAttribution, - clusterOps.attributionTags ?: emptySet(), - getBadgedPackageIcon( - clusterOps.packageName, - UserHandle.of(clusterOps.userId) - ), - isEmergencyLocationAccess - ) - } - .sortedBy { -1 * it.accessStartTime } - return PermissionUsageDetailsUiState.Success( - result, - containsSystemUsages, - showSystem, - show7Days - ) - } - - private val emergencyLocationAttributionLabel: String by lazy { - context.getString(R.string.privacy_dashboard_emergency_location_enforced_attribution_label) - } - - override fun getShowSystem(): Boolean = showSystemFlow.value - - override val showSystemLiveData = - showSystemFlow.asLiveData(context = coroutineScope.coroutineContext) - - override fun getShow7Days(): Boolean = show7DaysFlow.value - - private fun getUsageDuration(show7Days: Boolean): Long { - return if (show7Days && DeviceUtils.isHandheld()) { - TIME_7_DAYS_DURATION - } else { - TIME_24_HOURS_DURATION - } - } - - private fun getProxyPackageLabel(accessCluster: PermissionTimelineUsageModel): String? = - accessCluster.proxyPackageName?.let { proxyPackageName -> - if (accessCluster.proxyUserId != null) { - getPackageLabel(proxyPackageName, UserHandle.of(accessCluster.proxyUserId)) - } else null - } - - override fun updateShowSystemAppsToggle(showSystem: Boolean) { - if (showSystem != state[SHOULD_SHOW_SYSTEM_KEY]) { - state[SHOULD_SHOW_SYSTEM_KEY] = showSystem - } - showSystemFlow.compareAndSet(!showSystem, showSystem) - } - - override fun updateShow7DaysToggle(show7Days: Boolean) { - if (show7Days != state[SHOULD_SHOW_7_DAYS_KEY]) { - state[SHOULD_SHOW_7_DAYS_KEY] = show7Days - } - show7DaysFlow.compareAndSet(!show7Days, show7Days) - } - - // TODO review these methods when old impl is removed, suspend function?? - override fun getPackageLabel(app: Application, packageName: String, user: UserHandle): String { - return packageRepository.getPackageLabel(packageName, user) - } - - override fun getBadgedPackageIcon( - app: Application, - packageName: String, - user: UserHandle - ): Drawable? { - return packageRepository.getBadgedPackageIcon(packageName, user) - } - - companion object { - fun create( - app: Application, - handle: SavedStateHandle, - permissionGroup: String - ): PermissionUsageDetailsViewModelV2 { - val permissionRepository = PermissionRepository.getInstance(app) - val packageRepository = PackageRepository.getInstance(app) - val appOpRepository = AppOpRepository.getInstance(app, permissionRepository) - val roleRepository = RoleRepository.getInstance(app) - val userRepository = UserRepository.getInstance(app) - val useCase = - GetPermissionGroupUsageDetailsUseCase( - permissionGroup, - packageRepository, - permissionRepository, - appOpRepository, - roleRepository, - userRepository - ) - return PermissionUsageDetailsViewModelV2(app, useCase, handle, permissionGroup) - } - } -} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/GrantPermissionsWearViewHandler.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/GrantPermissionsWearViewHandler.java index c9e9a2eb1..69b57e362 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/GrantPermissionsWearViewHandler.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/GrantPermissionsWearViewHandler.java @@ -190,6 +190,7 @@ public class GrantPermissionsWearViewHandler implements GrantPermissionsViewHand || mLocationVisibilities[DIALOG_WITH_COARSE_LOCATION_ONLY]) { mViewModel.getPreciseLocationCheckedLiveData().setValue(false); } + mViewModel.getShowDialog().postValue(true); } private void onLocationSwitchChanged(boolean checked) { @@ -271,6 +272,12 @@ public class GrantPermissionsWearViewHandler implements GrantPermissionsViewHand WearGrantPermissionsScreenKt.setContent(root, mViewModel, + () -> { + if (mResultListener != null) { + mResultListener.onPermissionGrantResult(null, null, CANCELED); + } + return Unit.INSTANCE; + }, id -> { onButtonClicked(id); return Unit.INSTANCE; @@ -278,7 +285,8 @@ public class GrantPermissionsWearViewHandler implements GrantPermissionsViewHand checked -> { onLocationSwitchChanged(checked); return Unit.INSTANCE; - }); + } + ); if (mGroupName != null) { updateScreen(); } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/LocationProviderDialogScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/LocationProviderDialogScreen.kt index 510d19706..54ed66f0c 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/LocationProviderDialogScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/LocationProviderDialogScreen.kt @@ -18,49 +18,39 @@ package com.android.permissioncontroller.permission.ui.wear import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import androidx.wear.compose.foundation.SwipeToDismissValue -import androidx.wear.compose.foundation.rememberSwipeToDismissBoxState -import androidx.wear.compose.material.ChipDefaults -import androidx.wear.compose.material.MaterialTheme -import androidx.wear.compose.material.SwipeToDismissBox -import com.android.permissioncontroller.permission.ui.wear.elements.Chip -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionScaffold +import androidx.wear.compose.material3.Dialog import com.android.permissioncontroller.permission.ui.wear.model.LocationProviderInterceptDialogArgs -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButton +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButtonStyle +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionScaffold @Composable -fun LocationProviderDialogScreen(args: LocationProviderInterceptDialogArgs?) { - args?.apply { - val state = rememberSwipeToDismissBoxState() - LaunchedEffect(state.currentValue) { - // If the swipe is complete - if (state.currentValue == SwipeToDismissValue.Dismissed) { - onOkButtonClick() - } - } - SwipeToDismissBox(state = state) { isBackground -> +fun LocationProviderDialogScreen( + showDialog: Boolean, + onDismissRequest: () -> Unit, + args: LocationProviderInterceptDialogArgs?, +) { + Dialog(visible = showDialog, onDismissRequest = onDismissRequest) { + args?.run { WearPermissionScaffold( - materialUIVersion = WearPermissionMaterialUIVersion.MATERIAL2_5, showTimeText = false, image = iconId, title = stringResource(titleId), subtitle = message, - isLoading = isBackground, + isLoading = false, content = { item { - Chip( + WearPermissionButton( label = stringResource(locationSettingsId), - onClick = onLocationSettingsClick, modifier = Modifier.fillMaxWidth(), - textColor = MaterialTheme.colors.surface, - colors = ChipDefaults.primaryChipColors(), + onClick = onLocationSettingsClick, + style = WearPermissionButtonStyle.Primary, ) } item { - Chip( + WearPermissionButton( label = stringResource(okButtonTitleId), onClick = onOkButtonClick, modifier = Modifier.fillMaxWidth(), diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionFragment.kt index 959dc9137..15d0fbe5f 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionFragment.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionFragment.kt @@ -58,8 +58,8 @@ import com.android.permissioncontroller.permission.ui.v33.AdvancedConfirmDialogA import com.android.permissioncontroller.permission.ui.wear.model.AppPermissionConfirmDialogViewModel import com.android.permissioncontroller.permission.ui.wear.model.AppPermissionConfirmDialogViewModelFactory import com.android.permissioncontroller.permission.ui.wear.model.ConfirmDialogArgs -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionTheme import com.android.permissioncontroller.permission.utils.KotlinUtils.getPermGroupLabel +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionTheme import com.android.settingslib.RestrictedLockUtils /** @@ -98,7 +98,7 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { userHandle: UserHandle?, caller: String?, sessionId: Long, - grantCategory: String? + grantCategory: String?, ): Bundle { val arguments = Bundle() arguments.putString(Intent.EXTRA_PACKAGE_NAME, packageName) @@ -118,7 +118,7 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View? { val activity = requireActivity() val packageName = @@ -145,7 +145,7 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { packageName, permGroupName, user, - sessionId + sessionId, ) val viewModel = ViewModelProvider(this, factory).get(AppPermissionViewModel::class.java) confirmDialogViewModel = @@ -182,14 +182,14 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { this, this, param.request, - param.buttonClickAction + param.buttonClickAction, ) } else { showConfirmDialog( ChangeRequest.GRANT_ALL_FILE_ACCESS, R.string.special_file_access_dialog, -1, - false + false, ) } setResult(param.result, permGroupName) @@ -207,7 +207,7 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { this, this, ChangeRequest.GRANT_BOTH, - APP_PERMISSION_FRAGMENT_ACTION_REPORTED__BUTTON_PRESSED__ALLOW + APP_PERMISSION_FRAGMENT_ACTION_REPORTED__BUTTON_PRESSED__ALLOW, ) } else { viewModel.onDenyAnyWay(args.changeRequest, args.buttonPressed, args.oneTime) @@ -225,7 +225,7 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { this, this, args.changeRequest!!, - args.buttonClicked!! + args.buttonClicked!!, ) confirmDialogViewModel.showAdvancedConfirmDialogLiveData.value = false } @@ -250,7 +250,7 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { onConfirmDialogCancelButtonClick, onAdvancedConfirmDialogOkButtonClick, onAdvancedConfirmDialogCancelButtonClick, - onDisabledAllowButtonTap + onDisabledAllowButtonTap, ) } } @@ -261,14 +261,14 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { changeRequest: ChangeRequest, @StringRes messageId: Int, buttonPressed: Int, - oneTime: Boolean + oneTime: Boolean, ) { confirmDialogViewModel.confirmDialogArgs = ConfirmDialogArgs( messageId = messageId, changeRequest = changeRequest, buttonPressed = buttonPressed, - oneTime = oneTime + oneTime = oneTime, ) confirmDialogViewModel.showConfirmDialogLiveData.value = true } @@ -284,7 +284,7 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { Intent() .putExtra( ManagePermissionsActivity.EXTRA_RESULT_PERMISSION_INTERACTED, - permGroupName + permGroupName, ) .putExtra(ManagePermissionsActivity.EXTRA_RESULT_PERMISSION_RESULT, result) requireActivity().setResult(Activity.RESULT_OK, intent) @@ -298,7 +298,7 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { ChangeRequest.GRANT_FOREGROUND, APP_PERMISSION_FRAGMENT_ACTION_REPORTED__BUTTON_PRESSED__ALLOW, GRANTED_ALWAYS, - false + false, ) ButtonType.ALLOW_ALWAYS -> GrantedStateChangeParam( @@ -306,7 +306,7 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { ChangeRequest.GRANT_BOTH, APP_PERMISSION_FRAGMENT_ACTION_REPORTED__BUTTON_PRESSED__ALLOW_ALWAYS, GRANTED_ALWAYS, - true + true, ) ButtonType.ALLOW_FOREGROUND -> GrantedStateChangeParam( @@ -314,7 +314,7 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { ChangeRequest.GRANT_FOREGROUND_ONLY, APP_PERMISSION_FRAGMENT_ACTION_REPORTED__BUTTON_PRESSED__ALLOW_FOREGROUND, GRANTED_FOREGROUND_ONLY, - true + true, ) ButtonType.ASK -> GrantedStateChangeParam( @@ -322,7 +322,7 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { ChangeRequest.REVOKE_BOTH, APP_PERMISSION_FRAGMENT_ACTION_REPORTED__BUTTON_PRESSED__ASK_EVERY_TIME, DENIED, - false + false, ) ButtonType.DENY -> GrantedStateChangeParam( @@ -330,7 +330,7 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { ChangeRequest.REVOKE_BOTH, APP_PERMISSION_FRAGMENT_ACTION_REPORTED__BUTTON_PRESSED__DENY, DENIED_DO_NOT_ASK_AGAIN, - false + false, ) ButtonType.DENY_FOREGROUND -> GrantedStateChangeParam( @@ -338,7 +338,7 @@ class WearAppPermissionFragment : Fragment(), ConfirmDialogShowingFragment { ChangeRequest.REVOKE_FOREGROUND, APP_PERMISSION_FRAGMENT_ACTION_REPORTED__BUTTON_PRESSED__DENY_FOREGROUND, DENIED_DO_NOT_ASK_AGAIN, - false + false, ) else -> throw RuntimeException("Wrong button type: $buttonType") } @@ -349,5 +349,5 @@ data class GrantedStateChangeParam( val request: ChangeRequest, val buttonClickAction: Int, val result: Int, - val requiresCustomStorageBehavior: Boolean + val requiresCustomStorageBehavior: Boolean, ) diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsFragment.kt index 552876b7d..06d14cc14 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsFragment.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsFragment.kt @@ -48,7 +48,7 @@ import com.android.permissioncontroller.permission.ui.wear.model.WearAppPermissi import com.android.permissioncontroller.permission.ui.wear.model.WearAppPermissionUsagesViewModelFactory import com.android.permissioncontroller.permission.ui.wear.model.WearLocationProviderInterceptDialogViewModel import com.android.permissioncontroller.permission.ui.wear.model.WearLocationProviderInterceptDialogViewModelFactory -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionTheme +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionTheme import java.time.Instant import java.util.concurrent.TimeUnit @@ -63,7 +63,7 @@ class WearAppPermissionGroupsFragment : Fragment(), PermissionsUsagesChangeCallb override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View? { val packageName = arguments?.getString(Intent.EXTRA_PACKAGE_NAME) ?: "" val user = @@ -93,7 +93,7 @@ class WearAppPermissionGroupsFragment : Fragment(), PermissionsUsagesChangeCallb val viewModel = ViewModelProvider( owner = this, - factory = AppPermissionGroupsViewModelFactory(packageName, user, sessionId) + factory = AppPermissionGroupsViewModelFactory(packageName, user, sessionId), )[AppPermissionGroupsViewModel::class.java] wearViewModel = @@ -103,13 +103,13 @@ class WearAppPermissionGroupsFragment : Fragment(), PermissionsUsagesChangeCallb val revokeDialogViewModel = ViewModelProvider( owner = this, - factory = AppPermissionGroupsRevokeDialogViewModelFactory() + factory = AppPermissionGroupsRevokeDialogViewModelFactory(), )[AppPermissionGroupsRevokeDialogViewModel::class.java] val locationProviderInterceptDialogViewModel = ViewModelProvider( owner = this, - factory = WearLocationProviderInterceptDialogViewModelFactory() + factory = WearLocationProviderInterceptDialogViewModelFactory(), )[WearLocationProviderInterceptDialogViewModel::class.java] val context = requireContext() @@ -125,7 +125,7 @@ class WearAppPermissionGroupsFragment : Fragment(), PermissionsUsagesChangeCallb maxOf( System.currentTimeMillis() - TimeUnit.DAYS.toMillis(aggregateDataFilterBeginDays), - Instant.EPOCH.toEpochMilli() + Instant.EPOCH.toEpochMilli(), ) permissionUsages.load( null, @@ -137,7 +137,7 @@ class WearAppPermissionGroupsFragment : Fragment(), PermissionsUsagesChangeCallb false, false, this, - false + false, ) } helper = @@ -151,7 +151,7 @@ class WearAppPermissionGroupsFragment : Fragment(), PermissionsUsagesChangeCallb viewModel = viewModel, wearViewModel = wearViewModel, revokeDialogViewModel = revokeDialogViewModel, - locationProviderInterceptDialogViewModel = locationProviderInterceptDialogViewModel + locationProviderInterceptDialogViewModel = locationProviderInterceptDialogViewModel, ) return ComposeView(activity).apply { diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsHelper.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsHelper.kt index 2933d6fda..38a3b44e9 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsHelper.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsHelper.kt @@ -44,6 +44,7 @@ import com.android.permissioncontroller.permission.ui.wear.model.WearAppPermissi import com.android.permissioncontroller.permission.ui.wear.model.WearLocationProviderInterceptDialogViewModel import com.android.permissioncontroller.permission.utils.ArrayUtils import com.android.permissioncontroller.permission.utils.LocationUtils +import com.android.permissioncontroller.permission.utils.PermissionMapping import com.android.permissioncontroller.permission.utils.Utils import com.android.permissioncontroller.permission.utils.legacy.LegacySafetyNetLogger import com.android.permissioncontroller.permission.utils.navigateSafe @@ -59,7 +60,7 @@ class WearAppPermissionGroupsHelper( val wearViewModel: WearAppPermissionUsagesViewModel, val revokeDialogViewModel: AppPermissionGroupsRevokeDialogViewModel, val locationProviderInterceptDialogViewModel: WearLocationProviderInterceptDialogViewModel, - private val toggledGroups: ArraySet<AppPermissionGroup> = ArraySet() + private val toggledGroups: ArraySet<AppPermissionGroup> = ArraySet(), ) { fun getPermissionGroupChipParams( appPermissionUsages: List<AppPermissionUsage> @@ -71,7 +72,7 @@ class WearAppPermissionGroupsHelper( viewModel.extractGroupUsageLastAccessTime( groupUsageLastAccessTime, appPermissionUsages, - packageName + packageName, ) val groupUiInfos = viewModel.packagePermGroupsLiveData.value val groups: List<AppPermissionGroup> = appPermissions.permissionGroups @@ -92,7 +93,7 @@ class WearAppPermissionGroupsHelper( groups .filter { Utils.shouldShowPermission(context, it) } - .partition { it.declaringPackage == Utils.OS_PKG } + .partition { PermissionMapping.isPlatformPermissionGroup(it.name) } .let { it.first.plus(it.second) } .forEach { group -> if (Utils.areGroupPermissionsIndividuallyControlled(context, group.name)) { @@ -107,7 +108,7 @@ class WearAppPermissionGroupsHelper( checked = group.areRuntimePermissionsGranted(arrayOf(perm.name)), onCheckedChanged = { checked -> run { onPermissionGrantedStateChanged(group, perm, checked) } - } + }, ) ) } @@ -123,10 +124,10 @@ class WearAppPermissionGroupsHelper( getSummary( category, it, - groupUsageLastAccessTime[it.groupName] + groupUsageLastAccessTime[it.groupName], ) }, - onClick = { onPermissionGroupClicked(group, category.categoryName) } + onClick = { onPermissionGroupClicked(group, category.categoryName) }, ) ) } @@ -138,7 +139,7 @@ class WearAppPermissionGroupsHelper( private fun getSummary( category: Category?, groupUiInfo: GroupUiInfo, - lastAccessTime: Long? + lastAccessTime: Long?, ): String { val grantSummary = getGrantSummary(category, groupUiInfo)?.let { context.getString(it) } ?: "" @@ -196,7 +197,7 @@ class WearAppPermissionGroupsHelper( private fun onPermissionGrantedStateChanged( group: AppPermissionGroup, perm: PermissionInfo, - checked: Boolean + checked: Boolean, ) { if (checked) { group.grantRuntimePermissions(true, false, arrayOf(perm.name)) @@ -247,7 +248,7 @@ class WearAppPermissionGroupsHelper( revokeDialogViewModel.hasConfirmedRevoke = true } revokeDialogViewModel.dismissDialog() - } + }, ) } else { revokePermissionInGroup(group, perm.name) @@ -261,7 +262,7 @@ class WearAppPermissionGroupsHelper( if ("user" == Build.TYPE) { Log.e( TAG, - "The impossible happens, permission $permName is not in group $group.name." + "The impossible happens, permission $permName is not in group $group.name.", ) null } else { @@ -291,13 +292,13 @@ class WearAppPermissionGroupsHelper( private fun showRevocationWarningDialog( messageId: Int, onOkButtonClick: () -> Unit, - onCancelButtonClick: () -> Unit = { revokeDialogViewModel.dismissDialog() } + onCancelButtonClick: () -> Unit = { revokeDialogViewModel.dismissDialog() }, ) { revokeDialogViewModel.revokeDialogArgs = RevokeDialogArgs( messageId = messageId, onOkButtonClick = onOkButtonClick, - onCancelButtonClick = onCancelButtonClick + onCancelButtonClick = onCancelButtonClick, ) revokeDialogViewModel.showDialogLiveData.value = true } @@ -315,13 +316,15 @@ class WearAppPermissionGroupsHelper( LocationUtils.isLocationGroupAndControllerExtraPackage( context, permGroupName, - packageName + packageName, ) ) { // Redirect to location controller extra package settings. LocationUtils.startLocationControllerExtraPackageSettings(context, user) - } else if (permGroupName.equals(HEALTH_PERMISSION_GROUP) - && android.permission.flags.Flags.replaceBodySensorPermissionEnabled()) { + } else if ( + permGroupName.equals(HEALTH_PERMISSION_GROUP) && + android.permission.flags.Flags.replaceBodySensorPermissionEnabled() + ) { // Redirect to Health&Fitness UI Utils.navigateToAppHealthConnectSettings(fragment.requireContext(), packageName, user) } else { @@ -333,7 +336,7 @@ class WearAppPermissionGroupsHelper( user, caller, sessionId, - grantCategory + grantCategory, ) fragment.findNavController().navigateSafe(R.id.perm_groups_to_app, args) } @@ -364,7 +367,7 @@ class WearAppPermissionGroupsHelper( viewModel.setAutoRevoke(checked) Log.w(TAG, "setAutoRevoke $checked") } - } + }, ) } @@ -382,12 +385,12 @@ data class PermissionGroupChipParam( val enabled: Boolean = true, val checked: Boolean? = null, val onClick: () -> Unit = {}, - val onCheckedChanged: (Boolean) -> Unit = {} + val onCheckedChanged: (Boolean) -> Unit = {}, ) data class AutoRevokeChipParam( val labelRes: Int, val visible: Boolean, val checked: Boolean = false, - val onCheckedChanged: (Boolean) -> Unit + val onCheckedChanged: (Boolean) -> Unit, ) diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsScreen.kt index ba37205a6..e375910ae 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionGroupsScreen.kt @@ -24,17 +24,20 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.res.stringResource -import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState import com.android.permissioncontroller.R -import com.android.permissioncontroller.permission.ui.wear.elements.AlertDialog -import com.android.permissioncontroller.permission.ui.wear.elements.Chip -import com.android.permissioncontroller.permission.ui.wear.elements.ScrollableScreen -import com.android.permissioncontroller.permission.ui.wear.elements.ToggleChip -import com.android.permissioncontroller.permission.ui.wear.elements.ToggleChipToggleControl import com.android.permissioncontroller.permission.ui.wear.model.RevokeDialogArgs +import com.android.permissioncontroller.wear.permission.components.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.material3.DialogButtonContent +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButton +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionConfirmationDialog +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionToggleControl +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionToggleControlType +import com.android.permissioncontroller.wear.permission.components.theme.ResourceHelper +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionMaterialUIVersion @Composable fun WearAppPermissionGroupsScreen(helper: WearAppPermissionGroupsHelper) { + val materialUIVersion = ResourceHelper.materialUIVersionInSettings val packagePermGroups = helper.viewModel.packagePermGroupsLiveData.observeAsState(null) val autoRevoke = helper.viewModel.autoRevokeLiveData.observeAsState(null) val appPermissionUsages = helper.wearViewModel.appPermissionUsages.observeAsState(emptyList()) @@ -43,6 +46,9 @@ fun WearAppPermissionGroupsScreen(helper: WearAppPermissionGroupsHelper) { helper.locationProviderInterceptDialogViewModel.dialogVisibilityLiveData.observeAsState( false ) + val locationProviderDialogArgs = + helper.locationProviderInterceptDialogViewModel.locationProviderInterceptDialogArgs + .observeAsState(null) var isLoading by remember { mutableStateOf(true) } @@ -50,17 +56,18 @@ fun WearAppPermissionGroupsScreen(helper: WearAppPermissionGroupsHelper) { WearAppPermissionGroupsContent( isLoading, helper.getPermissionGroupChipParams(appPermissionUsages.value), - helper.getAutoRevokeChipParam(autoRevoke.value) + helper.getAutoRevokeChipParam(autoRevoke.value), ) RevokeDialog( + materialUIVersion = materialUIVersion, showDialog = showRevokeDialog.value, - args = helper.revokeDialogViewModel.revokeDialogArgs + args = helper.revokeDialogViewModel.revokeDialogArgs, + ) + LocationProviderDialogScreen( + showDialog = showLocationProviderDialog.value, + onDismissRequest = { helper.locationProviderInterceptDialogViewModel.dismissDialog() }, + args = locationProviderDialogArgs.value, ) - if (showLocationProviderDialog.value) { - LocationProviderDialogScreen( - helper.locationProviderInterceptDialogViewModel.locationProviderInterceptDialogArgs - ) - } } if (isLoading && !packagePermGroups.value.isNullOrEmpty()) { @@ -72,30 +79,32 @@ fun WearAppPermissionGroupsScreen(helper: WearAppPermissionGroupsHelper) { internal fun WearAppPermissionGroupsContent( isLoading: Boolean, permissionGroupChipParams: List<PermissionGroupChipParam>, - autoRevokeChipParam: AutoRevokeChipParam? + autoRevokeChipParam: AutoRevokeChipParam?, ) { ScrollableScreen(title = stringResource(R.string.app_permissions), isLoading = isLoading) { if (permissionGroupChipParams.isEmpty()) { - item { Chip(label = stringResource(R.string.no_permissions), onClick = {}) } + item { + WearPermissionButton(label = stringResource(R.string.no_permissions), onClick = {}) + } } else { for (info in permissionGroupChipParams) { item { if (info.checked != null) { - ToggleChip( - checked = info.checked, + WearPermissionToggleControl( + toggleControl = WearPermissionToggleControlType.Switch, label = info.label, + checked = info.checked, enabled = info.enabled, - toggleControl = ToggleChipToggleControl.Switch, - onCheckedChanged = info.onCheckedChanged + onCheckedChanged = info.onCheckedChanged, ) } else { - Chip( + WearPermissionButton( label = info.label, labelMaxLines = Integer.MAX_VALUE, secondaryLabel = info.summary?.let { info.summary }, secondaryLabelMaxLines = Integer.MAX_VALUE, enabled = info.enabled, - onClick = info.onClick + onClick = info.onClick, ) } } @@ -103,12 +112,12 @@ internal fun WearAppPermissionGroupsContent( autoRevokeChipParam?.let { if (it.visible) { item { - ToggleChip( + WearPermissionToggleControl( checked = it.checked, label = stringResource(it.labelRes), - labelMaxLine = 3, - toggleControl = ToggleChipToggleControl.Switch, - onCheckedChanged = it.onCheckedChanged + labelMaxLines = 3, + toggleControl = WearPermissionToggleControlType.Switch, + onCheckedChanged = it.onCheckedChanged, ) } } @@ -118,14 +127,19 @@ internal fun WearAppPermissionGroupsContent( } @Composable -internal fun RevokeDialog(showDialog: Boolean, args: RevokeDialogArgs?) { - args?.let { - AlertDialog( - showDialog = showDialog, - message = stringResource(it.messageId), - onOKButtonClick = it.onOkButtonClick, - onCancelButtonClick = it.onCancelButtonClick, - scalingLazyListState = rememberScalingLazyListState() +internal fun RevokeDialog( + materialUIVersion: WearPermissionMaterialUIVersion, + showDialog: Boolean, + args: RevokeDialogArgs?, +) { + + args?.run { + WearPermissionConfirmationDialog( + materialUIVersion = materialUIVersion, + show = showDialog, + message = stringResource(messageId), + positiveButtonContent = DialogButtonContent(onClick = onOkButtonClick), + negativeButtonContent = DialogButtonContent(onClick = onCancelButtonClick), ) } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionScreen.kt index 202ad49bb..588f5a4da 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearAppPermissionScreen.kt @@ -24,21 +24,26 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.res.stringResource -import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState import androidx.wear.compose.material.ToggleChipDefaults import com.android.permissioncontroller.R import com.android.permissioncontroller.permission.ui.model.AppPermissionViewModel import com.android.permissioncontroller.permission.ui.model.AppPermissionViewModel.ButtonState import com.android.permissioncontroller.permission.ui.model.AppPermissionViewModel.ButtonType import com.android.permissioncontroller.permission.ui.v33.AdvancedConfirmDialogArgs -import com.android.permissioncontroller.permission.ui.wear.elements.AlertDialog -import com.android.permissioncontroller.permission.ui.wear.elements.ListFooter -import com.android.permissioncontroller.permission.ui.wear.elements.ScrollableScreen -import com.android.permissioncontroller.permission.ui.wear.elements.ToggleChip -import com.android.permissioncontroller.permission.ui.wear.elements.ToggleChipToggleControl -import com.android.permissioncontroller.permission.ui.wear.elements.toggleChipDisabledColors import com.android.permissioncontroller.permission.ui.wear.model.AppPermissionConfirmDialogViewModel import com.android.permissioncontroller.permission.ui.wear.model.ConfirmDialogArgs +import com.android.permissioncontroller.wear.permission.components.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.material2.ListFooter +import com.android.permissioncontroller.wear.permission.components.material2.ToggleChip +import com.android.permissioncontroller.wear.permission.components.material2.toggleChipDisabledColors +import com.android.permissioncontroller.wear.permission.components.material3.DialogButtonContent +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionConfirmationDialog +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionIconBuilder +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionToggleControlType +import com.android.permissioncontroller.wear.permission.components.material3.defaultAlertConfirmIcon +import com.android.permissioncontroller.wear.permission.components.material3.defaultAlertDismissIcon +import com.android.permissioncontroller.wear.permission.components.theme.ResourceHelper +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionMaterialUIVersion import com.android.settingslib.RestrictedLockUtils @Composable @@ -53,8 +58,9 @@ fun WearAppPermissionScreen( onConfirmDialogCancelButtonClick: () -> Unit, onAdvancedConfirmDialogOkButtonClick: (AdvancedConfirmDialogArgs) -> Unit, onAdvancedConfirmDialogCancelButtonClick: () -> Unit, - onDisabledAllowButtonClick: () -> Unit + onDisabledAllowButtonClick: () -> Unit, ) { + val materialUIVersion = ResourceHelper.materialUIVersionInSettings val buttonState = viewModel.buttonStateLiveData.observeAsState(null) val detailResIds = viewModel.detailResIdLiveData.observeAsState(null) val admin = viewModel.showAdminSupportLiveData.observeAsState(null) @@ -73,19 +79,21 @@ fun WearAppPermissionScreen( onLocationSwitchChanged, onGrantedStateChanged, onFooterClicked, - onDisabledAllowButtonClick + onDisabledAllowButtonClick, ) ConfirmDialog( + materialUIVersion = materialUIVersion, showDialog = showConfirmDialog.value, args = confirmDialogViewModel.confirmDialogArgs, onOkButtonClick = onConfirmDialogOkButtonClick, - onCancelButtonClick = onConfirmDialogCancelButtonClick + onCancelButtonClick = onConfirmDialogCancelButtonClick, ) AdvancedConfirmDialog( + materialUIVersion = materialUIVersion, showDialog = showAdvancedConfirmDialog.value, args = confirmDialogViewModel.advancedConfirmDialogArgs, onOkButtonClick = onAdvancedConfirmDialogOkButtonClick, - onCancelButtonClick = onAdvancedConfirmDialogCancelButtonClick + onCancelButtonClick = onAdvancedConfirmDialogCancelButtonClick, ) } if (isLoading && !buttonState.value.isNullOrEmpty()) { @@ -103,7 +111,7 @@ internal fun WearAppPermissionContent( onLocationSwitchChanged: (Boolean) -> Unit, onGrantedStateChanged: (ButtonType, Boolean) -> Unit, onFooterClicked: (RestrictedLockUtils.EnforcedAdmin) -> Unit, - onDisabledAllowButtonClick: () -> Unit + onDisabledAllowButtonClick: () -> Unit, ) { ScrollableScreen(title = title, isLoading = isLoading) { buttonState?.get(ButtonType.LOCATION_ACCURACY)?.let { @@ -113,9 +121,9 @@ internal fun WearAppPermissionContent( checked = it.isChecked, enabled = it.isEnabled, label = stringResource(R.string.app_permission_location_accuracy), - toggleControl = ToggleChipToggleControl.Switch, + toggleControl = WearPermissionToggleControlType.Switch, onCheckedChanged = onLocationSwitchChanged, - labelMaxLine = Integer.MAX_VALUE + labelMaxLine = Integer.MAX_VALUE, ) } } @@ -133,7 +141,7 @@ internal fun WearAppPermissionContent( toggleChipDisabledColors() }, label = labelsByButton(buttonType), - toggleControl = ToggleChipToggleControl.Radio, + toggleControl = WearPermissionToggleControlType.Radio, onCheckedChanged = { checked -> if (it.isEnabled) { onGrantedStateChanged(buttonType, checked) @@ -141,7 +149,7 @@ internal fun WearAppPermissionContent( onDisabledAllowButtonClick() } }, - labelMaxLine = Integer.MAX_VALUE + labelMaxLine = Integer.MAX_VALUE, ) } } @@ -157,7 +165,7 @@ internal fun WearAppPermissionContent( { onFooterClicked(admin) } } else { null - } + }, ) } } @@ -172,7 +180,7 @@ internal val buttonTypeOrder = ButtonType.ASK_ONCE, ButtonType.ASK, ButtonType.DENY, - ButtonType.DENY_FOREGROUND + ButtonType.DENY_FOREGROUND, ) @Composable @@ -191,45 +199,60 @@ internal fun labelsByButton(buttonType: ButtonType) = @Composable internal fun ConfirmDialog( + materialUIVersion: WearPermissionMaterialUIVersion, showDialog: Boolean, args: ConfirmDialogArgs?, onOkButtonClick: (ConfirmDialogArgs) -> Unit, - onCancelButtonClick: () -> Unit + onCancelButtonClick: () -> Unit, ) { - args?.let { - AlertDialog( - showDialog = showDialog, - message = stringResource(it.messageId), - onOKButtonClick = { onOkButtonClick(it) }, - onCancelButtonClick = onCancelButtonClick, - scalingLazyListState = rememberScalingLazyListState() + args?.run { + WearPermissionConfirmationDialog( + materialUIVersion = materialUIVersion, + show = showDialog, + message = stringResource(messageId), + positiveButtonContent = DialogButtonContent(onClick = { onOkButtonClick(this) }), + negativeButtonContent = DialogButtonContent(onClick = { onCancelButtonClick() }), ) } } @Composable internal fun AdvancedConfirmDialog( + materialUIVersion: WearPermissionMaterialUIVersion, showDialog: Boolean, args: AdvancedConfirmDialogArgs?, onOkButtonClick: (AdvancedConfirmDialogArgs) -> Unit, - onCancelButtonClick: () -> Unit + onCancelButtonClick: () -> Unit, ) { - args?.let { - AlertDialog( - showDialog = showDialog, - title = - if (it.titleId != 0) { - stringResource(it.titleId) - } else { - "" - }, - iconRes = it.iconId, - message = stringResource(it.messageId), - okButtonContentDescription = stringResource(it.positiveButtonTextId), - cancelButtonContentDescription = stringResource(it.negativeButtonTextId), - onOKButtonClick = { onOkButtonClick(it) }, - onCancelButtonClick = onCancelButtonClick, - scalingLazyListState = rememberScalingLazyListState() + args?.run { + val title = + if (titleId != 0) { + stringResource(titleId) + } else { + "" + } + val okButtonIconBuilder = + WearPermissionIconBuilder.defaultAlertConfirmIcon() + .contentDescription(stringResource(positiveButtonTextId)) + val cancelButtonIconBuilder = + WearPermissionIconBuilder.defaultAlertDismissIcon() + .contentDescription(stringResource(negativeButtonTextId)) + WearPermissionConfirmationDialog( + materialUIVersion = materialUIVersion, + show = showDialog, + title = title, + iconRes = WearPermissionIconBuilder.builder(iconId), + message = stringResource(messageId), + positiveButtonContent = + DialogButtonContent( + icon = okButtonIconBuilder, + onClick = { onOkButtonClick(this) }, + ), + negativeButtonContent = + DialogButtonContent( + icon = cancelButtonIconBuilder, + onClick = { onCancelButtonClick() }, + ), ) } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearEnhancedConfirmationDialogFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearEnhancedConfirmationDialogFragment.kt index e81fd948d..088531a52 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearEnhancedConfirmationDialogFragment.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearEnhancedConfirmationDialogFragment.kt @@ -27,7 +27,7 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.viewModels import com.android.permissioncontroller.ecm.EnhancedConfirmationDialogActivity import com.android.permissioncontroller.permission.ui.wear.model.WearEnhancedConfirmationViewModel -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionTheme +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionTheme class WearEnhancedConfirmationDialogFragment : DialogFragment() { private lateinit var enhancedConfirmationDialogActivity: EnhancedConfirmationDialogActivity @@ -42,7 +42,7 @@ class WearEnhancedConfirmationDialogFragment : DialogFragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View { val title = arguments?.getString(KEY_TITLE) ?: throw RuntimeException("ECM Title can't be null") diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearEnhancedConfirmationScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearEnhancedConfirmationScreen.kt index 1c31ec96f..1e1f8ba5a 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearEnhancedConfirmationScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearEnhancedConfirmationScreen.kt @@ -33,24 +33,26 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.fragment.app.FragmentActivity import androidx.wear.compose.foundation.SwipeToDismissValue -import androidx.wear.compose.foundation.lazy.ScalingLazyListState import androidx.wear.compose.foundation.rememberSwipeToDismissBoxState import androidx.wear.compose.material.ChipDefaults import androidx.wear.compose.material.CircularProgressIndicator import androidx.wear.compose.material.MaterialTheme import androidx.wear.compose.material.SwipeToDismissBox import com.android.permissioncontroller.R -import com.android.permissioncontroller.permission.ui.wear.elements.AlertDialog -import com.android.permissioncontroller.permission.ui.wear.elements.CheckYourPhoneScreen -import com.android.permissioncontroller.permission.ui.wear.elements.CheckYourPhoneState -import com.android.permissioncontroller.permission.ui.wear.elements.CheckYourPhoneState.InProgress -import com.android.permissioncontroller.permission.ui.wear.elements.CheckYourPhoneState.Success -import com.android.permissioncontroller.permission.ui.wear.elements.Chip -import com.android.permissioncontroller.permission.ui.wear.elements.ScrollableScreen -import com.android.permissioncontroller.permission.ui.wear.elements.dismiss -import com.android.permissioncontroller.permission.ui.wear.elements.findActivity import com.android.permissioncontroller.permission.ui.wear.model.WearEnhancedConfirmationViewModel import com.android.permissioncontroller.permission.ui.wear.model.WearEnhancedConfirmationViewModel.ScreenState +import com.android.permissioncontroller.wear.permission.components.CheckYourPhoneScreen +import com.android.permissioncontroller.wear.permission.components.CheckYourPhoneState +import com.android.permissioncontroller.wear.permission.components.CheckYourPhoneState.InProgress +import com.android.permissioncontroller.wear.permission.components.CheckYourPhoneState.Success +import com.android.permissioncontroller.wear.permission.components.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.dismiss +import com.android.permissioncontroller.wear.permission.components.findActivity +import com.android.permissioncontroller.wear.permission.components.material2.Chip +import com.android.permissioncontroller.wear.permission.components.material3.DialogButtonContent +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionConfirmationDialog +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionIconBuilder +import com.android.permissioncontroller.wear.permission.components.theme.ResourceHelper @Composable fun WearEnhancedConfirmationScreen( @@ -58,6 +60,7 @@ fun WearEnhancedConfirmationScreen( title: String?, message: CharSequence?, ) { + val materialUIVersion = ResourceHelper.materialUIVersionInSettings var dismissed by remember { mutableStateOf(false) } val context = LocalContext.current val ecmScreenState = remember { viewModel.screenState } @@ -97,7 +100,7 @@ fun WearEnhancedConfirmationScreen( onClick = { dismiss(activity) }, modifier = Modifier.fillMaxWidth(), textColor = MaterialTheme.colors.surface, - colors = ChipDefaults.primaryChipColors() + colors = ChipDefaults.primaryChipColors(), ) } item { @@ -107,27 +110,30 @@ fun WearEnhancedConfirmationScreen( modifier = Modifier.fillMaxWidth(), ) } - } + }, ) @Composable fun ShowCheckYourPhoneDialog(state: CheckYourPhoneState) = CheckYourPhoneScreen( title = stringResource(id = R.string.wear_check_your_phone_title), - state = state + state = state, ) @Composable fun ShowRemoteConnectionErrorDialog() = - AlertDialog( + WearPermissionConfirmationDialog( + materialUIVersion = materialUIVersion, + show = true, title = stringResource(R.string.wear_phone_connection_error), message = stringResource(R.string.wear_phone_connection_should_retry), - iconRes = R.drawable.ic_error, - showDialog = true, - okButtonIcon = R.drawable.ic_refresh, - onOKButtonClick = { viewModel.openUriOnPhone(context) }, - onCancelButtonClick = { dismiss(activity) }, - scalingLazyListState = ScalingLazyListState(1) + iconRes = WearPermissionIconBuilder.builder(R.drawable.ic_error), + positiveButtonContent = + DialogButtonContent( + icon = WearPermissionIconBuilder.builder(R.drawable.ic_refresh), + onClick = { viewModel.openUriOnPhone(context) }, + ), + negativeButtonContent = DialogButtonContent(onClick = { dismiss(activity) }), ) SwipeToDismissBox(state = state) { isBackground -> diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearGrantPermissionsScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearGrantPermissionsScreen.kt index 1498b91b6..f918da729 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearGrantPermissionsScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearGrantPermissionsScreen.kt @@ -22,6 +22,8 @@ import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Modifier import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.res.stringResource +import androidx.core.util.size +import androidx.wear.compose.material3.Dialog import com.android.permissioncontroller.R import com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.ALLOW_ALWAYS_BUTTON import com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.ALLOW_BUTTON @@ -37,14 +39,13 @@ import com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.N import com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.NO_UPGRADE_OT_AND_DONT_ASK_AGAIN_BUTTON import com.android.permissioncontroller.permission.ui.GrantPermissionsActivity.NO_UPGRADE_OT_BUTTON import com.android.permissioncontroller.permission.ui.wear.GrantPermissionsWearViewHandler.BUTTON_RES_ID_TO_NUM -import com.android.permissioncontroller.permission.ui.wear.elements.ScrollableScreen -import com.android.permissioncontroller.permission.ui.wear.elements.ToggleChipToggleControl -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionButton -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionToggleControl import com.android.permissioncontroller.permission.ui.wear.model.WearGrantPermissionsViewModel -import com.android.permissioncontroller.permission.ui.wear.theme.ResourceHelper -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion.MATERIAL2_5 -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion.MATERIAL3 +import com.android.permissioncontroller.wear.permission.components.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButton +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionToggleControl +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionToggleControlType +import com.android.permissioncontroller.wear.permission.components.theme.ResourceHelper +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionMaterialUIVersion.MATERIAL3 @Composable fun WearGrantPermissionsScreen( @@ -58,15 +59,10 @@ fun WearGrantPermissionsScreen( val locationVisibilities = viewModel.locationVisibilitiesLiveData.observeAsState(emptyList()) val preciseLocationChecked = viewModel.preciseLocationCheckedLiveData.observeAsState(false) val buttonVisibilities = viewModel.buttonVisibilitiesLiveData.observeAsState(emptyList()) - val materialUIVersion = - if (ResourceHelper.material3Enabled) { - MATERIAL3 - } else { - MATERIAL2_5 - } - + val materialUIVersion = ResourceHelper.materialUIVersionInApp ScrollableScreen( materialUIVersion = materialUIVersion, + asScalingList = true, showTimeText = false, image = icon.value, title = groupMessage.value, @@ -83,14 +79,14 @@ fun WearGrantPermissionsScreen( checked = preciseLocationChecked.value, onCheckedChanged = onLocationSwitchChanged, label = stringResource(R.string.app_permission_location_accuracy), - toggleControl = ToggleChipToggleControl.Switch, + toggleControl = WearPermissionToggleControlType.Switch, modifier = Modifier.fillMaxWidth(), labelMaxLines = Integer.MAX_VALUE, materialUIVersion = materialUIVersion, ) } } - for (i in 0 until BUTTON_RES_ID_TO_NUM.size()) { + for (i in 0 until BUTTON_RES_ID_TO_NUM.size) { val pos: Int = BUTTON_RES_ID_TO_NUM.valueAt(i) if (buttonVisibilities.value.size <= pos) { // initial value of buttonVisibilities is empty @@ -119,15 +115,32 @@ fun WearGrantPermissionsScreen( fun setContent( composeView: ComposeView, viewModel: WearGrantPermissionsViewModel, + onCancelled: () -> Unit, onButtonClicked: (Int) -> Unit, onLocationSwitchChanged: (Boolean) -> Unit, ) { composeView.setContent { - WearGrantPermissionsScreen(viewModel, onButtonClicked, onLocationSwitchChanged) + if (ResourceHelper.materialUIVersionInApp == MATERIAL3) { + AsDialog(viewModel, onCancelled) { + WearGrantPermissionsScreen(viewModel, onButtonClicked, onLocationSwitchChanged) + } + } else { + WearGrantPermissionsScreen(viewModel, onButtonClicked, onLocationSwitchChanged) + } } } @Composable +private fun AsDialog( + viewModel: WearGrantPermissionsViewModel, + onDismissRequest: () -> Unit, + content: @Composable () -> Unit, +) { + val showDialog = viewModel.showDialog.observeAsState(false) + Dialog(visible = showDialog.value, onDismissRequest = onDismissRequest, content = content) +} + +@Composable internal fun labelsByButton(grantPermissionsButtonType: Int) = when (grantPermissionsButtonType) { ALLOW_BUTTON -> stringResource(R.string.grant_dialog_button_allow) diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageCustomPermissionScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageCustomPermissionScreen.kt index 1563f6a57..72c3d2054 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageCustomPermissionScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageCustomPermissionScreen.kt @@ -25,13 +25,14 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.res.stringResource import com.android.permissioncontroller.R import com.android.permissioncontroller.permission.ui.model.ManageCustomPermissionsViewModel -import com.android.permissioncontroller.permission.ui.wear.elements.Chip -import com.android.permissioncontroller.permission.ui.wear.elements.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButton +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionIconBuilder @Composable fun WearManageCustomPermissionScreen( viewModel: ManageCustomPermissionsViewModel, - onPermGroupClick: (String) -> Unit + onPermGroupClick: (String) -> Unit, ) { val permissionGroups = viewModel.uiDataLiveData.observeAsState(emptyMap()) var isLoading by remember { mutableStateOf(true) } @@ -39,7 +40,7 @@ fun WearManageCustomPermissionScreen( WearManageCustomPermissionContent( isLoading, getPermGroupChipParams(permissionGroups.value), - onPermGroupClick + onPermGroupClick, ) if (isLoading && permissionGroups.value.isNotEmpty()) { @@ -51,21 +52,21 @@ fun WearManageCustomPermissionScreen( internal fun WearManageCustomPermissionContent( isLoading: Boolean, permGroupChipParams: List<PermGroupChipParam>, - onPermGroupClick: (String) -> Unit + onPermGroupClick: (String) -> Unit, ) { ScrollableScreen( title = stringResource(R.string.additional_permissions), - isLoading = isLoading + isLoading = isLoading, ) { for (params in permGroupChipParams) { item { - Chip( + WearPermissionButton( label = params.label, labelMaxLines = 3, - icon = params.icon, + iconBuilder = params.icon?.let { WearPermissionIconBuilder.builder(it) }, secondaryLabel = params.secondaryLabel, secondaryLabelMaxLines = 3, - onClick = { onPermGroupClick(params.permGroupName) } + onClick = { onPermGroupClick(params.permGroupName) }, ) } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageCustomPermissionsFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageCustomPermissionsFragment.kt index a9e83919f..96da37b9b 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageCustomPermissionsFragment.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageCustomPermissionsFragment.kt @@ -26,13 +26,13 @@ import androidx.lifecycle.ViewModelProvider import com.android.permissioncontroller.Constants import com.android.permissioncontroller.permission.ui.handheld.PermissionAppsFragment import com.android.permissioncontroller.permission.ui.model.ManageCustomPermissionsViewModel -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionTheme +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionTheme class WearManageCustomPermissionsFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View? { val activity = requireActivity() val application = activity.getApplication() @@ -41,14 +41,14 @@ class WearManageCustomPermissionsFragment : Fragment() { val viewModel = ViewModelProvider( this, - ViewModelProvider.AndroidViewModelFactory.getInstance(application) + ViewModelProvider.AndroidViewModelFactory.getInstance(application), ) .get(ManageCustomPermissionsViewModel::class.java) val onPermGroupClick: (String) -> Unit = { permGroupName -> viewModel.showPermissionApps( this, - PermissionAppsFragment.createArgs(permGroupName, sessionId) + PermissionAppsFragment.createArgs(permGroupName, sessionId), ) } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageStandardPermissionScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageStandardPermissionScreen.kt index 9aacd65d3..2fdf33130 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageStandardPermissionScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageStandardPermissionScreen.kt @@ -29,12 +29,13 @@ import androidx.compose.ui.res.stringResource import com.android.permissioncontroller.R import com.android.permissioncontroller.permission.model.livedatatypes.PermGroupPackagesUiInfo import com.android.permissioncontroller.permission.ui.model.ManageStandardPermissionsViewModel -import com.android.permissioncontroller.permission.ui.wear.elements.Chip -import com.android.permissioncontroller.permission.ui.wear.elements.ScrollableScreen import com.android.permissioncontroller.permission.utils.KotlinUtils.getPermGroupIcon import com.android.permissioncontroller.permission.utils.KotlinUtils.getPermGroupLabel import com.android.permissioncontroller.permission.utils.StringUtils import com.android.permissioncontroller.permission.utils.Utils +import com.android.permissioncontroller.wear.permission.components.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButton +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionIconBuilder import java.text.Collator @Composable @@ -42,7 +43,7 @@ fun WearManageStandardPermissionScreen( viewModel: ManageStandardPermissionsViewModel, onPermGroupClick: (String) -> Unit, onCustomPermissionsClick: () -> Unit, - onAutoRevokedClick: () -> Unit + onAutoRevokedClick: () -> Unit, ) { val permissionGroups = viewModel.uiDataLiveData.observeAsState(emptyMap()) val numCustomPermGroups = viewModel.numCustomPermGroups.observeAsState(0) @@ -56,7 +57,7 @@ fun WearManageStandardPermissionScreen( numAutoRevoked.value, onPermGroupClick, onCustomPermissionsClick, - onAutoRevokedClick + onAutoRevokedClick, ) if (isLoading && permissionGroups.value.isNotEmpty()) { @@ -92,7 +93,7 @@ internal fun getPermGroupChipParams( label = getPermGroupLabel(context, it.key).toString(), icon = getPermGroupIcon(context, it.key), secondaryLabel = - stringResource(summary, uiInfo.nonSystemGranted, uiInfo.nonSystemTotal) + stringResource(summary, uiInfo.nonSystemGranted, uiInfo.nonSystemTotal), ) } .sortedWith { lhs, rhs -> collator.compare(lhs.label, rhs.label) } @@ -107,52 +108,52 @@ internal fun WearManageStandardPermissionContent( numAutoRevoked: Int, onPermGroupClick: (String) -> Unit, onCustomPermissionsClick: () -> Unit, - onAutoRevokedClick: () -> Unit + onAutoRevokedClick: () -> Unit, ) { ScrollableScreen( title = stringResource(R.string.app_permission_manager), - isLoading = isLoading + isLoading = isLoading, ) { for (params in permGroupChipParams) { item { - Chip( + WearPermissionButton( label = params.label, labelMaxLines = 3, - icon = params.icon, + iconBuilder = params.icon?.let { WearPermissionIconBuilder.builder(it) }, secondaryLabel = params.secondaryLabel, secondaryLabelMaxLines = 3, - onClick = { onPermGroupClick(params.permGroupName) } + onClick = { onPermGroupClick(params.permGroupName) }, ) } } if (numCustomPermGroups > 0) { item { - Chip( + WearPermissionButton( label = stringResource(R.string.additional_permissions), labelMaxLines = 3, - icon = R.drawable.ic_more_horizontal, + iconBuilder = WearPermissionIconBuilder.builder(R.drawable.ic_more_horizontal), secondaryLabel = StringUtils.getIcuPluralsString( LocalContext.current, R.string.additional_permissions_more, - numCustomPermGroups + numCustomPermGroups, ), secondaryLabelMaxLines = 3, - onClick = onCustomPermissionsClick + onClick = onCustomPermissionsClick, ) } } if (numAutoRevoked > 0) { item { - Chip( + WearPermissionButton( label = stringResource(R.string.auto_revoke_permission_notification_title), labelMaxLines = 3, - icon = R.drawable.ic_info, + iconBuilder = WearPermissionIconBuilder.builder(R.drawable.ic_info), secondaryLabel = stringResource(R.string.auto_revoke_setting_subtitle), secondaryLabelMaxLines = 3, - onClick = onAutoRevokedClick + onClick = onAutoRevokedClick, ) } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageStandardPermissionsFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageStandardPermissionsFragment.kt index 16ed1f067..d88554562 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageStandardPermissionsFragment.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageStandardPermissionsFragment.kt @@ -27,13 +27,13 @@ import com.android.permissioncontroller.Constants import com.android.permissioncontroller.permission.ui.handheld.ManageCustomPermissionsFragment import com.android.permissioncontroller.permission.ui.handheld.PermissionAppsFragment import com.android.permissioncontroller.permission.ui.model.ManageStandardPermissionsViewModel -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionTheme +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionTheme class WearManageStandardPermissionsFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View? { val activity = requireActivity() val application = activity.getApplication() @@ -42,20 +42,20 @@ class WearManageStandardPermissionsFragment : Fragment() { val viewModel: ManageStandardPermissionsViewModel = ViewModelProvider( this, - ViewModelProvider.AndroidViewModelFactory.getInstance(application) + ViewModelProvider.AndroidViewModelFactory.getInstance(application), ) .get(ManageStandardPermissionsViewModel::class.java) val onPermGroupClick: (String) -> Unit = { permGroupName -> viewModel.showPermissionApps( this, - PermissionAppsFragment.createArgs(permGroupName, sessionId) + PermissionAppsFragment.createArgs(permGroupName, sessionId), ) } val onCustomPermGroupClick = { viewModel.showCustomPermissions( this, - ManageCustomPermissionsFragment.createArgs(sessionId) + ManageCustomPermissionsFragment.createArgs(sessionId), ) } val onAutoRevokeClick = { @@ -69,7 +69,7 @@ class WearManageStandardPermissionsFragment : Fragment() { viewModel, onPermGroupClick, onCustomPermGroupClick, - onAutoRevokeClick + onAutoRevokeClick, ) } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionAppsScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionAppsScreen.kt index 8e779cb8c..6f0d94d02 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionAppsScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionAppsScreen.kt @@ -19,7 +19,6 @@ package com.android.permissioncontroller.permission.ui.wear import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.livedata.observeAsState @@ -28,13 +27,13 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp import androidx.wear.compose.material.Text import com.android.permissioncontroller.R import com.android.permissioncontroller.permission.ui.Category -import com.android.permissioncontroller.permission.ui.wear.elements.Chip -import com.android.permissioncontroller.permission.ui.wear.elements.ListSubheader -import com.android.permissioncontroller.permission.ui.wear.elements.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButton +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionIconBuilder +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionListSubHeader /** Compose the screen associated to a [WearPermissionAppsFragment]. */ @Composable @@ -46,6 +45,10 @@ fun WearPermissionAppsScreen(helper: WearPermissionAppsHelper) { helper.locationProviderDialogViewModel.dialogVisibilityLiveData.observeAsState(false) val appPermissionUsages = helper.wearViewModel.appPermissionUsages.observeAsState(emptyList()) var isLoading by remember { mutableStateOf(true) } + val dialogArgs = + helper.locationProviderDialogViewModel.locationProviderInterceptDialogArgs.observeAsState( + null + ) val title = helper.getTitle() val subTitle = helper.getSubTitle() @@ -53,21 +56,21 @@ fun WearPermissionAppsScreen(helper: WearPermissionAppsHelper) { val chipsByCategory = helper.getChipsByCategory(categorizedApps.value, appPermissionUsages.value) Box(modifier = Modifier.fillMaxSize()) { - val dialogArgs = helper.locationProviderDialogViewModel.locationProviderInterceptDialogArgs - if (showLocationProviderDialog.value && dialogArgs != null) { - LocationProviderDialogScreen(dialogArgs) - } else { - WearPermissionAppsContent( - chipsByCategory = chipsByCategory, - showSystem = showSystem.value, - hasSystemApps = hasSystemApps.value, - title = title, - subtitle = subTitle, - showAlways = showAlways, - isLoading = isLoading, - onShowSystemClick = helper.onShowSystemClick - ) - } + WearPermissionAppsContent( + chipsByCategory = chipsByCategory, + showSystem = showSystem.value, + hasSystemApps = hasSystemApps.value, + title = title, + subtitle = subTitle, + showAlways = showAlways, + isLoading = isLoading, + onShowSystemClick = helper.onShowSystemClick, + ) + LocationProviderDialogScreen( + showDialog = showLocationProviderDialog.value, + onDismissRequest = { helper.locationProviderDialogViewModel.dismissDialog() }, + args = dialogArgs.value, + ) } if (isLoading && categorizedApps.value.isNotEmpty()) { isLoading = false @@ -84,7 +87,7 @@ internal fun WearPermissionAppsContent( subtitle: String, showAlways: Boolean, isLoading: Boolean, - onShowSystemClick: (showSystem: Boolean) -> Unit + onShowSystemClick: (showSystem: Boolean) -> Unit, ) { ScrollableScreen(title = title, subtitle = subtitle, isLoading = isLoading) { val firstItemIndex = categoryOrder.indexOfFirst { !chipsByCategory[it].isNullOrEmpty() } @@ -94,29 +97,22 @@ internal fun WearPermissionAppsContent( continue } item { - ListSubheader( - modifier = - Modifier.padding( - top = if (index == firstItemIndex) 0.dp else 12.dp, - bottom = 4.dp, - start = 14.dp, - end = 14.dp - ) - ) { + WearPermissionListSubHeader(isFirstItemInAList = index == firstItemIndex) { Text(text = stringResource(getCategoryString(category, showAlways))) } } chips.forEach { item { - Chip( + WearPermissionButton( label = it.title, labelMaxLines = Int.MAX_VALUE, secondaryLabel = it.summary, secondaryLabelMaxLines = Int.MAX_VALUE, - icon = it.icon, + iconBuilder = + it.icon?.let { icon -> WearPermissionIconBuilder.builder(icon) }, enabled = it.enabled, onClick = { it.onClick() }, - modifier = Modifier.fillMaxWidth() + modifier = Modifier.fillMaxWidth(), ) } } @@ -124,7 +120,7 @@ internal fun WearPermissionAppsContent( if (hasSystemApps) { item { - Chip( + WearPermissionButton( label = if (showSystem) { stringResource(R.string.menu_hide_system) @@ -150,6 +146,7 @@ internal fun getCategoryString(category: String, showAlways: Boolean) = } else { R.string.allowed_header } + Category.ALLOWED_FOREGROUND.categoryName -> R.string.allowed_foreground_header Category.ASK.categoryName -> R.string.ask_header Category.DENIED.categoryName -> R.string.denied_header @@ -163,5 +160,5 @@ internal val categoryOrder = Category.ALLOWED.categoryName, Category.ALLOWED_FOREGROUND.categoryName, Category.ASK.categoryName, - Category.DENIED.categoryName + Category.DENIED.categoryName, ) diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionUsageDetailsFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionUsageDetailsFragment.kt index 2ade4863a..2d302c2b4 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionUsageDetailsFragment.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionUsageDetailsFragment.kt @@ -29,7 +29,7 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import com.android.permissioncontroller.PermissionControllerApplication import com.android.permissioncontroller.permission.ui.ManagePermissionsActivity -import com.android.permissioncontroller.permission.ui.model.v31.BasePermissionUsageDetailsViewModel +import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.PermissionUsageDetailsViewModelFactory /** @@ -42,7 +42,7 @@ class WearPermissionUsageDetailsFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View? { val permissionGroup = arguments?.getString(Intent.EXTRA_PERMISSION_GROUP_NAME) @@ -56,11 +56,10 @@ class WearPermissionUsageDetailsFragment : Fragment() { val factory = PermissionUsageDetailsViewModelFactory( PermissionControllerApplication.get(), - this, - permissionGroup + permissionGroup, ) val viewModel = - ViewModelProvider(this, factory).get(BasePermissionUsageDetailsViewModel::class.java) + ViewModelProvider(this, factory).get(PermissionUsageDetailsViewModel::class.java) viewModel.updateShowSystemAppsToggle(showSystem) return ComposeView(requireContext()).apply { diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionUsageDetailsScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionUsageDetailsScreen.kt index 1259c1ab5..bea10483b 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionUsageDetailsScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionUsageDetailsScreen.kt @@ -30,22 +30,21 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import androidx.wear.compose.material.ChipDefaults -import androidx.wear.compose.material.MaterialTheme import com.android.permissioncontroller.R -import com.android.permissioncontroller.permission.ui.model.v31.BasePermissionUsageDetailsViewModel import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.AppPermissionAccessUiInfo import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.PermissionUsageDetailsUiState -import com.android.permissioncontroller.permission.ui.wear.elements.Chip -import com.android.permissioncontroller.permission.ui.wear.elements.ScrollableScreen import com.android.permissioncontroller.permission.utils.KotlinUtils +import com.android.permissioncontroller.wear.permission.components.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButton +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButtonStyle +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionIconBuilder @RequiresApi(Build.VERSION_CODES.S) @Composable fun WearPermissionUsageDetailsScreen( permissionGroup: String, - viewModel: BasePermissionUsageDetailsViewModel + viewModel: PermissionUsageDetailsViewModel, ) { val context = LocalContext.current val uiData = viewModel.getPermissionUsagesDetailsInfoUiLiveData().observeAsState(null) @@ -56,7 +55,7 @@ fun WearPermissionUsageDetailsScreen( val subtitle = stringResource( R.string.permission_group_usage_title, - KotlinUtils.getPermGroupLabel(context, permissionGroup) + KotlinUtils.getPermGroupLabel(context, permissionGroup), ) val hasSystemApps: Boolean = @@ -80,7 +79,7 @@ fun WearPermissionUsageDetailsScreen( uiInfo.accessStartTime, uiInfo.accessEndTime, uiInfo.showingAttribution, - uiInfo.attributionTags + uiInfo.attributionTags, ) context.startActivityAsUser(intent, uiInfo.userHandle) } @@ -108,7 +107,7 @@ fun WearPermissionUsageDetailsScreen( onShowSystemClick, appPermissionAccessUiInfoList, onChipClick, - onManagePermissionClick + onManagePermissionClick, ) if (isLoading && uiData.value != null) { @@ -126,29 +125,30 @@ internal fun WearPermissionUsageDetailsContent( onShowSystemClick: (Boolean) -> Unit, appPermissionAccessUiInfoList: List<AppPermissionAccessUiInfo>, onChipClick: (AppPermissionAccessUiInfo) -> Unit, - onManagePermissionClick: () -> Unit + onManagePermissionClick: () -> Unit, ) { ScrollableScreen(title = title, subtitle = subtitle, isLoading = isLoading) { if (appPermissionAccessUiInfoList.isEmpty()) { - item { Chip(label = stringResource(R.string.no_apps), onClick = {}) } + item { WearPermissionButton(label = stringResource(R.string.no_apps), onClick = {}) } } else { for (uiInfo in appPermissionAccessUiInfoList) { item { - Chip( + WearPermissionButton( label = uiInfo.packageLabel, labelMaxLines = Int.MAX_VALUE, secondaryLabel = DateFormat.getTimeFormat(LocalContext.current) .format(uiInfo.accessEndTime), secondaryLabelMaxLines = Int.MAX_VALUE, - icon = uiInfo.badgedPackageIcon, - onClick = { onChipClick(uiInfo) } + iconBuilder = + uiInfo.badgedPackageIcon?.let { WearPermissionIconBuilder.builder(it) }, + onClick = { onChipClick(uiInfo) }, ) } } if (hasSystemApps) { item { - Chip( + WearPermissionButton( label = if (showSystem) { stringResource(R.string.menu_hide_system) @@ -162,10 +162,9 @@ internal fun WearPermissionUsageDetailsContent( } } item { - Chip( + WearPermissionButton( label = stringResource(R.string.manage_permission), - textColor = MaterialTheme.colors.background, - colors = ChipDefaults.primaryChipColors(), + style = WearPermissionButtonStyle.Primary, onClick = { onManagePermissionClick() }, ) } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionUsageScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionUsageScreen.kt index f83d3338d..8631d8b20 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionUsageScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearPermissionUsageScreen.kt @@ -17,6 +17,7 @@ package com.android.permissioncontroller.permission.ui.wear import android.os.Build +import android.permission.flags.Flags import androidx.annotation.RequiresApi import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable @@ -32,17 +33,15 @@ import com.android.permissioncontroller.R import com.android.permissioncontroller.permission.ui.handheld.v31.PermissionUsageControlPreference import com.android.permissioncontroller.permission.ui.viewmodel.v31.PermissionUsageViewModel import com.android.permissioncontroller.permission.ui.viewmodel.v31.PermissionUsagesUiState -import com.android.permissioncontroller.permission.ui.wear.elements.Chip -import com.android.permissioncontroller.permission.ui.wear.elements.ScrollableScreen import com.android.permissioncontroller.permission.utils.Utils +import com.android.permissioncontroller.wear.permission.components.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButton +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionIconBuilder import java.text.Collator @RequiresApi(Build.VERSION_CODES.S) @Composable -fun WearPermissionUsageScreen( - sessionId: Long, - viewModel: PermissionUsageViewModel, -) { +fun WearPermissionUsageScreen(sessionId: Long, viewModel: PermissionUsageViewModel) { val context = LocalContext.current val permissionUsagesUiData = viewModel.permissionUsagesUiLiveData.observeAsState(null) val showSystem = viewModel.showSystemAppsLiveData.observeAsState(false) @@ -72,7 +71,13 @@ fun WearPermissionUsageScreen( val permissionGroupPreferences = permissionGroupWithUsageCountsEntries // Removing Health Connect from the list of permissions to fix b/331260850 - .filterNot { Utils.isHealthPermissionGroup(it.key) } + .let { + if (Flags.replaceBodySensorPermissionEnabled()) { + it + } else { + it.filterNot { Utils.isHealthPermissionGroup(it.key) } + } + } .map { PermissionUsageControlPreference( context, @@ -97,7 +102,7 @@ fun WearPermissionUsageScreen( hasSystemApps, showSystem.value, onShowSystemClick, - permissionGroupPreferences + permissionGroupPreferences, ) if (isLoading && isDataLoaded) { @@ -111,31 +116,34 @@ internal fun WearPermissionUsageContent( hasSystemApps: Boolean, showSystem: Boolean, onShowSystemClick: (Boolean) -> Unit, - permissionGroupPreferences: List<PermissionUsageControlPreference> + permissionGroupPreferences: List<PermissionUsageControlPreference>, ) { ScrollableScreen( title = stringResource(R.string.permission_usage_title), - isLoading = isLoading + isLoading = isLoading, ) { if (permissionGroupPreferences.isEmpty()) { - item { Chip(label = stringResource(R.string.no_permissions), onClick = {}) } + item { + WearPermissionButton(label = stringResource(R.string.no_permissions), onClick = {}) + } } else { for (preference in permissionGroupPreferences) { item { - Chip( + WearPermissionButton( label = preference.title.toString(), labelMaxLines = Int.MAX_VALUE, secondaryLabel = preference.summary.toString(), secondaryLabelMaxLines = Int.MAX_VALUE, - icon = preference.icon, + iconBuilder = + preference.icon?.let { WearPermissionIconBuilder.builder(it) }, enabled = preference.isEnabled, - onClick = { preference.performClick() } + onClick = { preference.performClick() }, ) } } if (hasSystemApps) { item { - Chip( + WearPermissionButton( label = if (showSystem) { stringResource(R.string.menu_hide_system) diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearUnusedAppsFragment.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearUnusedAppsFragment.kt index 64acfdd96..d454cc566 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearUnusedAppsFragment.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearUnusedAppsFragment.kt @@ -41,14 +41,14 @@ import com.android.permissioncontroller.permission.ui.model.UnusedAppsViewModel. import com.android.permissioncontroller.permission.ui.model.UnusedAppsViewModelFactory import com.android.permissioncontroller.permission.ui.wear.model.WearUnusedAppsViewModel import com.android.permissioncontroller.permission.ui.wear.model.WearUnusedAppsViewModel.UnusedAppChip -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionTheme import com.android.permissioncontroller.permission.utils.KotlinUtils +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionTheme import com.android.settingslib.utils.applications.AppUtils import java.text.Collator /** * This is a condensed version of - * [com.android.permissioncontroller.permission.ui.UnusedAppsFragment.kt], tailored for Wear. + * [com.android.permissioncontroller.permission.ui.UnusedAppsFragment], tailored for Wear. * * A fragment displaying all applications that are unused as well as the option to remove them and * to open them. @@ -62,7 +62,7 @@ class WearUnusedAppsFragment : Fragment() { private var sessionId: Long = 0L private var isFirstLoad = false private var categoryVisibilities: MutableList<Boolean> = - MutableList(UnusedPeriod.values().size) { false } + MutableList(UnusedPeriod.entries.size) { false } private var unusedAppsMap: MutableMap<UnusedPeriod, MutableMap<String, UnusedAppChip>> = initUnusedAppsMap() @@ -87,7 +87,7 @@ class WearUnusedAppsFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View? { isFirstLoad = true context = requireContext() @@ -101,7 +101,7 @@ class WearUnusedAppsFragment : Fragment() { wearViewModel = ViewModelProvider( this, - ViewModelProvider.AndroidViewModelFactory.getInstance(application) + ViewModelProvider.AndroidViewModelFactory.getInstance(application), ) .get(WearUnusedAppsViewModel::class.java) viewModel.unusedPackageCategoriesLiveData.observe( @@ -111,7 +111,7 @@ class WearUnusedAppsFragment : Fragment() { updatePackages(pkgs) updateWearViewModel(false) } - } + }, ) if (!viewModel.unusedPackageCategoriesLiveData.isInitialized) { @@ -125,7 +125,7 @@ class WearUnusedAppsFragment : Fragment() { updateWearViewModel(false) } }, - SHOW_LOAD_DELAY_MS + SHOW_LOAD_DELAY_MS, ) } else { updatePackages(viewModel.unusedPackageCategoriesLiveData.value!!) @@ -192,14 +192,14 @@ class WearUnusedAppsFragment : Fragment() { getString( R.string.auto_revoked_app_summary_two, importantLabel, - otherLabel + otherLabel, ) } else -> getString( R.string.auto_revoked_app_summary_many, importantLabel, - "${revokedPerms.size - 1}" + "${revokedPerms.size - 1}", ) } @@ -215,9 +215,9 @@ class WearUnusedAppsFragment : Fragment() { AppUtils.getAppContentDescription( context, pkgName, - user.getIdentifier() + user.getIdentifier(), ), - onChipClicked + onChipClicked, ) unusedAppsMap[period]!!.put(key, chip) } @@ -242,7 +242,7 @@ class WearUnusedAppsFragment : Fragment() { for (period in allPeriods) { Log.i( LOG_TAG, - "sessionId: $sessionId $period unused: " + "${categorizedPackages[period]}" + "sessionId: $sessionId $period unused: " + "${categorizedPackages[period]}", ) for (revokedPackageInfo in categorizedPackages[period]!!) { for (groupName in revokedPackageInfo.revokedGroups) { @@ -251,7 +251,7 @@ class WearUnusedAppsFragment : Fragment() { revokedPackageInfo.packageName, revokedPackageInfo.user, groupName, - isNewlyRevoked + isNewlyRevoked, ) } } @@ -292,7 +292,7 @@ class WearUnusedAppsFragment : Fragment() { private fun compareUnusedApps( lhs: Pair<String, UnusedAppChip>, - rhs: Pair<String, UnusedAppChip> + rhs: Pair<String, UnusedAppChip>, ): Int { var result = collator.compare(lhs.second.label, rhs.second.label) if (result == 0) { @@ -303,7 +303,7 @@ class WearUnusedAppsFragment : Fragment() { private fun updateWearViewModel(isLoading: Boolean) { wearViewModel.loadingLiveData.value = isLoading - wearViewModel.unusedPeriodCategoryVisibilitiesLiveData.setValue(categoryVisibilities) + wearViewModel.unusedPeriodCategoryVisibilitiesLiveData.value = categoryVisibilities // Need to copy to non mutable maps or compose will not update correctly val map = mutableMapOf<UnusedPeriod, Map<String, UnusedAppChip>>() @@ -311,6 +311,6 @@ class WearUnusedAppsFragment : Fragment() { map.put(period, unusedAppsMap[period]!!.toMap()) } - wearViewModel.unusedAppChipsLiveData.setValue(map.toMap()) + wearViewModel.unusedAppChipsLiveData.value = map.toMap() } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearUnusedAppsScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearUnusedAppsScreen.kt index 423fa7759..c5eef53f2 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearUnusedAppsScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearUnusedAppsScreen.kt @@ -25,10 +25,10 @@ import com.android.permissioncontroller.R import com.android.permissioncontroller.hibernation.isHibernationEnabled import com.android.permissioncontroller.permission.ui.model.UnusedAppsViewModel.UnusedPeriod import com.android.permissioncontroller.permission.ui.model.UnusedAppsViewModel.UnusedPeriod.Companion.allPeriods -import com.android.permissioncontroller.permission.ui.wear.elements.Chip -import com.android.permissioncontroller.permission.ui.wear.elements.Icon -import com.android.permissioncontroller.permission.ui.wear.elements.ScrollableScreen import com.android.permissioncontroller.permission.ui.wear.model.WearUnusedAppsViewModel +import com.android.permissioncontroller.wear.permission.components.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButton +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionIconBuilder @Composable fun WearUnusedAppsScreen(viewModel: WearUnusedAppsViewModel) { @@ -38,12 +38,11 @@ fun WearUnusedAppsScreen(viewModel: WearUnusedAppsViewModel) { val infoMsgCategoryVisibility = viewModel.infoMsgCategoryVisibilityLiveData.observeAsState(false) val unusedAppChips = viewModel.unusedAppChipsLiveData.observeAsState(mapOf()) - ScrollableScreen( showTimeText = true, title = getScreenTitle(), isLoading = loading.value, - subtitle = getSubTitle(!infoMsgCategoryVisibility.value) + subtitle = getSubTitle(!infoMsgCategoryVisibility.value), ) { for (period in allPeriods) { if (!unusedAppChips.value.containsKey(period)) { @@ -57,19 +56,22 @@ fun WearUnusedAppsScreen(viewModel: WearUnusedAppsViewModel) { } for (unusedAppChip in unusedAppChips.value[period]!!.values) { item { - Chip( + WearPermissionButton( label = unusedAppChip.label, secondaryLabel = unusedAppChip.summary, - icon = unusedAppChip.icon, - iconContentDescription = unusedAppChip.contentDescription, - onClick = unusedAppChip.onClick + iconBuilder = + unusedAppChip.icon?.let { + WearPermissionIconBuilder.builder(it) + .contentDescription(unusedAppChip.contentDescription) + }, + onClick = unusedAppChip.onClick, ) } } } // For info_msg_category if (infoMsgCategoryVisibility.value) { - item { Icon(icon = R.drawable.ic_info_outline, contentDescription = null) } + item { WearPermissionIconBuilder.builder(R.drawable.ic_info_outline).build() } if (isHibernationEnabled()) { item { Text(text = stringResource(R.string.unused_apps_page_summary)) } } else { @@ -108,5 +110,5 @@ private fun posByPeriod(period: UnusedPeriod) = private fun categoryTitleByPeriod(period: UnusedPeriod) = MessageFormat.format( stringResource(R.string.last_opened_category_title), - mapOf("count" to period.months) + mapOf("count" to period.months), ) diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearUtils.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearUtils.kt index 7e4e939b9..6cdf47cec 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearUtils.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearUtils.kt @@ -22,7 +22,6 @@ import androidx.annotation.IntDef import com.android.permissioncontroller.R import java.time.ZonedDateTime import java.time.temporal.ChronoUnit -import java.util.Locale object WearUtils { @Retention(AnnotationRetention.SOURCE) @@ -48,7 +47,7 @@ object WearUtils { res.getString( R.string.wear_app_perms_7d_access, summaryTimestamp.third, - summaryTimestamp.first + summaryTimestamp.first, ) else -> "" } @@ -57,7 +56,7 @@ object WearUtils { @JvmStatic private fun getPermissionLastAccessSummaryTimestamp( lastAccessTime: Long?, - context: Context + context: Context, ): Triple<String, Int, String> { val midnightToday = (ZonedDateTime.now().truncatedTo(ChronoUnit.DAYS).toEpochSecond() * 1000L) @@ -78,8 +77,4 @@ object WearUtils { } return Triple(lastAccessTimeFormatted, lastAccessType, lastAccessDateFormatted) } - - fun String.capitalize(): String = replaceFirstChar { - if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() - } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/RemoteConnectionProgressIndicator.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/RemoteConnectionProgressIndicator.kt deleted file mode 100644 index 244e7e3fd..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/RemoteConnectionProgressIndicator.kt +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2024 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 - * - * https://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.permissioncontroller.permission.ui.wear.elements - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.unit.dp -import androidx.wear.compose.material.CircularProgressIndicator -import androidx.wear.compose.material.Icon -import androidx.wear.compose.material.MaterialTheme - -@Composable -fun RemoteConnectionProgressIndicator(iconRes: Int, modifier: Modifier) { - val indicatorPadding = 8.dp - val iconSize = 48.dp - val progressBarStrokeWidth = 4.dp - Box( - modifier = modifier.size(iconSize).clip(CircleShape), - ) { - CircularProgressIndicator( - modifier = Modifier.size(iconSize - progressBarStrokeWidth + indicatorPadding), - strokeWidth = progressBarStrokeWidth, - ) - Icon( - painter = painterResource(iconRes), - contentDescription = null, - modifier = - Modifier.align(Alignment.Center) - .size(iconSize - indicatorPadding - 8.dp) - .clip(CircleShape), - ) - } -} - -@Composable -fun RemoteConnectionSuccess(iconRes: Int, modifier: Modifier) { - val indicatorPadding = 8.dp - val iconSize = 48.dp - val backgroundColor = MaterialTheme.colors.onSurface - val contentColor = MaterialTheme.colors.surface - Box( - modifier = modifier.size(iconSize).clip(CircleShape).background(backgroundColor), - ) { - Icon( - painter = painterResource(iconRes), - contentDescription = null, - tint = contentColor, - modifier = - Modifier.align(Alignment.Center) - .size(iconSize - indicatorPadding - 8.dp) - .clip(CircleShape), - ) - } -} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ToggleChipToggleControl.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ToggleChipToggleControl.kt deleted file mode 100644 index b6f6db4d3..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ToggleChipToggleControl.kt +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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.permissioncontroller.permission.ui.wear.elements - -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.semantics.Role -import androidx.compose.ui.semantics.role -import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.semantics.stateDescription -import com.android.permissioncontroller.R - -enum class ToggleChipToggleControl { - Switch, - Radio, - Checkbox, -} - -@Composable -fun Modifier.toggleControlSemantics( - toggleControl: ToggleChipToggleControl, - checked: Boolean, -): Modifier { - val semanticsRole = - when (toggleControl) { - ToggleChipToggleControl.Switch -> Role.Switch - ToggleChipToggleControl.Radio -> Role.RadioButton - ToggleChipToggleControl.Checkbox -> Role.Checkbox - } - val stateDescriptionSemantics = - stringResource( - if (checked) { - R.string.on - } else { - R.string.off - } - ) - - return semantics { - role = semanticsRole - stateDescription = stateDescriptionSemantics - } -} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionScaffold.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionScaffold.kt deleted file mode 100644 index bd7636273..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionScaffold.kt +++ /dev/null @@ -1,298 +0,0 @@ -/* - * Copyright 2024 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 - * - * https://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.permissioncontroller.permission.ui.wear.elements.material3 - -import android.graphics.drawable.Drawable -import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.BoxScope -import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.requiredHeightIn -import androidx.compose.foundation.layout.size -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.painter.Painter -import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.platform.LocalConfiguration -import androidx.compose.ui.platform.testTag -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.unit.dp -import androidx.wear.compose.foundation.ScrollInfoProvider -import androidx.wear.compose.foundation.lazy.ScalingLazyListScope -import androidx.wear.compose.material3.AppScaffold -import androidx.wear.compose.material3.CircularProgressIndicator -import androidx.wear.compose.material3.ListHeader -import androidx.wear.compose.material3.MaterialTheme -import androidx.wear.compose.material3.ScreenScaffold -import androidx.wear.compose.material3.ScrollIndicator -import androidx.wear.compose.material3.Text -import androidx.wear.compose.material3.TimeText -import com.android.permissioncontroller.permission.ui.wear.elements.AnnotatedText -import com.android.permissioncontroller.permission.ui.wear.elements.Wear2Scaffold -import com.android.permissioncontroller.permission.ui.wear.elements.layout.ScalingLazyColumn -import com.android.permissioncontroller.permission.ui.wear.elements.layout.ScalingLazyColumnState -import com.android.permissioncontroller.permission.ui.wear.elements.layout.rememberResponsiveColumnState -import com.android.permissioncontroller.permission.ui.wear.elements.rememberDrawablePainter -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion.MATERIAL2_5 -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionTheme - -/** - * This component is wrapper on material scaffold component. It helps with time text, scroll - * indicator and standard list elements like title, icon and subtitle. - */ -@Composable -internal fun WearPermissionScaffold( - materialUIVersion: WearPermissionMaterialUIVersion = MATERIAL2_5, - showTimeText: Boolean, - title: String?, - subtitle: CharSequence?, - image: Any?, - isLoading: Boolean, - content: ScalingLazyListScope.() -> Unit, - titleTestTag: String? = null, - subtitleTestTag: String? = null, -) { - - if (materialUIVersion == MATERIAL2_5) { - Wear2Scaffold( - showTimeText, - title, - subtitle, - image, - isLoading, - content, - titleTestTag, - subtitleTestTag, - ) - } else { - WearPermissionScaffoldInternal( - showTimeText, - title, - subtitle, - image, - isLoading, - content, - titleTestTag, - subtitleTestTag, - ) - } -} - -@Composable -private fun WearPermissionScaffoldInternal( - showTimeText: Boolean, - title: String?, - subtitle: CharSequence?, - image: Any?, - isLoading: Boolean, - content: ScalingLazyListScope.() -> Unit, - titleTestTag: String? = null, - subtitleTestTag: String? = null, -) { - val screenWidth = LocalConfiguration.current.screenWidthDp - val screenHeight = LocalConfiguration.current.screenHeightDp - val paddingDefaults = - WearPermissionScaffoldPaddingDefaults( - screenWidth = screenWidth, - screenHeight = screenHeight, - titleNeedsLargePadding = subtitle == null, - ) - val columnState = - rememberResponsiveColumnState(contentPadding = { paddingDefaults.scrollContentPadding }) - WearPermissionTheme(version = WearPermissionMaterialUIVersion.MATERIAL3) { - AppScaffold(timeText = wearPermissionTimeText(showTimeText && !isLoading)) { - ScreenScaffold( - scrollInfoProvider = ScrollInfoProvider(columnState.state), - scrollIndicator = wearPermissionScrollIndicator(!isLoading, columnState), - ) { - Box(modifier = Modifier.fillMaxSize()) { - if (isLoading) { - CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) - } else { - ScrollingView( - columnState = columnState, - icon = painterFromImage(image), - title = title, - titleTestTag = titleTestTag, - titlePaddingValues = paddingDefaults.titlePaddingValues, - subtitle = subtitle, - subtitleTestTag = subtitleTestTag, - subTitlePaddingValues = paddingDefaults.subTitlePaddingValues, - content = content, - ) - } - } - } - } - } -} - -private class WearPermissionScaffoldPaddingDefaults( - screenWidth: Int, - screenHeight: Int, - titleNeedsLargePadding: Boolean, -) { - private val firstSpacerItemHeight = 0.dp - private val scrollContentHorizontalPadding = (screenWidth * 0.052).dp - private val titleHorizontalPadding = (screenWidth * 0.0884).dp - private val subtitleHorizontalPadding = (screenWidth * 0.0416).dp - private val scrollContentTopPadding = (screenHeight * 0.1456).dp - firstSpacerItemHeight - private val scrollContentBottomPadding = (screenHeight * 0.3636).dp - private val defaultItemPadding = 4.dp - private val largeItemPadding = 8.dp - val titlePaddingValues = - PaddingValues( - start = titleHorizontalPadding, - top = defaultItemPadding, - bottom = if (titleNeedsLargePadding) largeItemPadding else defaultItemPadding, - end = titleHorizontalPadding, - ) - val subTitlePaddingValues = - PaddingValues( - start = subtitleHorizontalPadding, - top = defaultItemPadding, - bottom = largeItemPadding, - end = subtitleHorizontalPadding, - ) - val scrollContentPadding = - PaddingValues( - start = scrollContentHorizontalPadding, - end = scrollContentHorizontalPadding, - top = scrollContentTopPadding, - bottom = scrollContentBottomPadding, - ) -} - -@Composable -private fun BoxScope.ScrollingView( - columnState: ScalingLazyColumnState, - icon: Painter?, - title: String?, - titleTestTag: String?, - subtitle: CharSequence?, - subtitleTestTag: String?, - titlePaddingValues: PaddingValues, - subTitlePaddingValues: PaddingValues, - content: ScalingLazyListScope.() -> Unit, -) { - ScalingLazyColumn(columnState = columnState) { - iconItem(icon, Modifier.size(24.dp)) - titleItem(text = title, testTag = titleTestTag, contentPaddingValues = titlePaddingValues) - subtitleItem( - text = subtitle, - testTag = subtitleTestTag, - modifier = Modifier.align(Alignment.Center).padding(subTitlePaddingValues), - ) - content() - } -} - -private fun wearPermissionTimeText(showTime: Boolean): @Composable () -> Unit { - return if (showTime) { - { TimeText { time() } } - } else { - {} - } -} - -private fun wearPermissionScrollIndicator( - showIndicator: Boolean, - columnState: ScalingLazyColumnState, -): @Composable (BoxScope.() -> Unit)? { - return if (showIndicator) { - { - ScrollIndicator( - modifier = Modifier.align(Alignment.CenterEnd), - state = columnState.state, - ) - } - } else { - null - } -} - -@Composable -private fun painterFromImage(image: Any?): Painter? { - return when (image) { - is Int -> painterResource(id = image) - is Drawable -> rememberDrawablePainter(image) - else -> null - } -} - -private fun Modifier.optionalTestTag(tag: String?): Modifier { - if (tag == null) { - return this - } - return this then testTag(tag) -} - -private fun ScalingLazyListScope.iconItem(painter: Painter?, modifier: Modifier = Modifier) = - painter?.let { - item { - Image( - painter = it, - contentDescription = null, - contentScale = ContentScale.Crop, - modifier = modifier, - ) - } - } - -private fun ScalingLazyListScope.titleItem( - text: String?, - testTag: String?, - contentPaddingValues: PaddingValues, - modifier: Modifier = Modifier, -) = - text?.let { - item { - ListHeader( - modifier = modifier.requiredHeightIn(1.dp), // We do not want default min height - contentPadding = contentPaddingValues, - ) { - Text( - text = it, - textAlign = TextAlign.Center, - modifier = Modifier.optionalTestTag(testTag), - ) - } - } - } - -private fun ScalingLazyListScope.subtitleItem( - text: CharSequence?, - testTag: String?, - modifier: Modifier = Modifier, -) = - text?.let { - item { - AnnotatedText( - text = it, - style = - MaterialTheme.typography.bodyMedium.copy( - color = MaterialTheme.colorScheme.onSurfaceVariant - ), - modifier = modifier.optionalTestTag(testTag), - shouldCapitalize = true, - ) - } - } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/rotaryinput/Haptics.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/rotaryinput/Haptics.kt deleted file mode 100644 index 817bf7efe..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/rotaryinput/Haptics.kt +++ /dev/null @@ -1,292 +0,0 @@ -/* - * Copyright (C) 2024 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.permissioncontroller.permission.ui.wear.elements.rotaryinput - -import android.os.Build -import android.view.View -import androidx.compose.foundation.gestures.ScrollableState -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.remember -import androidx.compose.ui.platform.LocalView -import kotlin.math.abs -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.channels.BufferOverflow -import kotlinx.coroutines.channels.Channel -import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.conflate -import kotlinx.coroutines.flow.flow -import kotlinx.coroutines.flow.receiveAsFlow -import kotlinx.coroutines.withContext - -// This file is a copy of Haptics.kt from Horologist (go/horologist), -// remove it once Wear Compose 1.4 is landed (b/325560444). - -private const val DEBUG = false - -/** Debug logging that can be enabled. */ -private inline fun debugLog(generateMsg: () -> String) { - if (DEBUG) { - println("RotaryHaptics: ${generateMsg()}") - } -} - -/** - * Throttling events within specified timeframe. Only first and last events will be received. For a - * flow emitting elements 1 to 30, with a 100ms delay between them: - * ``` - * val flow = flow { - * for (i in 1..30) { - * delay(100) - * emit(i) - * } - * } - * ``` - * - * With timeframe=1000 only those integers will be received: 1, 10, 20, 30 . - */ -internal fun <T> Flow<T>.throttleLatest(timeframe: Long): Flow<T> = flow { - conflate().collect { - emit(it) - delay(timeframe) - } -} - -/** Handles haptics for rotary usage */ -interface RotaryHapticHandler { - - /** Handles haptics when scroll is used */ - fun handleScrollHaptic(scrollDelta: Float) - - /** Handles haptics when scroll with snap is used */ - fun handleSnapHaptic(scrollDelta: Float) -} - -/** - * Default implementation of [RotaryHapticHandler]. It handles haptic feedback based on the - * [scrollableState], scrolled pixels and [hapticsThresholdPx]. Haptic is not fired in this class, - * instead it's sent to [hapticsChannel] where it'll performed later. - * - * @param scrollableState Haptic performed based on this state - * @param hapticsChannel Channel to which haptic events will be sent - * @param hapticsThresholdPx A scroll threshold after which haptic is produced. - */ -class DefaultRotaryHapticHandler( - private val scrollableState: ScrollableState, - private val hapticsChannel: Channel<RotaryHapticsType>, - private val hapticsThresholdPx: Long = 50, -) : RotaryHapticHandler { - - private var overscrollHapticTriggered = false - private var currScrollPosition = 0f - private var prevHapticsPosition = 0f - - override fun handleScrollHaptic(scrollDelta: Float) { - if ( - (scrollDelta > 0 && !scrollableState.canScrollForward) || - (scrollDelta < 0 && !scrollableState.canScrollBackward) - ) { - if (!overscrollHapticTriggered) { - trySendHaptic(RotaryHapticsType.ScrollLimit) - overscrollHapticTriggered = true - } - } else { - overscrollHapticTriggered = false - currScrollPosition += scrollDelta - val diff = abs(currScrollPosition - prevHapticsPosition) - - if (diff >= hapticsThresholdPx) { - trySendHaptic(RotaryHapticsType.ScrollTick) - prevHapticsPosition = currScrollPosition - } - } - } - - override fun handleSnapHaptic(scrollDelta: Float) { - if ( - (scrollDelta > 0 && !scrollableState.canScrollForward) || - (scrollDelta < 0 && !scrollableState.canScrollBackward) - ) { - if (!overscrollHapticTriggered) { - trySendHaptic(RotaryHapticsType.ScrollLimit) - overscrollHapticTriggered = true - } - } else { - overscrollHapticTriggered = false - trySendHaptic(RotaryHapticsType.ScrollItemFocus) - } - } - - private fun trySendHaptic(rotaryHapticsType: RotaryHapticsType) { - // Ok to ignore the ChannelResult because we default to capacity = 2 and DROP_OLDEST - @Suppress("UNUSED_VARIABLE") val unused = hapticsChannel.trySend(rotaryHapticsType) - } -} - -/** Interface for Rotary haptic feedback */ -interface RotaryHapticFeedback { - fun performHapticFeedback(type: RotaryHapticsType) -} - -/** Rotary haptic types */ -@JvmInline -value class RotaryHapticsType(private val type: Int) { - companion object { - /** - * A scroll ticking haptic. Similar to texture haptic - performed each time when a - * scrollable content is scrolled by a certain distance - */ - val ScrollTick: RotaryHapticsType = RotaryHapticsType(1) - - /** - * An item focus (snap) haptic. Performed when a scrollable content is snapped to a specific - * item. - */ - val ScrollItemFocus: RotaryHapticsType = RotaryHapticsType(2) - - /** - * A limit(overscroll) haptic. Performed when a list reaches the limit (start or end) and - * can't scroll further - */ - val ScrollLimit: RotaryHapticsType = RotaryHapticsType(3) - } -} - -/** Remember disabled haptics handler */ -@Composable -fun rememberDisabledHaptic(): RotaryHapticHandler = remember { - object : RotaryHapticHandler { - - override fun handleScrollHaptic(scrollDelta: Float) { - // Do nothing - } - - override fun handleSnapHaptic(scrollDelta: Float) { - // Do nothing - } - } -} - -/** - * Remember rotary haptic handler. - * - * @param scrollableState A scrollableState, used to determine whether the end of the scrollable was - * reached or not. - * @param throttleThresholdMs Throttling events within specified timeframe. Only first and last - * events will be received. Check [throttleLatest] for more info. - * @param hapticsThresholdPx A scroll threshold after which haptic is produced. - * @param hapticsChannel Channel to which haptic events will be sent - * @param rotaryHaptics Interface for Rotary haptic feedback which performs haptics - */ -@Composable -fun rememberRotaryHapticHandler( - scrollableState: ScrollableState, - throttleThresholdMs: Long = 30, - hapticsThresholdPx: Long = 50, - hapticsChannel: Channel<RotaryHapticsType> = rememberHapticChannel(), - rotaryHaptics: RotaryHapticFeedback = rememberDefaultRotaryHapticFeedback(), -): RotaryHapticHandler { - return remember(scrollableState, hapticsChannel, rotaryHaptics) { - DefaultRotaryHapticHandler(scrollableState, hapticsChannel, hapticsThresholdPx) - } - .apply { - LaunchedEffect(hapticsChannel) { - hapticsChannel.receiveAsFlow().throttleLatest(throttleThresholdMs).collect { - hapticType -> - // 'withContext' launches performHapticFeedback in a separate thread, - // as otherwise it produces a visible lag (b/219776664) - val currentTime = System.currentTimeMillis() - debugLog { "Haptics started" } - withContext(Dispatchers.Default) { - debugLog { - "Performing haptics, delay: " + - "${System.currentTimeMillis() - currentTime}" - } - rotaryHaptics.performHapticFeedback(hapticType) - } - } - } - } -} - -@Composable -private fun rememberHapticChannel() = remember { - Channel<RotaryHapticsType>( - capacity = 2, - onBufferOverflow = BufferOverflow.DROP_OLDEST, - ) -} - -@Composable -public fun rememberDefaultRotaryHapticFeedback(): RotaryHapticFeedback = - LocalView.current.let { view -> remember { findDeviceSpecificHapticFeedback(view) } } - -internal fun findDeviceSpecificHapticFeedback(view: View): RotaryHapticFeedback = - if (isSamsungWatch()) { - SamsungWatchHapticFeedback(view) - } else { - DefaultRotaryHapticFeedback(view) - } - -/** Default Rotary implementation for [RotaryHapticFeedback] */ -class DefaultRotaryHapticFeedback(private val view: View) : RotaryHapticFeedback { - - override fun performHapticFeedback( - type: RotaryHapticsType, - ) { - when (type) { - RotaryHapticsType.ScrollItemFocus -> { - view.performHapticFeedback(SCROLL_ITEM_FOCUS) - } - RotaryHapticsType.ScrollTick -> { - view.performHapticFeedback(SCROLL_TICK) - } - RotaryHapticsType.ScrollLimit -> { - view.performHapticFeedback(SCROLL_LIMIT) - } - } - } - - private companion object { - // Hidden constants from HapticFeedbackConstants - const val SCROLL_TICK: Int = 18 - const val SCROLL_ITEM_FOCUS: Int = 19 - const val SCROLL_LIMIT: Int = 20 - } -} - -/** Implementation of [RotaryHapticFeedback] for Samsung devices */ -private class SamsungWatchHapticFeedback(private val view: View) : RotaryHapticFeedback { - override fun performHapticFeedback( - type: RotaryHapticsType, - ) { - when (type) { - RotaryHapticsType.ScrollItemFocus -> { - view.performHapticFeedback(102) - } - RotaryHapticsType.ScrollTick -> { - view.performHapticFeedback(102) - } - RotaryHapticsType.ScrollLimit -> { - view.performHapticFeedback(50107) - } - } - } -} - -private fun isSamsungWatch(): Boolean = Build.MANUFACTURER.contains("Samsung", ignoreCase = true) diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/rotaryinput/Rotary.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/rotaryinput/Rotary.kt deleted file mode 100644 index 19a6ea671..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/rotaryinput/Rotary.kt +++ /dev/null @@ -1,1232 +0,0 @@ -/* - * Copyright (C) 2024 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.permissioncontroller.permission.ui.wear.elements.rotaryinput - -import android.view.ViewConfiguration -import androidx.compose.animation.core.AnimationState -import androidx.compose.animation.core.CubicBezierEasing -import androidx.compose.animation.core.Easing -import androidx.compose.animation.core.FastOutSlowInEasing -import androidx.compose.animation.core.SpringSpec -import androidx.compose.animation.core.animateTo -import androidx.compose.animation.core.copy -import androidx.compose.animation.core.spring -import androidx.compose.animation.core.tween -import androidx.compose.foundation.MutatePriority -import androidx.compose.foundation.focusable -import androidx.compose.foundation.gestures.FlingBehavior -import androidx.compose.foundation.gestures.ScrollableDefaults -import androidx.compose.foundation.gestures.ScrollableState -import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember -import androidx.compose.runtime.snapshots.Snapshot -import androidx.compose.ui.Modifier -import androidx.compose.ui.focus.FocusRequester -import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.input.rotary.RotaryInputModifierNode -import androidx.compose.ui.input.rotary.RotaryScrollEvent -import androidx.compose.ui.node.ModifierNodeElement -import androidx.compose.ui.platform.InspectorInfo -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.platform.debugInspectorInfo -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.util.fastSumBy -import androidx.compose.ui.util.lerp -import androidx.wear.compose.foundation.ExperimentalWearFoundationApi -import androidx.wear.compose.foundation.lazy.ScalingLazyListState -import androidx.wear.compose.foundation.rememberActiveFocusRequester -import kotlin.math.abs -import kotlin.math.absoluteValue -import kotlin.math.sign -import kotlinx.coroutines.CompletableDeferred -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.Job -import kotlinx.coroutines.async -import kotlinx.coroutines.channels.Channel -import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.collectLatest -import kotlinx.coroutines.flow.receiveAsFlow -import kotlinx.coroutines.flow.transformLatest -import kotlinx.coroutines.launch - -// This file is a copy of Rotary.kt from Horologist (go/horologist), -// remove it once Wear Compose 1.4 is landed (b/325560444). - -/** - * A modifier which connects rotary events with scrollable. This modifier supports scroll with - * fling. - * - * @param scrollableState Scrollable state which will be scrolled while receiving rotary events - * @param focusRequester Requests the focus for rotary input. By default comes from - * [rememberActiveFocusRequester], which is used with [HierarchicalFocusCoordinator] - * @param flingBehavior Logic describing fling behavior. If null fling will not happen. - * @param rotaryHaptics Class which will handle haptic feedback - * @param reverseDirection Reverse the direction of scrolling. Should be aligned with Scrollable - * `reverseDirection` parameter - */ -@OptIn(ExperimentalWearFoundationApi::class) -@Suppress("ComposableModifierFactory") -@Composable -fun Modifier.rotaryWithScroll( - scrollableState: ScrollableState, - focusRequester: FocusRequester = rememberActiveFocusRequester(), - flingBehavior: FlingBehavior? = ScrollableDefaults.flingBehavior(), - rotaryHaptics: RotaryHapticHandler = rememberRotaryHapticHandler(scrollableState), - reverseDirection: Boolean = false, -): Modifier = - rotaryHandler( - rotaryScrollHandler = - RotaryDefaults.rememberFlingHandler(scrollableState, flingBehavior), - reverseDirection = reverseDirection, - rotaryHaptics = rotaryHaptics, - inspectorInfo = - debugInspectorInfo { - name = "rotaryWithFling" - properties["scrollableState"] = scrollableState - properties["focusRequester"] = focusRequester - properties["flingBehavior"] = flingBehavior - properties["rotaryHaptics"] = rotaryHaptics - properties["reverseDirection"] = reverseDirection - }, - ) - .focusRequester(focusRequester) - .focusable() - -/** - * A modifier which connects rotary events with scrollable. This modifier supports snap. - * - * @param focusRequester Requests the focus for rotary input. By default comes from - * [rememberActiveFocusRequester], which is used with [HierarchicalFocusCoordinator] - * @param rotaryScrollAdapter A connection between scrollable objects and rotary events - * @param rotaryHaptics Class which will handle haptic feedback - * @param reverseDirection Reverse the direction of scrolling. Should be aligned with Scrollable - * `reverseDirection` parameter - */ -@OptIn(ExperimentalWearFoundationApi::class) -@Suppress("ComposableModifierFactory") -@Composable -fun Modifier.rotaryWithSnap( - rotaryScrollAdapter: RotaryScrollAdapter, - focusRequester: FocusRequester = rememberActiveFocusRequester(), - snapParameters: SnapParameters = RotaryDefaults.snapParametersDefault, - rotaryHaptics: RotaryHapticHandler = - rememberRotaryHapticHandler(rotaryScrollAdapter.scrollableState), - reverseDirection: Boolean = false, -): Modifier = - rotaryHandler( - rotaryScrollHandler = - RotaryDefaults.rememberSnapHandler(rotaryScrollAdapter, snapParameters), - reverseDirection = reverseDirection, - rotaryHaptics = rotaryHaptics, - inspectorInfo = - debugInspectorInfo { - name = "rotaryWithFling" - properties["rotaryScrollAdapter"] = rotaryScrollAdapter - properties["focusRequester"] = focusRequester - properties["snapParameters"] = snapParameters - properties["rotaryHaptics"] = rotaryHaptics - properties["reverseDirection"] = reverseDirection - }, - ) - .focusRequester(focusRequester) - .focusable() - -/** An extension function for creating [RotaryScrollAdapter] from [ScalingLazyListState] */ -@Composable -fun ScalingLazyListState.toRotaryScrollAdapter(): RotaryScrollAdapter = - remember(this) { ScalingLazyColumnRotaryScrollAdapter(this) } - -/** An implementation of rotary scroll adapter for [ScalingLazyColumn] */ -class ScalingLazyColumnRotaryScrollAdapter( - override val scrollableState: ScalingLazyListState, -) : RotaryScrollAdapter { - - /** Calculates an average height of an item by taking an average from visible items height. */ - override fun averageItemSize(): Float { - val visibleItems = scrollableState.layoutInfo.visibleItemsInfo - return (visibleItems.fastSumBy { it.unadjustedSize } / visibleItems.size).toFloat() - } - - /** Current (centred) item index */ - override fun currentItemIndex(): Int = scrollableState.centerItemIndex - - /** An offset from the item centre */ - override fun currentItemOffset(): Float = scrollableState.centerItemScrollOffset.toFloat() - - /** The total count of items in ScalingLazyColumn */ - override fun totalItemsCount(): Int = scrollableState.layoutInfo.totalItemsCount -} - -/** An adapter which connects scrollableState to Rotary */ -interface RotaryScrollAdapter { - - /** A scrollable state. Used for performing scroll when Rotary events received */ - val scrollableState: ScrollableState - - /** Average size of an item. Used for estimating the scrollable distance */ - fun averageItemSize(): Float - - /** A current item index. Used for scrolling */ - fun currentItemIndex(): Int - - /** An offset from the centre or the border of the current item. */ - fun currentItemOffset(): Float - - /** The total count of items in [scrollableState] */ - fun totalItemsCount(): Int -} - -/** Defaults for rotary modifiers */ -object RotaryDefaults { - - /** Returns default [SnapParameters] */ - val snapParametersDefault: SnapParameters = - SnapParameters( - snapOffset = 0, - thresholdDivider = 1.5f, - resistanceFactor = 3f, - ) - - /** Returns whether the input is Low-res (a bezel) or high-res(a crown/rsb). */ - @Composable - fun isLowResInput(): Boolean = - LocalContext.current.packageManager.hasSystemFeature( - "android.hardware.rotaryencoder.lowres" - ) - - /** - * Handles scroll with fling. - * - * @param scrollableState Scrollable state which will be scrolled while receiving rotary events - * @param flingBehavior Logic describing Fling behavior. If null - fling will not happen - * @param isLowRes Whether the input is Low-res (a bezel) or high-res(a crown/rsb) - */ - @Composable - internal fun rememberFlingHandler( - scrollableState: ScrollableState, - flingBehavior: FlingBehavior? = null, - isLowRes: Boolean = isLowResInput(), - ): RotaryScrollHandler { - val viewConfiguration = ViewConfiguration.get(LocalContext.current) - - return remember(scrollableState, flingBehavior, isLowRes) { - // Remove unnecessary recompositions by disabling tracking of changes inside of - // this block. This algorithm properly reads all updated values and - // don't need recomposition when those values change. - Snapshot.withoutReadObservation { - debugLog { "isLowRes : $isLowRes" } - fun rotaryFlingBehavior() = - flingBehavior?.run { - RotaryFlingBehavior( - scrollableState, - flingBehavior, - viewConfiguration, - flingTimeframe = - if (isLowRes) lowResFlingTimeframe else highResFlingTimeframe, - ) - } - - fun scrollBehavior() = RotaryScrollBehavior(scrollableState) - - if (isLowRes) { - LowResRotaryScrollHandler( - rotaryFlingBehaviorFactory = { rotaryFlingBehavior() }, - scrollBehaviorFactory = { scrollBehavior() }, - ) - } else { - HighResRotaryScrollHandler( - rotaryFlingBehaviorFactory = { rotaryFlingBehavior() }, - scrollBehaviorFactory = { scrollBehavior() }, - ) - } - } - } - } - - /** - * Handles scroll with snap - * - * @param rotaryScrollAdapter A connection between scrollable objects and rotary events - * @param snapParameters Snap parameters - */ - @Composable - internal fun rememberSnapHandler( - rotaryScrollAdapter: RotaryScrollAdapter, - snapParameters: SnapParameters = snapParametersDefault, - isLowRes: Boolean = isLowResInput(), - ): RotaryScrollHandler { - return remember(rotaryScrollAdapter, snapParameters) { - // Remove unnecessary recompositions by disabling tracking of changes inside of - // this block. This algorithm properly reads all updated values and - // don't need recomposition when those values change. - Snapshot.withoutReadObservation { - debugLog { "isLowRes : $isLowRes" } - if (isLowRes) { - LowResSnapHandler( - snapBehaviourFactory = { - RotarySnapBehavior(rotaryScrollAdapter, snapParameters) - }, - ) - } else { - HighResSnapHandler( - resistanceFactor = snapParameters.resistanceFactor, - thresholdBehaviorFactory = { - ThresholdBehavior( - rotaryScrollAdapter, - snapParameters.thresholdDivider, - ) - }, - snapBehaviourFactory = { - RotarySnapBehavior(rotaryScrollAdapter, snapParameters) - }, - scrollBehaviourFactory = { - RotaryScrollBehavior(rotaryScrollAdapter.scrollableState) - }, - ) - } - } - } - } - - private val lowResFlingTimeframe: Long = 100L - private val highResFlingTimeframe: Long = 30L -} - -/** - * Parameters used for snapping - * - * @param snapOffset an optional offset to be applied when snapping the item. After the snap the - * snapped items offset will be [snapOffset]. - */ -class SnapParameters( - val snapOffset: Int, - val thresholdDivider: Float, - val resistanceFactor: Float, -) { - /** Returns a snapping offset in [Dp] */ - @Composable - fun snapOffsetDp(): Dp { - return with(LocalDensity.current) { snapOffset.toDp() } - } - - override fun equals(other: Any?): Boolean { - if (this === other) return true - if (other == null || this::class != other::class) return false - - other as SnapParameters - - if (snapOffset != other.snapOffset) return false - if (thresholdDivider != other.thresholdDivider) return false - if (resistanceFactor != other.resistanceFactor) return false - - return true - } - - override fun hashCode(): Int { - var result = snapOffset - result = 31 * result + thresholdDivider.hashCode() - result = 31 * result + resistanceFactor.hashCode() - return result - } -} - -/** An interface for handling scroll events */ -internal interface RotaryScrollHandler { - /** - * Handles scrolling events - * - * @param coroutineScope A scope for performing async actions - * @param event A scrollable event from rotary input, containing scrollable delta and timestamp - * @param rotaryHaptics - */ - suspend fun handleScrollEvent( - coroutineScope: CoroutineScope, - event: TimestampedDelta, - rotaryHaptics: RotaryHapticHandler, - ) -} - -/** - * Class responsible for Fling behaviour with rotary. It tracks and produces the fling when - * necessary - */ -internal class RotaryFlingBehavior( - private val scrollableState: ScrollableState, - private val flingBehavior: FlingBehavior, - viewConfiguration: ViewConfiguration, - private val flingTimeframe: Long, -) { - - // A time range during which the fling is valid. - // For simplicity it's twice as long as [flingTimeframe] - private val timeRangeToFling = flingTimeframe * 2 - - // A default fling factor for making fling slower - private val flingScaleFactor = 0.7f - - private var previousVelocity = 0f - - private val rotaryVelocityTracker = RotaryVelocityTracker() - - private val minFlingSpeed = viewConfiguration.scaledMinimumFlingVelocity.toFloat() - private val maxFlingSpeed = viewConfiguration.scaledMaximumFlingVelocity.toFloat() - private var latestEventTimestamp: Long = 0 - - private var flingVelocity: Float = 0f - private var flingTimestamp: Long = 0 - - /** Starts a new fling tracking session with specified timestamp */ - fun startFlingTracking(timestamp: Long) { - rotaryVelocityTracker.start(timestamp) - latestEventTimestamp = timestamp - previousVelocity = 0f - } - - /** Observing new event within a fling tracking session with new timestamp and delta */ - fun observeEvent(timestamp: Long, delta: Float) { - rotaryVelocityTracker.move(timestamp, delta) - latestEventTimestamp = timestamp - } - - /** Performing fling if necessary and calling [beforeFling] lambda before it is triggered */ - suspend fun trackFling(beforeFling: () -> Unit) { - val currentVelocity = rotaryVelocityTracker.velocity - debugLog { "currentVelocity: $currentVelocity" } - - if (abs(currentVelocity) >= abs(previousVelocity)) { - flingTimestamp = latestEventTimestamp - flingVelocity = currentVelocity * flingScaleFactor - } - previousVelocity = currentVelocity - - // Waiting for a fixed amount of time before checking the fling - delay(flingTimeframe) - - // For making a fling 2 criteria should be met: - // 1) no more than - // `rangeToFling` ms should pass between last fling detection - // and the time of last motion event - // 2) flingVelocity should exceed the minFlingSpeed - debugLog { - "Check fling: flingVelocity: $flingVelocity " + - "minFlingSpeed: $minFlingSpeed, maxFlingSpeed: $maxFlingSpeed" - } - if ( - latestEventTimestamp - flingTimestamp < timeRangeToFling && - abs(flingVelocity) > minFlingSpeed - ) { - // Stops scrollAnimationCoroutine because a fling will be performed - beforeFling() - val velocity = flingVelocity.coerceIn(-maxFlingSpeed, maxFlingSpeed) - scrollableState.scroll(MutatePriority.UserInput) { - with(flingBehavior) { - debugLog { "Flinging with velocity $velocity" } - performFling(velocity) - } - } - } - } -} - -/** - * A rotary event object which contains a [timestamp] of the rotary event and a scrolled [delta]. - */ -internal data class TimestampedDelta(val timestamp: Long, val delta: Float) - -/** - * This class does a smooth animation when the scroll by N pixels is done. This animation works well - * on Rsb(high-res) and Bezel(low-res) devices. - */ -internal class RotaryScrollBehavior( - private val scrollableState: ScrollableState, -) { - private var sequentialAnimation = false - private var scrollAnimation = AnimationState(0f) - private var prevPosition = 0f - - /** Handles scroll event to [targetValue] */ - suspend fun handleEvent(targetValue: Float) { - scrollableState.scroll(MutatePriority.UserInput) { - debugLog { "ScrollAnimation value before start: ${scrollAnimation.value}" } - - scrollAnimation.animateTo( - targetValue, - animationSpec = spring(), - sequentialAnimation = sequentialAnimation, - ) { - val delta = value - prevPosition - debugLog { "Animated by $delta, value: $value" } - scrollBy(delta) - prevPosition = value - sequentialAnimation = value != this.targetValue - } - } - } -} - -/** - * A helper class for snapping with rotary. Uses animateScrollToItem method for snapping to the Nth - * item. - */ -internal class RotarySnapBehavior( - private val rotaryScrollAdapter: RotaryScrollAdapter, - private val snapParameters: SnapParameters, -) { - private var snapTarget: Int = rotaryScrollAdapter.currentItemIndex() - private var sequentialSnap: Boolean = false - - private var anim = AnimationState(0f) - private var expectedDistance = 0f - - private val defaultStiffness = 200f - private var snapTargetUpdated = true - - /** - * Preparing snapping. This method should be called before [snapToTargetItem] is called. - * - * Snapping is done for current + [moveForElements] items. - * - * If [sequentialSnap] is true, items are summed up together. For example, if - * [prepareSnapForItems] is called with [moveForElements] = 2, 3, 5 -> then the snapping will - * happen to current + 10 items - * - * If [sequentialSnap] is false, then [moveForElements] are not summed up together. - */ - fun prepareSnapForItems(moveForElements: Int, sequentialSnap: Boolean) { - this.sequentialSnap = sequentialSnap - if (sequentialSnap) { - snapTarget += moveForElements - } else { - snapTarget = rotaryScrollAdapter.currentItemIndex() + moveForElements - } - snapTargetUpdated = true - snapTarget = snapTarget.coerceIn(0 until rotaryScrollAdapter.totalItemsCount()) - } - - /** Performs snapping to the closest item. */ - suspend fun snapToClosestItem() { - // Snapping to the closest item by using performFling method with 0 speed - rotaryScrollAdapter.scrollableState.scroll(MutatePriority.UserInput) { - debugLog { "snap to closest item" } - var prevPosition = 0f - AnimationState(0f).animateTo( - targetValue = -rotaryScrollAdapter.currentItemOffset(), - animationSpec = tween(durationMillis = 100, easing = FastOutSlowInEasing), - ) { - val animDelta = value - prevPosition - scrollBy(animDelta) - prevPosition = value - } - snapTarget = rotaryScrollAdapter.currentItemIndex() - } - } - - /** Returns true if top edge was reached */ - fun topEdgeReached(): Boolean = snapTarget <= 0 - - /** Returns true if bottom edge was reached */ - fun bottomEdgeReached(): Boolean = snapTarget >= rotaryScrollAdapter.totalItemsCount() - 1 - - /** Performs snapping to the specified in [prepareSnapForItems] element */ - suspend fun snapToTargetItem() { - if (sequentialSnap) { - anim = anim.copy(0f) - } else { - anim = AnimationState(0f) - } - rotaryScrollAdapter.scrollableState.scroll(MutatePriority.UserInput) { - // If snapTargetUpdated is true - then the target was updated so we - // need to do snap again - while (snapTargetUpdated) { - snapTargetUpdated = false - var latestCenterItem: Int - var continueFirstScroll = true - debugLog { "snapTarget $snapTarget" } - while (continueFirstScroll) { - latestCenterItem = rotaryScrollAdapter.currentItemIndex() - anim = anim.copy(0f) - expectedDistance = expectedDistanceTo(snapTarget, snapParameters.snapOffset) - debugLog { - "expectedDistance = $expectedDistance, " + - "scrollableState.centerItemScrollOffset " + - "${rotaryScrollAdapter.currentItemOffset()}" - } - continueFirstScroll = false - var prevPosition = 0f - - anim.animateTo( - expectedDistance, - animationSpec = - SpringSpec( - stiffness = defaultStiffness, - visibilityThreshold = 0.1f, - ), - sequentialAnimation = (anim.velocity != 0f), - ) { - val animDelta = value - prevPosition - debugLog { - "First animation, value:$value, velocity:$velocity, " + - "animDelta:$animDelta" - } - - // Exit animation if snap target was updated - if (snapTargetUpdated) cancelAnimation() - - scrollBy(animDelta) - prevPosition = value - - if (latestCenterItem != rotaryScrollAdapter.currentItemIndex()) { - continueFirstScroll = true - cancelAnimation() - return@animateTo - } - - debugLog { "centerItemIndex = ${rotaryScrollAdapter.currentItemIndex()}" } - if (rotaryScrollAdapter.currentItemIndex() == snapTarget) { - debugLog { "Target is visible. Cancelling first animation" } - debugLog { - "scrollableState.centerItemScrollOffset " + - "${rotaryScrollAdapter.currentItemOffset()}" - } - expectedDistance = -rotaryScrollAdapter.currentItemOffset() - continueFirstScroll = false - cancelAnimation() - return@animateTo - } - } - } - // Exit animation if snap target was updated - if (snapTargetUpdated) continue - - anim = anim.copy(0f) - var prevPosition = 0f - anim.animateTo( - expectedDistance, - animationSpec = - SpringSpec( - stiffness = defaultStiffness, - visibilityThreshold = 0.1f, - ), - sequentialAnimation = (anim.velocity != 0f), - ) { - // Exit animation if snap target was updated - if (snapTargetUpdated) cancelAnimation() - - val animDelta = value - prevPosition - debugLog { "Final animation. velocity:$velocity, animDelta:$animDelta" } - scrollBy(animDelta) - prevPosition = value - } - } - } - } - - private fun expectedDistanceTo(index: Int, targetScrollOffset: Int): Float { - val averageSize = rotaryScrollAdapter.averageItemSize() - val indexesDiff = index - rotaryScrollAdapter.currentItemIndex() - debugLog { "Average size $averageSize" } - return (averageSize * indexesDiff) + targetScrollOffset - - rotaryScrollAdapter.currentItemOffset() - } -} - -/** - * A modifier which handles rotary events. It accepts ScrollHandler as the input - a class where - * main logic about how scroll should be handled is lying - */ -internal fun Modifier.rotaryHandler( - rotaryScrollHandler: RotaryScrollHandler, - reverseDirection: Boolean, - rotaryHaptics: RotaryHapticHandler, - inspectorInfo: InspectorInfo.() -> Unit, -): Modifier = - this then - RotaryHandlerElement( - rotaryScrollHandler, - reverseDirection, - rotaryHaptics, - inspectorInfo, - ) - -/** - * Batching requests for scrolling events. This function combines all events together (except first) - * within specified timeframe. Should help with performance on high-res devices. - */ -@OptIn(ExperimentalCoroutinesApi::class) -internal fun Flow<TimestampedDelta>.batchRequestsWithinTimeframe( - timeframe: Long -): Flow<TimestampedDelta> { - var delta = 0f - var lastTimestamp = -timeframe - return if (timeframe == 0L) { - this - } else { - this.transformLatest { - delta += it.delta - debugLog { "Batching requests. delta:$delta" } - if (lastTimestamp + timeframe <= it.timestamp) { - lastTimestamp = it.timestamp - debugLog { "No events before, delta= $delta" } - emit(TimestampedDelta(it.timestamp, delta)) - } else { - delay(timeframe) - debugLog { "After delay, delta= $delta" } - if (delta > 0f) { - emit(TimestampedDelta(it.timestamp, delta)) - } - } - delta = 0f - } - } -} - -/** - * A scroll handler for RSB(high-res) without snapping and with or without fling A list is scrolled - * by the number of pixels received from the rotary device. - * - * This class is a little bit different from LowResScrollHandler class - it has a filtering for - * events which are coming with wrong sign ( this happens to rsb devices, especially at the end of - * the scroll) - * - * This scroll handler supports fling. It can be set with [RotaryFlingBehavior]. - */ -internal class HighResRotaryScrollHandler( - private val rotaryFlingBehaviorFactory: () -> RotaryFlingBehavior?, - private val scrollBehaviorFactory: () -> RotaryScrollBehavior, - private val hapticsThreshold: Long = 50, -) : RotaryScrollHandler { - - // This constant is specific for high-res devices. Because that input values - // can sometimes come with different sign, we have to filter them in this threshold - private val gestureThresholdTime = 200L - private var scrollJob: Job = CompletableDeferred<Unit>() - private var flingJob: Job = CompletableDeferred<Unit>() - - private var previousScrollEventTime = 0L - private var rotaryScrollDistance = 0f - - private var rotaryFlingBehavior: RotaryFlingBehavior? = rotaryFlingBehaviorFactory() - private var scrollBehavior: RotaryScrollBehavior = scrollBehaviorFactory() - - override suspend fun handleScrollEvent( - coroutineScope: CoroutineScope, - event: TimestampedDelta, - rotaryHaptics: RotaryHapticHandler, - ) { - val time = event.timestamp - val isOppositeScrollValue = isOppositeValueAfterScroll(event.delta) - - if (isNewScrollEvent(time)) { - debugLog { "New scroll event" } - resetTracking(time) - rotaryScrollDistance = event.delta - } else { - // Due to the physics of Rotary side button, some events might come - // with an opposite axis value - either at the start or at the end of the motion. - // We don't want to use these values for fling calculations. - if (!isOppositeScrollValue) { - rotaryFlingBehavior?.observeEvent(event.timestamp, event.delta) - } else { - debugLog { "Opposite value after scroll :${event.delta}" } - } - rotaryScrollDistance += event.delta - } - - scrollJob.cancel() - - rotaryHaptics.handleScrollHaptic(event.delta) - debugLog { "Rotary scroll distance: $rotaryScrollDistance" } - - previousScrollEventTime = time - scrollJob = coroutineScope.async { scrollBehavior.handleEvent(rotaryScrollDistance) } - - if (rotaryFlingBehavior != null) { - flingJob.cancel() - flingJob = - coroutineScope.async { - rotaryFlingBehavior?.trackFling( - beforeFling = { - debugLog { "Calling before fling section" } - scrollJob.cancel() - scrollBehavior = scrollBehaviorFactory() - } - ) - } - } - } - - private fun isOppositeValueAfterScroll(delta: Float): Boolean = - rotaryScrollDistance * delta < 0f && (abs(delta) < abs(rotaryScrollDistance)) - - private fun isNewScrollEvent(timestamp: Long): Boolean { - val timeDelta = timestamp - previousScrollEventTime - return previousScrollEventTime == 0L || timeDelta > gestureThresholdTime - } - - private fun resetTracking(timestamp: Long) { - scrollBehavior = scrollBehaviorFactory() - rotaryFlingBehavior = rotaryFlingBehaviorFactory() - rotaryFlingBehavior?.startFlingTracking(timestamp) - } -} - -/** - * A scroll handler for Bezel(low-res) without snapping. This scroll handler supports fling. It can - * be set with RotaryFlingBehavior. - */ -internal class LowResRotaryScrollHandler( - private val rotaryFlingBehaviorFactory: () -> RotaryFlingBehavior?, - private val scrollBehaviorFactory: () -> RotaryScrollBehavior, -) : RotaryScrollHandler { - - private val gestureThresholdTime = 200L - private var previousScrollEventTime = 0L - private var rotaryScrollDistance = 0f - - private var scrollJob: Job = CompletableDeferred<Unit>() - private var flingJob: Job = CompletableDeferred<Unit>() - - private var rotaryFlingBehavior: RotaryFlingBehavior? = rotaryFlingBehaviorFactory() - private var scrollBehavior: RotaryScrollBehavior = scrollBehaviorFactory() - - override suspend fun handleScrollEvent( - coroutineScope: CoroutineScope, - event: TimestampedDelta, - rotaryHaptics: RotaryHapticHandler, - ) { - val time = event.timestamp - - if (isNewScrollEvent(time)) { - resetTracking(time) - rotaryScrollDistance = event.delta - } else { - rotaryFlingBehavior?.observeEvent(event.timestamp, event.delta) - rotaryScrollDistance += event.delta - } - - scrollJob.cancel() - flingJob.cancel() - - rotaryHaptics.handleScrollHaptic(event.delta) - debugLog { "Rotary scroll distance: $rotaryScrollDistance" } - - previousScrollEventTime = time - scrollJob = coroutineScope.async { scrollBehavior.handleEvent(rotaryScrollDistance) } - - flingJob = - coroutineScope.async { - rotaryFlingBehavior?.trackFling( - beforeFling = { - debugLog { "Calling before fling section" } - scrollJob.cancel() - scrollBehavior = scrollBehaviorFactory() - }, - ) - } - } - - private fun isNewScrollEvent(timestamp: Long): Boolean { - val timeDelta = timestamp - previousScrollEventTime - return previousScrollEventTime == 0L || timeDelta > gestureThresholdTime - } - - private fun resetTracking(timestamp: Long) { - scrollBehavior = scrollBehaviorFactory() - debugLog { "Velocity tracker reset" } - rotaryFlingBehavior = rotaryFlingBehaviorFactory() - rotaryFlingBehavior?.startFlingTracking(timestamp) - } -} - -/** - * A scroll handler for RSB(high-res) with snapping and without fling Snapping happens after a - * threshold is reached ( set in [RotarySnapBehavior]) - * - * This scroll handler doesn't support fling. - */ -internal class HighResSnapHandler( - private val resistanceFactor: Float, - private val thresholdBehaviorFactory: () -> ThresholdBehavior, - private val snapBehaviourFactory: () -> RotarySnapBehavior, - private val scrollBehaviourFactory: () -> RotaryScrollBehavior, -) : RotaryScrollHandler { - private val gestureThresholdTime = 200L - private val snapDelay = 100L - private val maxSnapsPerEvent = 2 - - private var scrollJob: Job = CompletableDeferred<Unit>() - private var snapJob: Job = CompletableDeferred<Unit>() - - private var previousScrollEventTime = 0L - private var snapAccumulator = 0f - private var rotaryScrollDistance = 0f - private var scrollInProgress = false - - private var snapBehaviour = snapBehaviourFactory() - private var scrollBehaviour = scrollBehaviourFactory() - private var thresholdBehavior = thresholdBehaviorFactory() - - private val scrollEasing: Easing = CubicBezierEasing(0.0f, 0.0f, 0.5f, 1.0f) - - override suspend fun handleScrollEvent( - coroutineScope: CoroutineScope, - event: TimestampedDelta, - rotaryHaptics: RotaryHapticHandler, - ) { - val time = event.timestamp - - if (isNewScrollEvent(time)) { - debugLog { "New scroll event" } - resetTracking() - snapJob.cancel() - snapBehaviour = snapBehaviourFactory() - scrollBehaviour = scrollBehaviourFactory() - thresholdBehavior = thresholdBehaviorFactory() - thresholdBehavior.startThresholdTracking(time) - snapAccumulator = 0f - rotaryScrollDistance = 0f - } - - if (!isOppositeValueAfterScroll(event.delta)) { - thresholdBehavior.observeEvent(event.timestamp, event.delta) - } else { - debugLog { "Opposite value after scroll :${event.delta}" } - } - - thresholdBehavior.applySmoothing() - val snapThreshold = thresholdBehavior.snapThreshold() - - snapAccumulator += event.delta - if (!snapJob.isActive) { - val resistanceCoeff = - 1 - scrollEasing.transform(rotaryScrollDistance.absoluteValue / snapThreshold) - rotaryScrollDistance += event.delta * resistanceCoeff - } - - debugLog { "Snap accumulator: $snapAccumulator" } - debugLog { "Rotary scroll distance: $rotaryScrollDistance" } - - debugLog { "snapThreshold: $snapThreshold" } - previousScrollEventTime = time - - if (abs(snapAccumulator) > snapThreshold) { - scrollInProgress = false - scrollBehaviour = scrollBehaviourFactory() - scrollJob.cancel() - - val snapDistance = - (snapAccumulator / snapThreshold) - .toInt() - .coerceIn(-maxSnapsPerEvent..maxSnapsPerEvent) - snapAccumulator -= snapThreshold * snapDistance - val sequentialSnap = snapJob.isActive - - debugLog { - "Snap threshold reached: snapDistance:$snapDistance, " + - "sequentialSnap: $sequentialSnap, " + - "snap accumulator remaining: $snapAccumulator" - } - if ( - (!snapBehaviour.topEdgeReached() && snapDistance < 0) || - (!snapBehaviour.bottomEdgeReached() && snapDistance > 0) - ) { - rotaryHaptics.handleSnapHaptic(event.delta) - } - - snapBehaviour.prepareSnapForItems(snapDistance, sequentialSnap) - if (!snapJob.isActive) { - snapJob.cancel() - snapJob = - coroutineScope.async { - debugLog { "Snap started" } - try { - snapBehaviour.snapToTargetItem() - } finally { - debugLog { "Snap called finally" } - } - } - } - rotaryScrollDistance = 0f - } else { - if (!snapJob.isActive) { - scrollJob.cancel() - debugLog { "Scrolling for $rotaryScrollDistance/$resistanceFactor px" } - scrollJob = - coroutineScope.async { - scrollBehaviour.handleEvent(rotaryScrollDistance / resistanceFactor) - } - delay(snapDelay) - scrollInProgress = false - scrollBehaviour = scrollBehaviourFactory() - rotaryScrollDistance = 0f - snapAccumulator = 0f - snapBehaviour.prepareSnapForItems(0, false) - - snapJob.cancel() - snapJob = coroutineScope.async { snapBehaviour.snapToClosestItem() } - } - } - } - - private fun isOppositeValueAfterScroll(delta: Float): Boolean = - sign(rotaryScrollDistance) * sign(delta) == -1f && (abs(delta) < abs(rotaryScrollDistance)) - - private fun isNewScrollEvent(timestamp: Long): Boolean { - val timeDelta = timestamp - previousScrollEventTime - return previousScrollEventTime == 0L || timeDelta > gestureThresholdTime - } - - private fun resetTracking() { - scrollInProgress = true - } -} - -/** - * A scroll handler for RSB(high-res) with snapping and without fling Snapping happens after a - * threshold is reached ( set in [RotarySnapBehavior]) - * - * This scroll handler doesn't support fling. - */ -internal class LowResSnapHandler( - private val snapBehaviourFactory: () -> RotarySnapBehavior, -) : RotaryScrollHandler { - private val gestureThresholdTime = 200L - - private var snapJob: Job = CompletableDeferred<Unit>() - - private var previousScrollEventTime = 0L - private var snapAccumulator = 0f - private var scrollInProgress = false - - private var snapBehaviour = snapBehaviourFactory() - - override suspend fun handleScrollEvent( - coroutineScope: CoroutineScope, - event: TimestampedDelta, - rotaryHaptics: RotaryHapticHandler, - ) { - val time = event.timestamp - - if (isNewScrollEvent(time)) { - debugLog { "New scroll event" } - resetTracking() - snapJob.cancel() - snapBehaviour = snapBehaviourFactory() - snapAccumulator = 0f - } - - snapAccumulator += event.delta - - debugLog { "Snap accumulator: $snapAccumulator" } - - previousScrollEventTime = time - - if (abs(snapAccumulator) > 1f) { - scrollInProgress = false - - val snapDistance = sign(snapAccumulator).toInt() - rotaryHaptics.handleSnapHaptic(event.delta) - val sequentialSnap = snapJob.isActive - debugLog { - "Snap threshold reached: snapDistance:$snapDistance, " + - "sequentialSnap: $sequentialSnap, " + - "snap accumulator: $snapAccumulator" - } - - snapBehaviour.prepareSnapForItems(snapDistance, sequentialSnap) - if (!snapJob.isActive) { - snapJob.cancel() - snapJob = - coroutineScope.async { - debugLog { "Snap started" } - try { - snapBehaviour.snapToTargetItem() - } finally { - debugLog { "Snap called finally" } - } - } - } - snapAccumulator = 0f - } - } - - private fun isNewScrollEvent(timestamp: Long): Boolean { - val timeDelta = timestamp - previousScrollEventTime - return previousScrollEventTime == 0L || timeDelta > gestureThresholdTime - } - - private fun resetTracking() { - scrollInProgress = true - } -} - -internal class ThresholdBehavior( - private val rotaryScrollAdapter: RotaryScrollAdapter, - private val thresholdDivider: Float, - private val minVelocity: Float = 300f, - private val maxVelocity: Float = 3000f, - private val smoothingConstant: Float = 0.4f, -) { - private val thresholdDividerEasing: Easing = CubicBezierEasing(0.5f, 0.0f, 0.5f, 1.0f) - - private val rotaryVelocityTracker = RotaryVelocityTracker() - - private var smoothedVelocity = 0f - - fun startThresholdTracking(time: Long) { - rotaryVelocityTracker.start(time) - smoothedVelocity = 0f - } - - fun observeEvent(timestamp: Long, delta: Float) { - rotaryVelocityTracker.move(timestamp, delta) - } - - fun applySmoothing() { - if (rotaryVelocityTracker.velocity != 0.0f) { - // smooth the velocity - smoothedVelocity = - exponentialSmoothing( - currentVelocity = rotaryVelocityTracker.velocity.absoluteValue, - prevVelocity = smoothedVelocity, - smoothingConstant = smoothingConstant, - ) - } - debugLog { "rotaryVelocityTracker velocity: ${rotaryVelocityTracker.velocity}" } - debugLog { "SmoothedVelocity: $smoothedVelocity" } - } - - fun snapThreshold(): Float { - val thresholdDividerFraction = - thresholdDividerEasing.transform( - inverseLerp( - minVelocity, - maxVelocity, - smoothedVelocity, - ), - ) - return rotaryScrollAdapter.averageItemSize() / - lerp( - 1f, - thresholdDivider, - thresholdDividerFraction, - ) - } - - private fun exponentialSmoothing( - currentVelocity: Float, - prevVelocity: Float, - smoothingConstant: Float, - ): Float = smoothingConstant * currentVelocity + (1 - smoothingConstant) * prevVelocity -} - -private data class RotaryHandlerElement( - private val rotaryScrollHandler: RotaryScrollHandler, - private val reverseDirection: Boolean, - private val rotaryHaptics: RotaryHapticHandler, - private val inspectorInfo: InspectorInfo.() -> Unit, -) : ModifierNodeElement<RotaryInputNode>() { - override fun create(): RotaryInputNode = - RotaryInputNode( - rotaryScrollHandler, - reverseDirection, - rotaryHaptics, - ) - - override fun update(node: RotaryInputNode) { - debugLog { "Update launched!" } - node.rotaryScrollHandler = rotaryScrollHandler - node.reverseDirection = reverseDirection - node.rotaryHaptics = rotaryHaptics - } - - override fun InspectorInfo.inspectableProperties() { - inspectorInfo() - } - - override fun equals(other: Any?): Boolean { - if (this === other) return true - if (other == null || this::class != other::class) return false - - other as RotaryHandlerElement - - if (rotaryScrollHandler != other.rotaryScrollHandler) return false - if (reverseDirection != other.reverseDirection) return false - if (rotaryHaptics != other.rotaryHaptics) return false - if (inspectorInfo != other.inspectorInfo) return false - - return true - } - - override fun hashCode(): Int { - var result = rotaryScrollHandler.hashCode() - result = 31 * result + reverseDirection.hashCode() - result = 31 * result + rotaryHaptics.hashCode() - result = 31 * result + inspectorInfo.hashCode() - return result - } -} - -private class RotaryInputNode( - var rotaryScrollHandler: RotaryScrollHandler, - var reverseDirection: Boolean, - var rotaryHaptics: RotaryHapticHandler, -) : RotaryInputModifierNode, Modifier.Node() { - - val channel = Channel<TimestampedDelta>(capacity = Channel.CONFLATED) - val flow = channel.receiveAsFlow() - - override fun onAttach() { - coroutineScope.launch { - flow.collectLatest { - debugLog { - "Scroll event received: " + "delta:${it.delta}, timestamp:${it.timestamp}" - } - rotaryScrollHandler.handleScrollEvent(this, it, rotaryHaptics) - } - } - } - - override fun onRotaryScrollEvent(event: RotaryScrollEvent): Boolean = false - - override fun onPreRotaryScrollEvent(event: RotaryScrollEvent): Boolean { - debugLog { "onPreRotaryScrollEvent" } - channel.trySend( - TimestampedDelta( - event.uptimeMillis, - event.verticalScrollPixels * if (reverseDirection) -1f else 1f, - ), - ) - return true - } -} - -private fun inverseLerp(start: Float, stop: Float, value: Float): Float { - return ((value - start) / (stop - start)).coerceIn(0f, 1f) -} - -/** Debug logging that can be enabled. */ -private const val DEBUG = false - -private inline fun debugLog(generateMsg: () -> String) { - if (DEBUG) { - println("RotaryScroll: ${generateMsg()}") - } -} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/rotaryinput/RotaryVelocityTracker.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/rotaryinput/RotaryVelocityTracker.kt deleted file mode 100644 index 1719ecef3..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/rotaryinput/RotaryVelocityTracker.kt +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2024 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.permissioncontroller.permission.ui.wear.elements.rotaryinput - -import androidx.compose.ui.input.pointer.util.VelocityTracker1D - -// This file is a copy of RotaryVelocityTracker.kt from Horologist (go/horologist), -// remove it once Wear Compose 1.4 is landed (b/325560444). - -/** A wrapper around VelocityTracker1D to provide support for rotary input. */ -class RotaryVelocityTracker { - private var velocityTracker: VelocityTracker1D = VelocityTracker1D(true) - - /** Retrieve the last computed velocity. */ - val velocity: Float - get() = velocityTracker.calculateVelocity() - - /** Start tracking motion. */ - fun start(currentTime: Long) { - velocityTracker.resetTracking() - velocityTracker.addDataPoint(currentTime, 0f) - } - - /** Continue tracking motion as the input rotates. */ - fun move(currentTime: Long, delta: Float) { - velocityTracker.addDataPoint(currentTime, delta) - } - - /** Stop tracking motion. */ - fun end() { - velocityTracker.resetTracking() - } -} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/model/WearGrantPermissionsViewModel.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/model/WearGrantPermissionsViewModel.kt index 54a6e7c9f..0b1faf2b2 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/model/WearGrantPermissionsViewModel.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/model/WearGrantPermissionsViewModel.kt @@ -43,6 +43,9 @@ class WearGrantPermissionsViewModel : ViewModel() { /** A livedata which stores the permission group button visibilities. */ val buttonVisibilitiesLiveData = MutableLiveData<List<Boolean>>() + /** A livedata to control screen visibility */ + val showDialog = MutableLiveData<Boolean>() + init { groupNameLiveData.value = "" iconLiveData.value = null @@ -51,12 +54,14 @@ class WearGrantPermissionsViewModel : ViewModel() { locationVisibilitiesLiveData.value = emptyList() preciseLocationCheckedLiveData.value = false buttonVisibilitiesLiveData.value = emptyList() + showDialog.value = false } } /** Factory for a WearGrantPermissionsViewModel */ class WearGrantPermissionsViewModelFactory : ViewModelProvider.Factory { override fun <T : ViewModel> create(modelClass: Class<T>): T { - @Suppress("UNCHECKED_CAST") return WearGrantPermissionsViewModel() as T + @Suppress("UNCHECKED_CAST") + return WearGrantPermissionsViewModel() as T } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/model/WearLocationProviderInterceptDialogViewModel.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/model/WearLocationProviderInterceptDialogViewModel.kt index 009ff952c..ec7647f3c 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/model/WearLocationProviderInterceptDialogViewModel.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/model/WearLocationProviderInterceptDialogViewModel.kt @@ -32,10 +32,14 @@ import com.android.permissioncontroller.permission.utils.Utils class WearLocationProviderInterceptDialogViewModel : ViewModel() { private val showDialogLiveData = MutableLiveData<Boolean>() val dialogVisibilityLiveData: LiveData<Boolean> = showDialogLiveData - var locationProviderInterceptDialogArgs: LocationProviderInterceptDialogArgs? = null + private val _locationProviderInterceptDialogArgs = + MutableLiveData<LocationProviderInterceptDialogArgs?>() + var locationProviderInterceptDialogArgs: LiveData<LocationProviderInterceptDialogArgs?> = + _locationProviderInterceptDialogArgs init { showDialogLiveData.value = false + _locationProviderInterceptDialogArgs.value = null } private fun applicationInfo(context: Context, packageName: String): ApplicationInfo? { @@ -51,7 +55,7 @@ class WearLocationProviderInterceptDialogViewModel : ViewModel() { fun showDialog(context: Context, packageName: String) { val applicationInfo = applicationInfo(context, packageName) ?: return val appLabel = Utils.getAppLabel(applicationInfo, context) - locationProviderInterceptDialogArgs = + _locationProviderInterceptDialogArgs.value = LocationProviderInterceptDialogArgs( iconId = R.drawable.ic_dialog_alert_material, titleId = android.R.string.dialog_alert_title, @@ -61,13 +65,13 @@ class WearLocationProviderInterceptDialogViewModel : ViewModel() { onOkButtonClick = { dismissDialog() }, onLocationSettingsClick = { context.startActivity(Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)) - } + }, ) showDialogLiveData.value = true } fun dismissDialog() { - locationProviderInterceptDialogArgs = null + _locationProviderInterceptDialogArgs.value = null showDialogLiveData.value = false } } @@ -75,7 +79,8 @@ class WearLocationProviderInterceptDialogViewModel : ViewModel() { /** Factory for an AppPermissionGroupsRevokeDialogViewModel */ class WearLocationProviderInterceptDialogViewModelFactory : ViewModelProvider.Factory { override fun <T : ViewModel> create(modelClass: Class<T>): T { - @Suppress("UNCHECKED_CAST") return WearLocationProviderInterceptDialogViewModel() as T + @Suppress("UNCHECKED_CAST") + return WearLocationProviderInterceptDialogViewModel() as T } } @@ -86,5 +91,5 @@ data class LocationProviderInterceptDialogArgs( val okButtonTitleId: Int, val locationSettingsId: Int, val onOkButtonClick: () -> Unit, - val onLocationSettingsClick: () -> Unit + val onLocationSettingsClick: () -> Unit, ) diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearPermissionTheme.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearPermissionTheme.kt deleted file mode 100644 index 8823bee07..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearPermissionTheme.kt +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Copyright (C) 2024 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.permissioncontroller.permission.ui.wear.theme - -import android.content.Context -import android.os.Build -import androidx.annotation.RequiresApi -import androidx.annotation.StringRes -import androidx.annotation.VisibleForTesting -import androidx.compose.runtime.Composable -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.text.font.DeviceFontFamilyName -import androidx.compose.ui.text.font.Font -import androidx.compose.ui.text.font.FontFamily -import androidx.wear.compose.material.Colors -import androidx.wear.compose.material.MaterialTheme -import androidx.wear.compose.material.Typography -import androidx.wear.compose.material3.MaterialTheme as Material3Theme -import com.android.permissioncontroller.R -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion.MATERIAL2_5 -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion.MATERIAL3 - -/** This enum is used to specify the material version used for a specific screen */ -enum class WearPermissionMaterialUIVersion { - MATERIAL2_5, - MATERIAL3, -} - -/** - * Supports both Material 3 and Material 2_5 theme. default version for permission theme will be 2_5 - * until we migrate enough screens to 3. 2_5 version will use material 3 overlay resources if we - * enable material3 for even one screen (Permission screens will be migrated in phases). - */ -@Composable -fun WearPermissionTheme( - version: WearPermissionMaterialUIVersion = MATERIAL2_5, - content: @Composable () -> Unit, -) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) { - WearPermissionLegacyTheme(content) - } else { - // Whether we are ready to use material3 for any screen. - val useBridgedTheme = ResourceHelper.material3Enabled - - // Material3 UI controls are still being used in the screen that the theme is applied - if (version == MATERIAL3) { - val material3Theme = WearOverlayableMaterial3Theme(LocalContext.current) - Material3Theme( - colorScheme = material3Theme.colorScheme, - typography = material3Theme.typography, - shapes = material3Theme.shapes, - content = content, - ) - } - // Material2_5 UI controls are still being used in the screen that the theme is applied, - // But some in-app screens(like permission grant screen) are migrated to material3. - // To avoid having two set of overlay resources, we will use material3 overlay resources to - // support material2_5 UI controls as well. - else if (version == MATERIAL2_5 && useBridgedTheme) { - val material3Theme = WearOverlayableMaterial3Theme(LocalContext.current) - val bridgedLegacyTheme = WearMaterialBridgedLegacyTheme.createFrom(material3Theme) - MaterialTheme( - colors = bridgedLegacyTheme.colors, - typography = bridgedLegacyTheme.typography, - shapes = bridgedLegacyTheme.shapes, - content = content, - ) - } - // We are not ready for material3 yet in any screens. - else { - WearPermissionLegacyTheme(content) - } - } -} - -/** - * The Material 2.5 Theme Wrapper for Supporting RRO with legacy resources. This theme is kept here - * for backward compatibility. When grant screen is updated to material3 will clean up legacy - * resources. - */ -@Composable -fun WearPermissionLegacyTheme(content: @Composable () -> Unit) { - val context = LocalContext.current - val colors = - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { - overlayColors(context) - .copy(error = MaterialTheme.colors.error, onError = MaterialTheme.colors.onError) - } else { - MaterialTheme.colors - } - MaterialTheme(colors = colors, typography = deviceDefaultTypography(context), content = content) -} - -/** - * Creates a dynamic color maps that can be overlaid. 100 - Lightest shade; 0 - Darkest Shade; In - * wear we only support dark theme for the time being. Thus the fill colors and variants are dark - * and anything on top is light. We will use this custom redirection until wear compose material - * supports color scheming. - * - * The mapping is best case match on wear material color tokens from - * /android/clockwork/common/wearable/wearmaterial/color/res/values/color-tokens.xml - * - * @param context The context required to get system resource data. - */ -@RequiresApi(Build.VERSION_CODES.S) -@VisibleForTesting -internal fun overlayColors(context: Context): Colors { - val tonalPalette = dynamicTonalPalette(context) - return Colors( - background = Color.Black, - onBackground = Color.White, - primary = tonalPalette.primary90, - primaryVariant = tonalPalette.primary80, - onPrimary = tonalPalette.primary10, - secondary = tonalPalette.tertiary90, - secondaryVariant = tonalPalette.tertiary60, - onSecondary = tonalPalette.tertiary10, - surface = tonalPalette.neutral20, - onSurface = tonalPalette.neutral95, - onSurfaceVariant = tonalPalette.neutralVariant80, - ) -} - -private fun fontFamily(context: Context, @StringRes id: Int): FontFamily { - val typefaceName = context.resources.getString(id) - val font = Font(familyName = DeviceFontFamilyName(typefaceName)) - return FontFamily(font) -} - -/* - Only customizes font family. The material 3 roles to 2.5 are mapped to the best case matching of - google3/java/com/google/android/wearable/libraries/compose/theme/GoogleMaterialTheme.kt -*/ -internal fun deviceDefaultTypography(context: Context): Typography { - val defaultTypography = Typography() - return Typography( - display1 = - defaultTypography.display1.copy( - fontFamily = - fontFamily(context, R.string.wear_material_compose_display_1_font_family) - ), - display2 = - defaultTypography.display2.copy( - fontFamily = - fontFamily(context, R.string.wear_material_compose_display_2_font_family) - ), - display3 = - defaultTypography.display3.copy( - fontFamily = - fontFamily(context, R.string.wear_material_compose_display_3_font_family) - ), - title1 = - defaultTypography.title1.copy( - fontFamily = fontFamily(context, R.string.wear_material_compose_title_1_font_family) - ), - title2 = - defaultTypography.title2.copy( - fontFamily = fontFamily(context, R.string.wear_material_compose_title_2_font_family) - ), - title3 = - defaultTypography.title3.copy( - fontFamily = fontFamily(context, R.string.wear_material_compose_title_3_font_family) - ), - body1 = - defaultTypography.body1.copy( - fontFamily = fontFamily(context, R.string.wear_material_compose_body_1_font_family) - ), - body2 = - defaultTypography.body2.copy( - fontFamily = fontFamily(context, R.string.wear_material_compose_body_2_font_family) - ), - button = - defaultTypography.button.copy( - fontFamily = fontFamily(context, R.string.wear_material_compose_button_font_family) - ), - caption1 = - defaultTypography.caption1.copy( - fontFamily = - fontFamily(context, R.string.wear_material_compose_caption_1_font_family) - ), - caption2 = - defaultTypography.caption2.copy( - fontFamily = - fontFamily(context, R.string.wear_material_compose_caption_2_font_family) - ), - caption3 = - defaultTypography.caption3.copy( - fontFamily = - fontFamily(context, R.string.wear_material_compose_caption_3_font_family) - ), - ) -} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearPermissionTonalPalette.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearPermissionTonalPalette.kt deleted file mode 100644 index a86af8b3d..000000000 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearPermissionTonalPalette.kt +++ /dev/null @@ -1,191 +0,0 @@ -@file:Suppress("unused") - -package com.android.permissioncontroller.permission.ui.wear.theme - -import android.R -import android.content.Context -import android.os.Build -import androidx.annotation.ColorRes -import androidx.annotation.DoNotInline -import androidx.annotation.RequiresApi -import androidx.compose.ui.graphics.Color - -/** - * Tonal Palette structure in Material. - * - * A tonal palette is comprised of 5 tonal ranges. Each tonal range includes the 13 stops, or tonal - * swatches. - * - * Tonal range names are: - * - Neutral (N) - * - Neutral variant (NV) - * - Primary (P) - * - Secondary (S) - * - Tertiary (T) - */ -internal class WearPermissionTonalPalette( - // The neutral tonal range. - val neutral100: Color, - val neutral99: Color, - val neutral95: Color, - val neutral90: Color, - val neutral80: Color, - val neutral70: Color, - val neutral60: Color, - val neutral50: Color, - val neutral40: Color, - val neutral30: Color, - val neutral20: Color, - val neutral10: Color, - val neutral0: Color, - - // The neutral variant tonal range, sometimes called "neutral 2" - val neutralVariant100: Color, - val neutralVariant99: Color, - val neutralVariant95: Color, - val neutralVariant90: Color, - val neutralVariant80: Color, - val neutralVariant70: Color, - val neutralVariant60: Color, - val neutralVariant50: Color, - val neutralVariant40: Color, - val neutralVariant30: Color, - val neutralVariant20: Color, - val neutralVariant10: Color, - val neutralVariant0: Color, - - // The primary tonal range, also known as accent 1 - val primary100: Color, - val primary99: Color, - val primary95: Color, - val primary90: Color, - val primary80: Color, - val primary70: Color, - val primary60: Color, - val primary50: Color, - val primary40: Color, - val primary30: Color, - val primary20: Color, - val primary10: Color, - val primary0: Color, - - // The Secondary tonal range, also know as accent 2 - val secondary100: Color, - val secondary99: Color, - val secondary95: Color, - val secondary90: Color, - val secondary80: Color, - val secondary70: Color, - val secondary60: Color, - val secondary50: Color, - val secondary40: Color, - val secondary30: Color, - val secondary20: Color, - val secondary10: Color, - val secondary0: Color, - - // The tertiary tonal range, also known as accent 3 - val tertiary100: Color, - val tertiary99: Color, - val tertiary95: Color, - val tertiary90: Color, - val tertiary80: Color, - val tertiary70: Color, - val tertiary60: Color, - val tertiary50: Color, - val tertiary40: Color, - val tertiary30: Color, - val tertiary20: Color, - val tertiary10: Color, - val tertiary0: Color, -) -/** Dynamic colors for wear compose material to support resource overlay. */ -@RequiresApi(Build.VERSION_CODES.S) -// TODO: once we have proper support for this on Wear 6+, we will do something similar to -// https://source.corp.google.com/h/android/platform/superproject/+/androidx-main:frameworks/support/compose/material3/material3/src/androidMain/kotlin/androidx/compose/material3/DynamicTonalPalette.android.kt;l=307-362?q=dynamicTonalPalette&sq=repo:android%2Fplatform%2Fsuperproject%20b:androidx-main -// Tracking Bug: b/270720571 -internal fun dynamicTonalPalette(context: Context) = - WearPermissionTonalPalette( - // The neutral tonal range from the generated dynamic color palette. - neutral100 = ColorResourceHelper.getColor(context, R.color.system_neutral1_0), - neutral99 = ColorResourceHelper.getColor(context, R.color.system_neutral1_10), - neutral95 = ColorResourceHelper.getColor(context, R.color.system_neutral1_50), - neutral90 = ColorResourceHelper.getColor(context, R.color.system_neutral1_100), - neutral80 = ColorResourceHelper.getColor(context, R.color.system_neutral1_200), - neutral70 = ColorResourceHelper.getColor(context, R.color.system_neutral1_300), - neutral60 = ColorResourceHelper.getColor(context, R.color.system_neutral1_400), - neutral50 = ColorResourceHelper.getColor(context, R.color.system_neutral1_500), - neutral40 = ColorResourceHelper.getColor(context, R.color.system_neutral1_600), - neutral30 = ColorResourceHelper.getColor(context, R.color.system_neutral1_700), - neutral20 = ColorResourceHelper.getColor(context, R.color.system_neutral1_800), - neutral10 = ColorResourceHelper.getColor(context, R.color.system_neutral1_900), - neutral0 = ColorResourceHelper.getColor(context, R.color.system_neutral1_1000), - - // The neutral variant tonal range, sometimes called "neutral 2", from the - // generated dynamic color palette. - neutralVariant100 = ColorResourceHelper.getColor(context, R.color.system_neutral2_0), - neutralVariant99 = ColorResourceHelper.getColor(context, R.color.system_neutral2_10), - neutralVariant95 = ColorResourceHelper.getColor(context, R.color.system_neutral2_50), - neutralVariant90 = ColorResourceHelper.getColor(context, R.color.system_neutral2_100), - neutralVariant80 = ColorResourceHelper.getColor(context, R.color.system_neutral2_200), - neutralVariant70 = ColorResourceHelper.getColor(context, R.color.system_neutral2_300), - neutralVariant60 = ColorResourceHelper.getColor(context, R.color.system_neutral2_400), - neutralVariant50 = ColorResourceHelper.getColor(context, R.color.system_neutral2_500), - neutralVariant40 = ColorResourceHelper.getColor(context, R.color.system_neutral2_600), - neutralVariant30 = ColorResourceHelper.getColor(context, R.color.system_neutral2_700), - neutralVariant20 = ColorResourceHelper.getColor(context, R.color.system_neutral2_800), - neutralVariant10 = ColorResourceHelper.getColor(context, R.color.system_neutral2_900), - neutralVariant0 = ColorResourceHelper.getColor(context, R.color.system_neutral2_1000), - - // The primary tonal range from the generated dynamic color palette. - primary100 = ColorResourceHelper.getColor(context, R.color.system_accent1_0), - primary99 = ColorResourceHelper.getColor(context, R.color.system_accent1_10), - primary95 = ColorResourceHelper.getColor(context, R.color.system_accent1_50), - primary90 = ColorResourceHelper.getColor(context, R.color.system_accent1_100), - primary80 = ColorResourceHelper.getColor(context, R.color.system_accent1_200), - primary70 = ColorResourceHelper.getColor(context, R.color.system_accent1_300), - primary60 = ColorResourceHelper.getColor(context, R.color.system_accent1_400), - primary50 = ColorResourceHelper.getColor(context, R.color.system_accent1_500), - primary40 = ColorResourceHelper.getColor(context, R.color.system_accent1_600), - primary30 = ColorResourceHelper.getColor(context, R.color.system_accent1_700), - primary20 = ColorResourceHelper.getColor(context, R.color.system_accent1_800), - primary10 = ColorResourceHelper.getColor(context, R.color.system_accent1_900), - primary0 = ColorResourceHelper.getColor(context, R.color.system_accent1_1000), - - // The secondary tonal range from the generated dynamic color palette. - secondary100 = ColorResourceHelper.getColor(context, R.color.system_accent2_0), - secondary99 = ColorResourceHelper.getColor(context, R.color.system_accent2_10), - secondary95 = ColorResourceHelper.getColor(context, R.color.system_accent2_50), - secondary90 = ColorResourceHelper.getColor(context, R.color.system_accent2_100), - secondary80 = ColorResourceHelper.getColor(context, R.color.system_accent2_200), - secondary70 = ColorResourceHelper.getColor(context, R.color.system_accent2_300), - secondary60 = ColorResourceHelper.getColor(context, R.color.system_accent2_400), - secondary50 = ColorResourceHelper.getColor(context, R.color.system_accent2_500), - secondary40 = ColorResourceHelper.getColor(context, R.color.system_accent2_600), - secondary30 = ColorResourceHelper.getColor(context, R.color.system_accent2_700), - secondary20 = ColorResourceHelper.getColor(context, R.color.system_accent2_800), - secondary10 = ColorResourceHelper.getColor(context, R.color.system_accent2_900), - secondary0 = ColorResourceHelper.getColor(context, R.color.system_accent2_1000), - - // The tertiary tonal range from the generated dynamic color palette. - tertiary100 = ColorResourceHelper.getColor(context, R.color.system_accent3_0), - tertiary99 = ColorResourceHelper.getColor(context, R.color.system_accent3_10), - tertiary95 = ColorResourceHelper.getColor(context, R.color.system_accent3_50), - tertiary90 = ColorResourceHelper.getColor(context, R.color.system_accent3_100), - tertiary80 = ColorResourceHelper.getColor(context, R.color.system_accent3_200), - tertiary70 = ColorResourceHelper.getColor(context, R.color.system_accent3_300), - tertiary60 = ColorResourceHelper.getColor(context, R.color.system_accent3_400), - tertiary50 = ColorResourceHelper.getColor(context, R.color.system_accent3_500), - tertiary40 = ColorResourceHelper.getColor(context, R.color.system_accent3_600), - tertiary30 = ColorResourceHelper.getColor(context, R.color.system_accent3_700), - tertiary20 = ColorResourceHelper.getColor(context, R.color.system_accent3_800), - tertiary10 = ColorResourceHelper.getColor(context, R.color.system_accent3_900), - tertiary0 = ColorResourceHelper.getColor(context, R.color.system_accent3_1000), - ) - -private object ColorResourceHelper { - @DoNotInline - fun getColor(context: Context, @ColorRes id: Int): Color { - return Color(context.resources.getColor(id, context.theme)) - } -} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/AndroidUtils.kt b/PermissionController/src/com/android/permissioncontroller/permission/utils/AndroidUtils.kt index a5f78aa53..081a467bd 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/AndroidUtils.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/AndroidUtils.kt @@ -24,8 +24,8 @@ import android.content.ContextWrapper import android.content.pm.ComponentInfo import android.content.pm.PackageManager import android.content.pm.ResolveInfo -import android.os.Looper import android.os.UserHandle +import androidx.arch.core.executor.ArchTaskExecutor import java.util.concurrent.Executors import kotlinx.coroutines.asCoroutineDispatcher @@ -51,8 +51,8 @@ val IPC = Executors.newFixedThreadPool(IPC_THREAD_POOL_COUNT).asCoroutineDispatc /** Assert that an operation is running on main thread */ fun ensureMainThread() = - check(Looper.myLooper() == Looper.getMainLooper()) { - "Only meant to be used on the main thread" + check(ArchTaskExecutor.getInstance().isMainThread) { + ("Only meant to be used on the main thread, current thread is " + Thread.currentThread()) } /** A more readable version of [PackageManager.updatePermissionFlags] */ @@ -72,5 +72,7 @@ fun PackageManager.updatePermissionFlags( val ResolveInfo.componentInfo: ComponentInfo get() { return (activityInfo as ComponentInfo?) - ?: serviceInfo ?: providerInfo ?: throw IllegalStateException("Missing ComponentInfo!") + ?: serviceInfo + ?: providerInfo + ?: throw IllegalStateException("Missing ComponentInfo!") } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt b/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt index fb33aaffc..51f098371 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt @@ -165,7 +165,7 @@ object KotlinUtils { val first: A, val second: B, val third: C, - val fourth: D + val fourth: D, ) /** @@ -179,7 +179,7 @@ object KotlinUtils { DeviceConfig.getBoolean( DeviceConfig.NAMESPACE_PRIVACY, PROPERTY_CAMERA_MIC_ICONS_ENABLED, - true + true, ) } @@ -190,7 +190,7 @@ object KotlinUtils { DeviceConfig.getBoolean( DeviceConfig.NAMESPACE_PRIVACY, PROPERTY_LOCATION_INDICATORS_ENABLED, - false + false, ) } @@ -211,7 +211,7 @@ object KotlinUtils { DeviceConfig.getBoolean( DeviceConfig.NAMESPACE_PRIVACY, PROPERTY_PHOTO_PICKER_PROMPT_ENABLED, - true + true, ) } @@ -236,7 +236,7 @@ object KotlinUtils { DeviceConfig.getBoolean( DeviceConfig.NAMESPACE_PRIVACY, PERMISSION_RATIONALE_ENABLED, - true + true, ) } @@ -249,7 +249,7 @@ object KotlinUtils { DeviceConfig.getBoolean( DeviceConfig.NAMESPACE_PRIVACY, SAFETY_LABEL_CHANGE_NOTIFICATIONS_ENABLED, - true + true, ) && !DeviceUtils.isAuto(context) && !DeviceUtils.isTelevision(context) && @@ -262,7 +262,7 @@ object KotlinUtils { return DeviceConfig.getLong( DeviceConfig.NAMESPACE_PRIVACY, PROPERTY_SAFETY_LABEL_CHANGES_JOB_INTERVAL_MILLIS, - Duration.ofDays(30).toMillis() + Duration.ofDays(30).toMillis(), ) } @@ -278,7 +278,7 @@ object KotlinUtils { */ fun <K> getMapAndListDifferences( newValues: Collection<K>, - oldValues: Map<K, *> + oldValues: Map<K, *>, ): Pair<Set<K>, Set<K>> { val mapHas = oldValues.keys.toMutableSet() val listHas = newValues.toMutableSet() @@ -301,7 +301,7 @@ object KotlinUtils { fun sortPreferenceGroup( group: PreferenceGroup, compare: (lhs: Preference, rhs: Preference) -> Int, - hasHeader: Boolean + hasHeader: Boolean, ) { val preferences = mutableListOf<Preference>() for (i in 0 until group.preferenceCount) { @@ -369,7 +369,7 @@ object KotlinUtils { return groupInfo.loadSafeLabel( context.packageManager, 0f, - TextUtils.SAFE_STRING_FLAG_FIRST_LINE or TextUtils.SAFE_STRING_FLAG_TRIM + TextUtils.SAFE_STRING_FLAG_FIRST_LINE or TextUtils.SAFE_STRING_FLAG_TRIM, ) } @@ -407,7 +407,7 @@ object KotlinUtils { .loadSafeLabel( context.packageManager, 20000.toFloat(), - TextUtils.SAFE_STRING_FLAG_TRIM + TextUtils.SAFE_STRING_FLAG_TRIM, ) } catch (e: PackageManager.NameNotFoundException) { permName @@ -431,7 +431,7 @@ object KotlinUtils { Utils.applyTint( context, permInfo.loadUnbadgedIcon(context.packageManager), - android.R.attr.colorControlNormal + android.R.attr.colorControlNormal, ) } @@ -445,7 +445,7 @@ object KotlinUtils { Utils.applyTint( context, context.getDrawable(R.drawable.ic_perm_device_info), - android.R.attr.colorControlNormal + android.R.attr.colorControlNormal, ) } } @@ -461,7 +461,8 @@ object KotlinUtils { fun getPermInfoDescription(context: Context, permName: String): CharSequence { return try { val permInfo = context.packageManager.getPermissionInfo(permName, 0) - permInfo.loadDescription(context.packageManager) ?: "" + permInfo.loadDescription(context.packageManager) + ?: permInfo.loadLabel(context.packageManager) } catch (e: PackageManager.NameNotFoundException) { "" } @@ -511,7 +512,7 @@ object KotlinUtils { fun getBadgedPackageIconBitmap( application: Application, user: UserHandle, - packageName: String + packageName: String, ): Bitmap? { val drawable = getBadgedPackageIcon(application, packageName, user) @@ -547,7 +548,7 @@ object KotlinUtils { Bitmap.createBitmap( pkgIcon.intrinsicWidth, pkgIcon.intrinsicHeight, - Bitmap.Config.ARGB_8888 + Bitmap.Config.ARGB_8888, ) // Draw the icon so it can be displayed. val canvas = Canvas(pkgIconBmp) @@ -597,7 +598,7 @@ object KotlinUtils { activity: Activity, uid: Int, requestedPermissions: List<String>, - requestCode: Int + requestCode: Int, ) { // A clone profile doesn't have a MediaProvider. If the app's user is a clone profile, open // the photo picker in the parent profile @@ -653,7 +654,7 @@ object KotlinUtils { return opsManager.unsafeCheckOpNoThrow( OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED, uid, - packageName + packageName, ) == MODE_ALLOWED } return true @@ -692,7 +693,7 @@ object KotlinUtils { app: Application, group: LightAppPermGroup, vararg flags: Pair<Int, Boolean>, - filterPermissions: List<String> = group.permissions.keys.toList() + filterPermissions: List<String> = group.permissions.keys.toList(), ): LightAppPermGroup { var flagMask = 0 var flagsToSet = 0 @@ -718,7 +719,7 @@ object KotlinUtils { permName, group.packageName, group.userHandle, - *flags + *flags, ) } newPerms[permName] = @@ -727,7 +728,7 @@ object KotlinUtils { perm.permInfo, perm.isGranted, perm.flags or flagsToSet, - perm.foregroundPerms + perm.foregroundPerms, ) } return LightAppPermGroup( @@ -735,7 +736,8 @@ object KotlinUtils { group.permGroupInfo, newPerms, group.hasInstallToRuntimeSplit, - group.specialLocationGrant + group.specialLocationGrant, + group.specialFixedStorageGrant, ) } @@ -766,7 +768,7 @@ object KotlinUtils { isOneTime, userFixed, withoutAppOps, - filterPermissions + filterPermissions, ) } @@ -785,7 +787,7 @@ object KotlinUtils { fun grantBackgroundRuntimePermissions( app: Application, group: LightAppPermGroup, - filterPermissions: Collection<String> = group.permissions.keys + filterPermissions: Collection<String> = group.permissions.keys, ): LightAppPermGroup { return grantRuntimePermissions( app, @@ -794,7 +796,7 @@ object KotlinUtils { isOneTime = false, userFixed = false, withoutAppOps = false, - filterPermissions = filterPermissions + filterPermissions = filterPermissions, ) } @@ -806,7 +808,7 @@ object KotlinUtils { isOneTime: Boolean = false, userFixed: Boolean = false, withoutAppOps: Boolean = false, - filterPermissions: Collection<String> = group.permissions.keys + filterPermissions: Collection<String> = group.permissions.keys, ): LightAppPermGroup { val deviceId = group.deviceId val newPerms = group.permissions.toMutableMap() @@ -837,7 +839,7 @@ object KotlinUtils { group.packageInfo.packageName, PERMISSION_CONTROLLER_CHANGED_FLAG_MASK, permFlags, - user + user, ) } } @@ -846,7 +848,7 @@ object KotlinUtils { if (shouldKillForAnyPermission) { (app.getSystemService(ActivityManager::class.java) as ActivityManager).killUid( group.packageInfo.uid, - KILL_REASON_APP_OP_CHANGE + KILL_REASON_APP_OP_CHANGE, ) } val newGroup = @@ -855,7 +857,8 @@ object KotlinUtils { group.permGroupInfo, newPerms, group.hasInstallToRuntimeSplit, - group.specialLocationGrant + group.specialLocationGrant, + group.specialFixedStorageGrant, ) // If any permission in the group is one time granted, start one time permission session. if (newGroup.permissions.any { it.value.isOneTime && it.value.isGranted }) { @@ -867,7 +870,7 @@ object KotlinUtils { Utils.getOneTimePermissionsTimeout(), Utils.getOneTimePermissionsKilledDelay(false), ONE_TIME_PACKAGE_IMPORTANCE_LEVEL_TO_RESET_TIMER, - ONE_TIME_PACKAGE_IMPORTANCE_LEVEL_TO_KEEP_SESSION_ALIVE + ONE_TIME_PACKAGE_IMPORTANCE_LEVEL_TO_KEEP_SESSION_ALIVE, ) } else { context @@ -876,7 +879,7 @@ object KotlinUtils { group.packageName, Utils.getOneTimePermissionsTimeout(), ONE_TIME_PACKAGE_IMPORTANCE_LEVEL_TO_RESET_TIMER, - ONE_TIME_PACKAGE_IMPORTANCE_LEVEL_TO_KEEP_SESSION_ALIVE + ONE_TIME_PACKAGE_IMPORTANCE_LEVEL_TO_KEEP_SESSION_ALIVE, ) } } @@ -904,7 +907,7 @@ object KotlinUtils { group: LightAppPermGroup, isOneTime: Boolean, userFixed: Boolean = false, - withoutAppOps: Boolean = false + withoutAppOps: Boolean = false, ): Pair<LightPermission, Boolean> { val pkgInfo = group.packageInfo val user = UserHandle.getUserHandleForUid(pkgInfo.uid) @@ -942,7 +945,7 @@ object KotlinUtils { group.packageName, PERMISSION_CONTROLLER_CHANGED_FLAG_MASK, oldFlags, - user + user, ) // TODO: Update this method once AppOp is device aware disallowAppOp(app, perm, group) @@ -1018,7 +1021,7 @@ object KotlinUtils { group.packageInfo.packageName, PERMISSION_CONTROLLER_CHANGED_FLAG_MASK, newFlags, - user + user, ) } @@ -1047,7 +1050,7 @@ object KotlinUtils { userFixed: Boolean = false, oneTime: Boolean = false, forceRemoveRevokedCompat: Boolean = false, - filterPermissions: Collection<String> = group.permissions.keys + filterPermissions: Collection<String> = group.permissions.keys, ): LightAppPermGroup { return revokeRuntimePermissions( app, @@ -1056,7 +1059,7 @@ object KotlinUtils { userFixed, oneTime, forceRemoveRevokedCompat, - filterPermissions + filterPermissions, ) } @@ -1079,7 +1082,7 @@ object KotlinUtils { userFixed: Boolean = false, oneTime: Boolean = false, forceRemoveRevokedCompat: Boolean = false, - filterPermissions: Collection<String> = group.permissions.keys + filterPermissions: Collection<String> = group.permissions.keys, ): LightAppPermGroup { return revokeRuntimePermissions( app, @@ -1088,7 +1091,7 @@ object KotlinUtils { userFixed, oneTime, forceRemoveRevokedCompat, - filterPermissions + filterPermissions, ) } @@ -1100,7 +1103,7 @@ object KotlinUtils { userFixed: Boolean, oneTime: Boolean, forceRemoveRevokedCompat: Boolean = false, - filterPermissions: Collection<String> + filterPermissions: Collection<String>, ): LightAppPermGroup { val deviceId = group.deviceId val wasOneTime = group.isOneTime @@ -1117,7 +1120,7 @@ object KotlinUtils { userFixed, oneTime, forceRemoveRevokedCompat, - group + group, ) newPerms[newPerm.name] = newPerm shouldKillForAnyPermission = shouldKillForAnyPermission || shouldKill @@ -1127,7 +1130,7 @@ object KotlinUtils { if (shouldKillForAnyPermission && !shouldSkipKillForGroup(app, group)) { (app.getSystemService(ActivityManager::class.java) as ActivityManager).killUid( group.packageInfo.uid, - KILL_REASON_APP_OP_CHANGE + KILL_REASON_APP_OP_CHANGE, ) } @@ -1137,7 +1140,8 @@ object KotlinUtils { group.permGroupInfo, newPerms, group.hasInstallToRuntimeSplit, - group.specialLocationGrant + group.specialLocationGrant, + group.specialFixedStorageGrant, ) if (wasOneTime && !anyPermsOfPackageOneTimeGranted(app, newGroup.packageInfo, newGroup)) { @@ -1165,7 +1169,7 @@ object KotlinUtils { packageName: String, permissionGroupName: String, user: UserHandle, - postRevokeHandler: Runnable? + postRevokeHandler: Runnable?, ) { GlobalScope.launch(Dispatchers.Main) { val group = @@ -1192,7 +1196,7 @@ object KotlinUtils { private fun anyPermsOfPackageOneTimeGranted( app: Application, packageInfo: LightPackageInfo, - group: LightAppPermGroup? = null + group: LightAppPermGroup? = null, ): Boolean { val user = group?.userHandle ?: UserHandle.getUserHandleForUid(packageInfo.uid) if (group?.isOneTime == true) { @@ -1233,7 +1237,7 @@ object KotlinUtils { userFixed: Boolean, oneTime: Boolean, forceRemoveRevokedCompat: Boolean, - group: LightAppPermGroup + group: LightAppPermGroup, ): Pair<LightPermission, Boolean> { // Do not touch permissions fixed by the system. if (perm.isSystemFixed) { @@ -1259,14 +1263,14 @@ object KotlinUtils { !isPermissionSplitFromNonRuntime( app, perm.name, - group.packageInfo.targetSdkVersion + group.packageInfo.targetSdkVersion, ) ) { // Revoke the permission if needed. context.packageManager.revokeRuntimePermission( group.packageInfo.packageName, perm.name, - user + user, ) isGranted = false if (forceRemoveRevokedCompat) { @@ -1311,7 +1315,7 @@ object KotlinUtils { group.packageInfo.packageName, PERMISSION_CONTROLLER_CHANGED_FLAG_MASK, newFlags, - user + user, ) } @@ -1332,7 +1336,7 @@ object KotlinUtils { .cancelBackgroundAccessWarningNotification( group.packageInfo.packageName, user, - true + true, ) } } @@ -1372,7 +1376,7 @@ object KotlinUtils { private fun allowAppOp( app: Application, perm: LightPermission, - group: LightAppPermGroup + group: LightAppPermGroup, ): Boolean { val packageName = group.packageInfo.packageName val uid = group.packageInfo.uid @@ -1434,7 +1438,7 @@ object KotlinUtils { private fun disallowAppOp( app: Application, perm: LightPermission, - group: LightAppPermGroup + group: LightAppPermGroup, ): Boolean { val packageName = group.packageInfo.packageName val uid = group.packageInfo.uid @@ -1473,7 +1477,7 @@ object KotlinUtils { uid: Int, packageName: String, mode: Int, - manager: AppOpsManager + manager: AppOpsManager, ): Boolean { val currentMode = manager.unsafeCheckOpRaw(op, uid, packageName) if (currentMode == mode) { @@ -1492,7 +1496,7 @@ object KotlinUtils { app, POST_NOTIFICATIONS, group.packageName, - group.userHandle + group.userHandle, ) } @@ -1512,7 +1516,7 @@ object KotlinUtils { app: Application, permission: String, packageName: String, - user: UserHandle + user: UserHandle, ): Boolean { val userContext: Context = Utils.getUserContext(app, user) if ( @@ -1556,7 +1560,7 @@ object KotlinUtils { var resolveInfos = context.packageManager.queryIntentActivities( intentToResolve, - MATCH_DIRECT_BOOT_AWARE or MATCH_DIRECT_BOOT_UNAWARE + MATCH_DIRECT_BOOT_AWARE or MATCH_DIRECT_BOOT_UNAWARE, ) if (resolveInfos.size <= 0) { @@ -1566,7 +1570,7 @@ object KotlinUtils { resolveInfos = context.packageManager.queryIntentActivities( intentToResolve, - MATCH_DIRECT_BOOT_AWARE or MATCH_DIRECT_BOOT_UNAWARE + MATCH_DIRECT_BOOT_AWARE or MATCH_DIRECT_BOOT_UNAWARE, ) } return resolveInfos.size > 0 @@ -1582,14 +1586,14 @@ object KotlinUtils { fun setFlagsWhenLocationAccuracyChanged( app: Application, group: LightAppPermGroup, - isFineSelected: Boolean + isFineSelected: Boolean, ) { if (isFineSelected) { setGroupFlags( app, group, PackageManager.FLAG_PERMISSION_SELECTED_LOCATION_ACCURACY to true, - filterPermissions = listOf(ACCESS_FINE_LOCATION) + filterPermissions = listOf(ACCESS_FINE_LOCATION), ) val fineIsOneTime = group.permissions[Manifest.permission.ACCESS_FINE_LOCATION]?.isOneTime ?: false @@ -1598,20 +1602,20 @@ object KotlinUtils { group, PackageManager.FLAG_PERMISSION_SELECTED_LOCATION_ACCURACY to false, PackageManager.FLAG_PERMISSION_ONE_TIME to fineIsOneTime, - filterPermissions = listOf(Manifest.permission.ACCESS_COARSE_LOCATION) + filterPermissions = listOf(Manifest.permission.ACCESS_COARSE_LOCATION), ) } else { setGroupFlags( app, group, PackageManager.FLAG_PERMISSION_SELECTED_LOCATION_ACCURACY to false, - filterPermissions = listOf(ACCESS_FINE_LOCATION) + filterPermissions = listOf(ACCESS_FINE_LOCATION), ) setGroupFlags( app, group, PackageManager.FLAG_PERMISSION_SELECTED_LOCATION_ACCURACY to true, - filterPermissions = listOf(Manifest.permission.ACCESS_COARSE_LOCATION) + filterPermissions = listOf(Manifest.permission.ACCESS_COARSE_LOCATION), ) } } @@ -1629,7 +1633,7 @@ object KotlinUtils { DeviceConfig.getBoolean( DeviceConfig.NAMESPACE_PRIVACY, SAFETY_PROTECTION_RESOURCES_ENABLED, - false + false, ) && context .getResources() @@ -1658,7 +1662,7 @@ object KotlinUtils { fun getAppStoreIntent( context: Context, installerPackageName: String?, - packageName: String? + packageName: String?, ): Intent? { val intent: Intent = Intent(Intent.ACTION_SHOW_APP_INFO).setPackage(installerPackageName) val result: Intent? = resolveActivityForIntent(context, intent) @@ -1720,7 +1724,7 @@ object KotlinUtils { /** Get the [value][LiveData.getValue], suspending until [isInitialized] if not yet so */ suspend fun <T, LD : LiveData<T>> LD.getInitializedValue( observe: LD.(Observer<T?>) -> Unit = { observeForever(it) }, - isValueInitialized: LD.() -> Boolean = { value != null } + isValueInitialized: LD.() -> Boolean = { value != null }, ): T? { return if (isValueInitialized()) { value @@ -1754,7 +1758,7 @@ suspend fun <T, LD : LiveData<T>> LD.getInitializedValue( suspend inline fun <T, R> Iterable<T>.mapInParallel( context: CoroutineContext, scope: CoroutineScope = GlobalScope, - crossinline transform: suspend CoroutineScope.(T) -> R + crossinline transform: suspend CoroutineScope.(T) -> R, ): List<R> = map { scope.async(context) { transform(it) } }.map { it.await() } /** @@ -1765,7 +1769,7 @@ suspend inline fun <T, R> Iterable<T>.mapInParallel( suspend inline fun <T> Iterable<T>.forEachInParallel( context: CoroutineContext, scope: CoroutineScope = GlobalScope, - crossinline action: suspend CoroutineScope.(T) -> Unit + crossinline action: suspend CoroutineScope.(T) -> Unit, ) { mapInParallel(context, scope) { action(it) } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/LocationUtils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/LocationUtils.java index 3d1e44b6a..76ce9b273 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/LocationUtils.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/LocationUtils.java @@ -40,7 +40,6 @@ import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; import com.android.modules.utils.build.SdkLevel; -import com.android.permission.flags.Flags; import com.android.permissioncontroller.PermissionControllerApplication; import com.android.permissioncontroller.R; @@ -117,7 +116,7 @@ public class LocationUtils { /** Checks if the provided package is an automotive location bypass allowlisted package. */ public static boolean isAutomotiveLocationBypassAllowlistedPackage( Context context, String packageName) { - return SdkLevel.isAtLeastV() && Flags.addBannersToPrivacySensitiveAppsForAaos() + return SdkLevel.isAtLeastV() && getAutomotiveLocationBypassAllowlist(context).contains(packageName); } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/PermissionMapping.kt b/PermissionController/src/com/android/permissioncontroller/permission/utils/PermissionMapping.kt index a3446f802..1693b32d1 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/PermissionMapping.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/PermissionMapping.kt @@ -27,6 +27,7 @@ import android.util.Log import com.android.modules.utils.build.SdkLevel import com.android.permission.safetylabel.DataCategoryConstants import com.android.permissioncontroller.permission.model.livedatatypes.LightAppPermGroup +import com.android.permissioncontroller.permission.utils.v31.AdminRestrictedPermissionsUtils /** * This file contains the canonical mapping of permission to permission group, used in the @@ -44,7 +45,7 @@ object PermissionMapping { listOf( Manifest.permission_group.LOCATION, Manifest.permission_group.CAMERA, - Manifest.permission_group.MICROPHONE + Manifest.permission_group.MICROPHONE, ) @JvmField @@ -54,7 +55,7 @@ object PermissionMapping { listOf( Manifest.permission_group.STORAGE, Manifest.permission_group.READ_MEDIA_AURAL, - Manifest.permission_group.READ_MEDIA_VISUAL + Manifest.permission_group.READ_MEDIA_VISUAL, ) val PARTIAL_MEDIA_PERMISSIONS: MutableSet<String> = mutableSetOf() @@ -145,6 +146,24 @@ object PermissionMapping { PLATFORM_PERMISSIONS[Manifest.permission.RANGING] = Manifest.permission_group.NEARBY_DEVICES } + // Android XR permissions + if (android.xr.Flags.xrManifestEntries()) { + PLATFORM_PERMISSIONS[Manifest.permission.EYE_TRACKING_COARSE] = + Manifest.permission_group.XR_TRACKING + PLATFORM_PERMISSIONS[Manifest.permission.FACE_TRACKING] = + Manifest.permission_group.XR_TRACKING + PLATFORM_PERMISSIONS[Manifest.permission.HAND_TRACKING] = + Manifest.permission_group.XR_TRACKING + PLATFORM_PERMISSIONS[Manifest.permission.SCENE_UNDERSTANDING_COARSE] = + Manifest.permission_group.XR_TRACKING + + PLATFORM_PERMISSIONS[Manifest.permission.EYE_TRACKING_FINE] = + Manifest.permission_group.XR_TRACKING_SENSITIVE + PLATFORM_PERMISSIONS[Manifest.permission.HEAD_TRACKING] = + Manifest.permission_group.XR_TRACKING_SENSITIVE + PLATFORM_PERMISSIONS[Manifest.permission.SCENE_UNDERSTANDING_FINE] = + Manifest.permission_group.XR_TRACKING_SENSITIVE + } // Any updates to the permissions for the CALL_LOG permission group must also be made in // Permissions {@link com.android.role.controller.model.Permissions} in the role @@ -181,13 +200,18 @@ object PermissionMapping { Manifest.permission_group.CAMERA } - PLATFORM_PERMISSIONS[Manifest.permission.BODY_SENSORS] = Manifest.permission_group.SENSORS - if (SdkLevel.isAtLeastT()) { PLATFORM_PERMISSIONS[Manifest.permission.POST_NOTIFICATIONS] = Manifest.permission_group.NOTIFICATIONS - PLATFORM_PERMISSIONS[Manifest.permission.BODY_SENSORS_BACKGROUND] = + } + + if (!Flags.replaceBodySensorPermissionEnabled()) { + PLATFORM_PERMISSIONS[Manifest.permission.BODY_SENSORS] = Manifest.permission_group.SENSORS + if (SdkLevel.isAtLeastT()) { + PLATFORM_PERMISSIONS[Manifest.permission.BODY_SENSORS_BACKGROUND] = + Manifest.permission_group.SENSORS + } } for ((permission, permissionGroup) in PLATFORM_PERMISSIONS) { @@ -327,6 +351,9 @@ object PermissionMapping { PLATFORM_PERMISSIONS[permission] = HEALTH_PERMISSION_GROUP PLATFORM_PERMISSION_GROUPS[HEALTH_PERMISSION_GROUP]?.add(permission) HEALTH_PERMISSIONS_SET.add(permission) + if (Flags.replaceBodySensorPermissionEnabled()) { + AdminRestrictedPermissionsUtils.addAdminRestrictedPermission(permission) + } } } @@ -352,12 +379,6 @@ object PermissionMapping { } } - /** Returns true if the given permission is a health platform permission. */ - @JvmStatic - fun isHealthPermission(permissionName: String): Boolean { - return HEALTH_PERMISSIONS_SET.contains(permissionName) - } - /** * Returns the platform permission group for the permission that the provided op backs, if any. */ @@ -381,11 +402,7 @@ object PermissionMapping { if (opName == AppOpsManager.OPSTR_PHONE_CALL_CAMERA) { return Manifest.permission_group.CAMERA } - if ( - SdkLevel.isAtLeastV() && - Flags.locationBypassPrivacyDashboardEnabled() && - opName == AppOpsManager.OPSTR_EMERGENCY_LOCATION - ) { + if (SdkLevel.isAtLeastV() && opName == AppOpsManager.OPSTR_EMERGENCY_LOCATION) { return Manifest.permission_group.LOCATION } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java index 3d3b47272..149bc4efc 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java @@ -35,6 +35,7 @@ import static android.app.AppOpsManager.MODE_ALLOWED; import static android.app.AppOpsManager.OPSTR_LEGACY_STORAGE; import static android.content.Context.MODE_PRIVATE; import static android.content.Intent.EXTRA_PACKAGE_NAME; +import static android.content.Intent.EXTRA_REASON; import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT; import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT; import static android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT; @@ -77,6 +78,7 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.hardware.SensorPrivacyManager; import android.health.connect.HealthConnectManager; +import android.health.connect.HealthPermissions; import android.os.Binder; import android.os.Build; import android.os.Parcelable; @@ -113,6 +115,7 @@ import com.android.permissioncontroller.R; import com.android.permissioncontroller.permission.model.AppPermissionGroup; import com.android.permissioncontroller.permission.model.livedatatypes.LightAppPermGroup; import com.android.permissioncontroller.permission.model.livedatatypes.LightPackageInfo; +import com.android.settingslib.widget.SettingsThemeHelper; import kotlin.Triple; @@ -547,8 +550,14 @@ public final class Utils { if (group.equals(Manifest.permission_group.UNDEFINED)) { List<PermissionInfo> undefinedPerms = new ArrayList<>(); for (PermissionInfo permissionInfo : installedRuntime) { + if (Flags.replaceBodySensorPermissionEnabled() + && (permissionInfo.name.equals(Manifest.permission.BODY_SENSORS) || + permissionInfo.name.equals(Manifest.permission.BODY_SENSORS_BACKGROUND))) { + continue; + } + String permGroup = - PermissionMapping.getGroupOfPlatformPermission(permissionInfo.name); + PermissionMapping.getGroupOfPlatformPermission(permissionInfo.name); if (permGroup == null || permGroup.equals(Manifest.permission_group.UNDEFINED)) { undefinedPerms.add(permissionInfo); } @@ -1061,6 +1070,14 @@ public final class Utils { } /** + * Whether Expressive Design is enabled on this device. + */ + public static boolean isExpressiveDesignEnabled(@NonNull Context context) { + return SdkLevel.isAtLeastB() && DeviceUtils.isHandheld() + && SettingsThemeHelper.isExpressiveTheme(context); + } + + /** * Returns true if the group name passed is that of the Platform health group. * @param permGroupName name of the group that needs to be checked. */ @@ -1100,17 +1117,44 @@ public final class Utils { return false; } + // Only show Fitness&Wellness chip on Wear if the app is requesting system permissions. + if (Flags.replaceBodySensorPermissionEnabled() + && pm.hasSystemFeature(PackageManager.FEATURE_WATCH)) { + Set<String> requestedPermissions = new HashSet<>(packageInfo.getRequestedPermissions()); + for (PermissionInfo permission : permissions) { + if (!requestedPermissions.contains(permission.name)) { + continue; + } + String appOpStr = AppOpsManager.permissionToOp(permission.name); + if (appOpStr != null + && !appOpStr.equals(AppOpsManager.OPSTR_READ_WRITE_HEALTH_DATA)) { + // Found system health permission. Show the chip. + return true; + } + } + // No valid system permissions are requested. + return false; + } + // Check in permission is already granted as we should not hide it in the UX at that point. List<String> grantedPermissions = packageInfo.getGrantedPermissions(); for (PermissionInfo permission : permissions) { boolean isCurrentlyGranted = grantedPermissions.contains(permission.name); if (isCurrentlyGranted) { - Log.d(LOG_TAG, "At least one Health permission group permission is granted, " + Log.d( + LOG_TAG, + "At least one Health permission group permission is granted, " + "show permission group entry"); return true; } } + // When none health permission is granted, exempt health permission view usage intent filter + // if all the requested health permissions are from permission splits. + if (isRequestFromSplitHealthPermission(packageInfo)) { + return true; + } + Intent viewUsageIntent = new Intent(Intent.ACTION_VIEW_PERMISSION_USAGE); viewUsageIntent.addCategory(HealthConnectManager.CATEGORY_HEALTH_PERMISSIONS); viewUsageIntent.setPackage(packageInfo.getPackageName()); @@ -1125,6 +1169,55 @@ public final class Utils { } /** + * Returns true if the request is being made as the result of a split health permission from + * BODY_SENSORS call. + */ + @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.UPSIDE_DOWN_CAKE) + private static boolean isRequestFromSplitHealthPermission(LightPackageInfo packageInfo) { + // Sdk check to make sure HealthConnectManager.isHealthPermission() is supported. + if (!SdkLevel.isAtLeastU() || !Flags.replaceBodySensorPermissionEnabled()) { + return false; + } + + PermissionControllerApplication app = PermissionControllerApplication.get(); + PackageManager pm = app.getPackageManager(); + String packageName = packageInfo.getPackageName(); + UserHandle user = UserHandle.getUserHandleForUid(packageInfo.getUid()); + Context context = Utils.getUserContext(app, user); + + List<String> requestedHealthPermissions = new ArrayList<>(); + for (String permission : packageInfo.getRequestedPermissions()) { + if (HealthConnectManager.isHealthPermission(context, permission)) { + requestedHealthPermissions.add(permission); + } + } + + if (!isValidSplitHealthPermissions(requestedHealthPermissions)) { + return false; + } + + int targetSdk = packageInfo.getTargetSdkVersion(); + for (String perm : requestedHealthPermissions) { + if (!isFromSplitPermission(pm.getPermissionFlags(perm, packageName, user), targetSdk)) { + return false; + } + } + return true; + } + + private static boolean isValidSplitHealthPermissions(List<String> permissions) { + return (permissions.size() == 1 && permissions.contains(HealthPermissions.READ_HEART_RATE)) + || (permissions.size() == 2 && permissions.contains(HealthPermissions.READ_HEART_RATE) + && permissions.contains(HealthPermissions.READ_HEALTH_DATA_IN_BACKGROUND)); + } + + private static boolean isFromSplitPermission(int permissionFlag, int targetSdk) { + return (targetSdk >= Build.VERSION_CODES.M) + ? (permissionFlag & PackageManager.FLAG_PERMISSION_REVOKE_WHEN_REQUESTED) != 0 + : (permissionFlag & PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED) != 0; + } + + /** * Get a device protected storage based shared preferences. Avoid storing sensitive data in it. * * @param context the context to get the shared preferences @@ -1496,6 +1589,19 @@ public final class Utils { context.startActivity(healthConnectIntent); } + + /** + * Navigate to health connect settings Wear privacy dashboard. + * + * @param context The current Context + */ + public static void navigateToWearHealthConnectSettingsPrivacyDashboard( + @NonNull Context context) { + Intent privacyDashboardHealthConnectIntent = new Intent(ACTION_MANAGE_HEALTH_PERMISSIONS); + privacyDashboardHealthConnectIntent.putExtra(EXTRA_REASON, "privacy_dashboard"); + context.startActivity(privacyDashboardHealthConnectIntent); + } + /** * Navigate to health connect settings for an app * @param context The current Context diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/v31/AdminRestrictedPermissionsUtils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/v31/AdminRestrictedPermissionsUtils.java index 4fde616e3..a3b885752 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/v31/AdminRestrictedPermissionsUtils.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/v31/AdminRestrictedPermissionsUtils.java @@ -54,6 +54,12 @@ public final class AdminRestrictedPermissionsUtils { if (SdkLevel.isAtLeastT()) { ADMIN_RESTRICTED_SENSORS_PERMISSIONS.add(Manifest.permission.BODY_SENSORS_BACKGROUND); } + + } + + /** Adds a new permission to the list of admin restricted permissions. */ + public static void addAdminRestrictedPermission(String permission) { + ADMIN_RESTRICTED_SENSORS_PERMISSIONS.add(permission); } /** @@ -91,7 +97,6 @@ public final class AdminRestrictedPermissionsUtils { boolean isAdminRestrictedSensorPermissionGroup = permissionGroup != null && PermissionMapping.getPlatformPermissionNamesOfGroup(permissionGroup).stream() .anyMatch(ADMIN_RESTRICTED_SENSORS_PERMISSIONS::contains); - if (!ADMIN_RESTRICTED_SENSORS_PERMISSIONS.contains(permission) && !isAdminRestrictedSensorPermissionGroup) { return true; diff --git a/PermissionController/src/com/android/permissioncontroller/role/Role.md b/PermissionController/src/com/android/permissioncontroller/role/Role.md index 255214495..29a184190 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/Role.md +++ b/PermissionController/src/com/android/permissioncontroller/role/Role.md @@ -55,7 +55,13 @@ apps, separated by a colon (`:`) with the package name, for instance receive short text messages, photos, videos, and more". For default apps, this string will appear in the default app detail page as a footer. This attribute is required if the role is `visible`. - `exclusive`: Whether the role is exclusive. If a role is exclusive, at most one application is -allowed to be its holder. +allowed to be its holder. This attribute is being deprecated and `exclusivity` should be used. +- `exclusivity`: Whether the role is exclusive and what type of exclusivity behavior it has. A role +can have exclusivity of `none`, `user`, or `profileGroup`. + - `none`: Role allows multiple holders + - `user`: Role allows at most one holder within each user + - `profileGroup`: (SDK 36+ only, falls back to `user` on lower SDK) Role allows at most one holder +within a profile group (e.g. full user and work profile) - `fallBackToDefaultHolder`: Whether the role should fall back to the default holder. This attribute is optional and defaults to `false`. - `featureFlag`: Optional feature flag for the role be available, as the fully qualified name of diff --git a/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING index 46b148e68..83b513c04 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING @@ -7,6 +7,9 @@ "exclude-annotation": "androidx.test.filters.FlakyTest" } ] + }, + { + "name": "CtsRoleMultiUserTestCases" } ], "mainline-presubmit": [ @@ -24,6 +27,9 @@ "exclude-annotation": "androidx.test.filters.FlakyTest" } ] + }, + { + "name": "CtsRoleMultiUserTestCases[com.google.android.permission.apex]" } ], "permission-mainline-presubmit": [ @@ -41,11 +47,17 @@ "exclude-annotation": "androidx.test.filters.FlakyTest" } ] + }, + { + "name": "CtsRoleMultiUserTestCases" } ], "postsubmit": [ { "name": "CtsRoleTestCases" + }, + { + "name": "CtsRoleMultiUserTestCases" } ], "mainline-postsubmit": [ @@ -60,6 +72,9 @@ "exclude-filter": "android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenPermissionIsRevoked" } ] + }, + { + "name": "CtsRoleMultiUserTestCases[com.google.android.permission.apex]" } ] } diff --git a/PermissionController/src/com/android/permissioncontroller/role/UserPackage.java b/PermissionController/src/com/android/permissioncontroller/role/UserPackage.java new file mode 100644 index 000000000..29f6904ea --- /dev/null +++ b/PermissionController/src/com/android/permissioncontroller/role/UserPackage.java @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2024 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.permissioncontroller.role; + +import android.content.pm.ApplicationInfo; +import android.os.Parcel; +import android.os.Parcelable; +import android.os.UserHandle; + +import androidx.annotation.NonNull; +import androidx.core.os.ParcelCompat; + +import java.util.Objects; + +/** + * Data class storing a {@link UserHandle} and a package name. + */ +public class UserPackage implements Parcelable { + @NonNull + public final UserHandle user; + @NonNull + public final String packageName; + + private UserPackage(@NonNull UserHandle user, @NonNull String packageName) { + this.user = user; + this.packageName = packageName; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj instanceof UserPackage) { + UserPackage other = (UserPackage) obj; + return Objects.equals(user, other.user) + && Objects.equals(packageName, other.packageName); + } + return false; + } + + @Override + public int hashCode() { + return Objects.hash(user, packageName); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(@NonNull Parcel out, int flags) { + out.writeParcelable(user, 0); + out.writeString(packageName); + } + + public static final Parcelable.Creator<UserPackage> CREATOR = + new Parcelable.Creator<>() { + @Override + public UserPackage createFromParcel(Parcel in) { + UserHandle user = + ParcelCompat.readParcelable( + in, UserHandle.class.getClassLoader(), UserHandle.class); + String packageName = in.readString(); + if (user == null || packageName == null) { + return null; + } + return UserPackage.of(user, packageName); + } + + @Override + public UserPackage[] newArray(int size) { + return new UserPackage[size]; + } + }; + + /** Returns a {@link UserPackage} represented by the specified user and package name */ + @NonNull + public static UserPackage of(@NonNull UserHandle user, @NonNull String packageName) { + return new UserPackage(user, packageName); + } + + /** Returns a {@link UserPackage} using user and package name from an {@link ApplicationInfo} */ + @NonNull + public static UserPackage from(@NonNull ApplicationInfo applicationInfo) { + return new UserPackage( + UserHandle.getUserHandleForUid(applicationInfo.uid), applicationInfo.packageName); + } +} diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppChildFragment.java b/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppChildFragment.java index 2f515f02c..36d9cc3a0 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppChildFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppChildFragment.java @@ -16,6 +16,8 @@ package com.android.permissioncontroller.role.ui; +import static com.android.permissioncontroller.PermissionControllerStatsLog.ROLE_SETTINGS_FRAGMENT_ACTION_REPORTED; + import android.app.Activity; import android.app.role.RoleManager; import android.content.Context; @@ -23,9 +25,9 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.os.Process; import android.os.UserHandle; import android.util.ArrayMap; -import android.util.Pair; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -33,12 +35,16 @@ import androidx.appcompat.content.res.AppCompatResources; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; import com.android.modules.utils.build.SdkLevel; +import com.android.permission.flags.Flags; +import com.android.permissioncontroller.PermissionControllerStatsLog; import com.android.permissioncontroller.R; import com.android.permissioncontroller.permission.utils.Utils; import com.android.permissioncontroller.role.utils.PackageUtils; @@ -46,6 +52,7 @@ import com.android.permissioncontroller.role.utils.RoleUiBehaviorUtils; import com.android.permissioncontroller.role.utils.SettingsCompat; import com.android.role.controller.model.Role; import com.android.role.controller.model.Roles; +import com.android.settingslib.utils.applications.AppUtils; import java.util.List; import java.util.Objects; @@ -63,12 +70,20 @@ public class DefaultAppChildFragment<PF extends PreferenceFragmentCompat implements DefaultAppConfirmationDialogFragment.Listener, Preference.OnPreferenceClickListener { + private static final String PREFERENCE_KEY_RECOMMENDED_CATEGORY = + DefaultAppChildFragment.class.getName() + ".preference.RECOMMENDED_CATEGORY"; + private static final String PREFERENCE_KEY_OTHERS_CATEGORY = + DefaultAppChildFragment.class.getName() + ".preference.OTHERS_CATEGORY"; private static final String PREFERENCE_KEY_NONE = DefaultAppChildFragment.class.getName() + ".preference.NONE"; private static final String PREFERENCE_KEY_DESCRIPTION = DefaultAppChildFragment.class.getName() + ".preference.DESCRIPTION"; private static final String PREFERENCE_KEY_OTHER_NFC_SERVICES = DefaultAppChildFragment.class.getName() + ".preference.OTHER_NFC_SERVICES"; + private static final String PREFERENCE_EXTRA_PACKAGE_NAME = + DefaultAppChildFragment.class.getName() + ".extra.PACKAGE_NAME"; + private static final String PREFERENCE_EXTRA_UID = DefaultAppChildFragment.class.getName() + + ".extra.UID"; @NonNull private String mRoleName; @@ -121,52 +136,65 @@ public class DefaultAppChildFragment<PF extends PreferenceFragmentCompat ViewModelProvider.Factory viewModelFactory = new DefaultAppViewModel.Factory(mRole, mUser, activity.getApplication()); mViewModel = new ViewModelProvider(this, viewModelFactory).get(DefaultAppViewModel.class); - mViewModel.getRoleLiveData().observe(this, this::onRoleChanged); + mViewModel.getRecommendedLiveData().observe(this, + applicationItems -> onApplicationListChanged()); + mViewModel.getLiveData().observe(this, applicationItems -> onApplicationListChanged()); mViewModel.getManageRoleHolderStateLiveData().observe(this, this::onManageRoleHolderStateChanged); } - private void onRoleChanged( - @NonNull List<Pair<ApplicationInfo, Boolean>> qualifyingApplications) { + private void onApplicationListChanged() { + List<RoleApplicationItem> recommendedApplicationItems = + mViewModel.getRecommendedLiveData().getValue(); + if (recommendedApplicationItems == null) { + return; + } + List<RoleApplicationItem> otherApplicationItems = mViewModel.getLiveData().getValue(); + if (otherApplicationItems == null) { + return; + } + PF preferenceFragment = requirePreferenceFragment(); PreferenceManager preferenceManager = preferenceFragment.getPreferenceManager(); Context context = preferenceManager.getContext(); PreferenceScreen preferenceScreen = preferenceFragment.getPreferenceScreen(); - Preference oldDescriptionPreference = null; + PreferenceCategory oldRecommendedPreferenceCategory = null; + PreferenceCategory oldOthersPreferenceCategory = null; ArrayMap<String, Preference> oldPreferences = new ArrayMap<>(); if (preferenceScreen == null) { preferenceScreen = preferenceManager.createPreferenceScreen(context); preferenceFragment.setPreferenceScreen(preferenceScreen); } else { - for (int i = preferenceScreen.getPreferenceCount() - 1; i >= 0; --i) { - Preference preference = preferenceScreen.getPreference(i); - - preferenceScreen.removePreference(preference); - preference.setOrder(Preference.DEFAULT_ORDER); - oldPreferences.put(preference.getKey(), preference); + if (Flags.defaultAppsRecommendationEnabled()) { + oldRecommendedPreferenceCategory = + preferenceScreen.findPreference(PREFERENCE_KEY_RECOMMENDED_CATEGORY); + clearPreferenceCategory(oldRecommendedPreferenceCategory, oldPreferences); + oldOthersPreferenceCategory = + preferenceScreen.findPreference(PREFERENCE_KEY_OTHERS_CATEGORY); + clearPreferenceCategory(oldOthersPreferenceCategory, oldPreferences); } + clearPreferences(preferenceScreen, oldPreferences); } - if (mRole.shouldShowNone()) { - Drawable icon = AppCompatResources.getDrawable(context, R.drawable.ic_remove_circle); - String title = getString(R.string.default_app_none); - boolean noHolderApplication = !hasHolderApplication(qualifyingApplications); - addPreference(PREFERENCE_KEY_NONE, icon, title, noHolderApplication, null, - oldPreferences, preferenceScreen, context); - } - - int qualifyingApplicationsSize = qualifyingApplications.size(); - for (int i = 0; i < qualifyingApplicationsSize; i++) { - Pair<ApplicationInfo, Boolean> qualifyingApplication = qualifyingApplications.get(i); - ApplicationInfo qualifyingApplicationInfo = qualifyingApplication.first; - boolean isHolderApplication = qualifyingApplication.second; - - String key = qualifyingApplicationInfo.packageName; - Drawable icon = Utils.getBadgedIcon(context, qualifyingApplicationInfo); - String title = Utils.getFullAppLabel(qualifyingApplicationInfo, context); - addPreference(key, icon, title, isHolderApplication, qualifyingApplicationInfo, - oldPreferences, preferenceScreen, context); + if (Flags.defaultAppsRecommendationEnabled() && !recommendedApplicationItems.isEmpty()) { + addApplicationPreferenceCategory(oldRecommendedPreferenceCategory, + PREFERENCE_KEY_RECOMMENDED_CATEGORY, + getString(R.string.default_app_recommended), preferenceScreen, false, false, + recommendedApplicationItems, oldPreferences, context); + if (mRole.shouldShowNone() || !otherApplicationItems.isEmpty()) { + boolean noneChecked = !(hasHolderApplication(recommendedApplicationItems) + || hasHolderApplication(otherApplicationItems)); + addApplicationPreferenceCategory(oldOthersPreferenceCategory, + PREFERENCE_KEY_OTHERS_CATEGORY, getString(R.string.default_app_others), + preferenceScreen, true, noneChecked, otherApplicationItems, oldPreferences, + context); + } + } else { + boolean noneChecked = !hasHolderApplication(otherApplicationItems); + addNonePreferenceIfNeeded(preferenceScreen, noneChecked, oldPreferences, context); + addApplicationPreferences(preferenceScreen, otherApplicationItems, oldPreferences, + context); } addNonPaymentNfcServicesPreference(preferenceScreen, oldPreferences, context); @@ -175,24 +203,93 @@ public class DefaultAppChildFragment<PF extends PreferenceFragmentCompat preferenceFragment.onPreferenceScreenChanged(); } - private static boolean hasHolderApplication( - @NonNull List<Pair<ApplicationInfo, Boolean>> qualifyingApplications) { - int qualifyingApplicationsSize = qualifyingApplications.size(); - for (int i = 0; i < qualifyingApplicationsSize; i++) { - Pair<ApplicationInfo, Boolean> qualifyingApplication = qualifyingApplications.get(i); - boolean isHolderApplication = qualifyingApplication.second; + private static void clearPreferenceCategory(@Nullable PreferenceCategory preferenceCategory, + @NonNull ArrayMap<String, Preference> oldPreferences) { + if (preferenceCategory == null) { + return; + } + clearPreferences(preferenceCategory, oldPreferences); + preferenceCategory.getParent().removePreference(preferenceCategory); + preferenceCategory.setOrder(Preference.DEFAULT_ORDER); + } + + private static void clearPreferences(@NonNull PreferenceGroup preferenceGroup, + @NonNull ArrayMap<String, Preference> oldPreferences) { + for (int i = preferenceGroup.getPreferenceCount() - 1; i >= 0; --i) { + Preference preference = preferenceGroup.getPreference(i); - if (isHolderApplication) { + preferenceGroup.removePreference(preference); + preference.setOrder(Preference.DEFAULT_ORDER); + oldPreferences.put(preference.getKey(), preference); + } + } + + private void addApplicationPreferenceCategory( + @Nullable PreferenceCategory oldPreferenceCategory, @NonNull String key, + @Nullable String title, @NonNull PreferenceScreen preferenceScreen, + boolean addNonePreferenceIfNeeded, boolean noneChecked, + @NonNull List<RoleApplicationItem> applicationItems, + @NonNull ArrayMap<String, Preference> oldPreferences, @NonNull Context context) { + PreferenceCategory preferenceCategory = oldPreferenceCategory; + if (preferenceCategory == null) { + preferenceCategory = new PreferenceCategory(context); + preferenceCategory.setKey(key); + preferenceCategory.setTitle(title); + } + preferenceScreen.addPreference(preferenceCategory); + if (addNonePreferenceIfNeeded) { + addNonePreferenceIfNeeded(preferenceCategory, noneChecked, oldPreferences, context); + } + addApplicationPreferences(preferenceCategory, applicationItems, oldPreferences, context); + } + + private static boolean hasHolderApplication( + @NonNull List<RoleApplicationItem> applicationItems) { + int applicationItemsSize = applicationItems.size(); + for (int i = 0; i < applicationItemsSize; i++) { + RoleApplicationItem applicationItem = applicationItems.get(i); + if (applicationItem.isHolderApplication()) { return true; } } return false; } - private void addPreference(@NonNull String key, @NonNull Drawable icon, - @NonNull CharSequence title, boolean checked, @Nullable ApplicationInfo applicationInfo, - @NonNull ArrayMap<String, Preference> oldPreferences, - @NonNull PreferenceScreen preferenceScreen, @NonNull Context context) { + private void addNonePreferenceIfNeeded(@NonNull PreferenceGroup preferenceGroup, + boolean checked, @NonNull ArrayMap<String, Preference> oldPreferences, + @NonNull Context context) { + if (!mRole.shouldShowNone()) { + return; + } + + Drawable icon = AppCompatResources.getDrawable(context, R.drawable.ic_remove_circle); + String title = getString(R.string.default_app_none); + addApplicationPreference(preferenceGroup, PREFERENCE_KEY_NONE, icon, title, checked, null, + oldPreferences, context); + } + + private void addApplicationPreferences(@NonNull PreferenceGroup preferenceGroup, + @NonNull List<RoleApplicationItem> applicationItems, + @NonNull ArrayMap<String, Preference> oldPreferences, @NonNull Context context) { + int applicationItemsSize = applicationItems.size(); + for (int i = 0; i < applicationItemsSize; i++) { + RoleApplicationItem applicationItem = applicationItems.get(i); + ApplicationInfo applicationInfo = applicationItem.getApplicationInfo(); + int userId = UserHandle.getUserHandleForUid(applicationInfo.uid).getIdentifier(); + String key = applicationInfo.packageName + "@" + userId; + Drawable icon = Utils.getBadgedIcon(context, applicationInfo); + String title = Utils.getFullAppLabel(applicationInfo, context); + boolean isHolderApplication = applicationItem.isHolderApplication(); + + addApplicationPreference(preferenceGroup, key, icon, title, isHolderApplication, + applicationInfo, oldPreferences, context); + } + } + + private void addApplicationPreference(@NonNull PreferenceGroup preferenceGroup, + @NonNull String key, @NonNull Drawable icon, @NonNull CharSequence title, + boolean checked, @Nullable ApplicationInfo applicationInfo, + @NonNull ArrayMap<String, Preference> oldPreferences, @NonNull Context context) { RoleApplicationPreference roleApplicationPreference = (RoleApplicationPreference) oldPreferences.get(key); TwoStatePreference preference; @@ -205,19 +302,33 @@ public class DefaultAppChildFragment<PF extends PreferenceFragmentCompat preference.setPersistent(false); preference.setOnPreferenceChangeListener((preference2, newValue) -> false); preference.setOnPreferenceClickListener(this); + // In the cases we need this (see #onPreferenceClick()), this should never be null. + // This method (addPreference) is used for both legitimate apps and the `NONE` item, + // the `NONE` item passes a null applicationinfo object. NFC uses a different preference + // method for adding, and a different onclick method + if (applicationInfo != null) { + UserHandle user = UserHandle.getUserHandleForUid(applicationInfo.uid); + roleApplicationPreference.setContentDescription( + AppUtils.getAppContentDescription( + context, applicationInfo.packageName, user.getIdentifier())); + Bundle extras = preference.getExtras(); + extras.putString(PREFERENCE_EXTRA_PACKAGE_NAME, applicationInfo.packageName); + extras.putInt(PREFERENCE_EXTRA_UID, applicationInfo.uid); + } } else { preference = roleApplicationPreference.asTwoStatePreference(); } preference.setChecked(checked); if (applicationInfo != null) { + UserHandle user = UserHandle.getUserHandleForUid(applicationInfo.uid); roleApplicationPreference.setRestrictionIntent( - mRole.getApplicationRestrictionIntentAsUser(applicationInfo, mUser, context)); + mRole.getApplicationRestrictionIntentAsUser(applicationInfo, user, context)); RoleUiBehaviorUtils.prepareApplicationPreferenceAsUser(mRole, roleApplicationPreference, - applicationInfo, mUser, context); + applicationInfo, user, context); } - preferenceScreen.addPreference(preference); + preferenceGroup.addPreference(preference); } private void onManageRoleHolderStateChanged(int state) { @@ -241,24 +352,31 @@ public class DefaultAppChildFragment<PF extends PreferenceFragmentCompat public boolean onPreferenceClick(@NonNull Preference preference) { String key = preference.getKey(); if (Objects.equals(key, PREFERENCE_KEY_NONE)) { + PermissionControllerStatsLog.write( + ROLE_SETTINGS_FRAGMENT_ACTION_REPORTED, Process.INVALID_UID, null, mRoleName); mViewModel.setNoneDefaultApp(); } else { - String packageName = key; + String packageName = + preference.getExtras().getString(PREFERENCE_EXTRA_PACKAGE_NAME); + int uid = preference.getExtras().getInt(PREFERENCE_EXTRA_UID); CharSequence confirmationMessage = RoleUiBehaviorUtils.getConfirmationMessage(mRole, packageName, requireContext()); if (confirmationMessage != null) { - DefaultAppConfirmationDialogFragment.show(packageName, confirmationMessage, this); + DefaultAppConfirmationDialogFragment.show(packageName, uid, confirmationMessage, + this); } else { - setDefaultApp(packageName); + setDefaultApp(packageName, uid); } } return true; } @Override - public void setDefaultApp(@NonNull String packageName) { - mViewModel.setDefaultApp(packageName); + public void setDefaultApp(@NonNull String packageName, int uid) { + PermissionControllerStatsLog.write( + ROLE_SETTINGS_FRAGMENT_ACTION_REPORTED, uid, packageName, mRoleName); + mViewModel.setDefaultApp(packageName, UserHandle.getUserHandleForUid(uid)); } private void addNonPaymentNfcServicesPreference(@NonNull PreferenceScreen preferenceScreen, diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppConfirmationDialogFragment.java b/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppConfirmationDialogFragment.java index 843854bf4..9a9606291 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppConfirmationDialogFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppConfirmationDialogFragment.java @@ -32,24 +32,27 @@ import androidx.fragment.app.Fragment; public class DefaultAppConfirmationDialogFragment extends DialogFragment { private String mPackageName; + private int mUid; private CharSequence mMessage; /** * Create a new instance of this fragment. * * @param packageName the package name of the application + * @param uid the UID the specified package is running in * @param message the confirmation message * * @return a new instance of this fragment * - * @see #show(String, CharSequence, Fragment) + * @see #show(String, int, CharSequence, Fragment) */ @NonNull public static DefaultAppConfirmationDialogFragment newInstance(@NonNull String packageName, - @NonNull CharSequence message) { + int uid, @NonNull CharSequence message) { DefaultAppConfirmationDialogFragment fragment = new DefaultAppConfirmationDialogFragment(); Bundle arguments = new Bundle(); arguments.putString(Intent.EXTRA_PACKAGE_NAME, packageName); + arguments.putInt(Intent.EXTRA_UID, uid); arguments.putCharSequence(Intent.EXTRA_TEXT, message); fragment.setArguments(arguments); return fragment; @@ -59,14 +62,15 @@ public class DefaultAppConfirmationDialogFragment extends DialogFragment { * Show a new instance of this fragment. * * @param packageName the package name of the application + * @param uid the UID the specified package is running in * @param message the confirmation message * @param fragment the parent fragment * - * @see #newInstance(String, CharSequence) + * @see #newInstance(String, int, CharSequence) */ - public static void show(@NonNull String packageName, @NonNull CharSequence message, - @NonNull Fragment fragment) { - newInstance(packageName, message).show(fragment.getChildFragmentManager(), null); + public static void show(@NonNull String packageName, int uid, + @NonNull CharSequence message, @NonNull Fragment fragment) { + newInstance(packageName, uid, message).show(fragment.getChildFragmentManager(), null); } @Override @@ -75,6 +79,7 @@ public class DefaultAppConfirmationDialogFragment extends DialogFragment { Bundle arguments = getArguments(); mPackageName = arguments.getString(Intent.EXTRA_PACKAGE_NAME); + mUid = arguments.getInt(Intent.EXTRA_UID); mMessage = arguments.getCharSequence(Intent.EXTRA_TEXT); } @@ -90,7 +95,7 @@ public class DefaultAppConfirmationDialogFragment extends DialogFragment { private void onOk() { Listener listener = (Listener) getParentFragment(); - listener.setDefaultApp(mPackageName); + listener.setDefaultApp(mPackageName, mUid); } /** @@ -103,6 +108,6 @@ public class DefaultAppConfirmationDialogFragment extends DialogFragment { * * @param packageName the package name of the application */ - void setDefaultApp(@NonNull String packageName); + void setDefaultApp(@NonNull String packageName, int uid); } } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppListChildFragment.java b/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppListChildFragment.java index 48472bc5e..fd91d0d3b 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppListChildFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppListChildFragment.java @@ -40,10 +40,12 @@ import androidx.preference.PreferenceScreen; import com.android.modules.utils.build.SdkLevel; import com.android.permissioncontroller.R; import com.android.permissioncontroller.permission.utils.Utils; +import com.android.permissioncontroller.role.UserPackage; import com.android.permissioncontroller.role.utils.PackageUtils; import com.android.permissioncontroller.role.utils.RoleUiBehaviorUtils; import com.android.role.controller.model.Role; import com.android.role.controller.model.Roles; +import com.android.settingslib.utils.applications.AppUtils; import java.util.List; @@ -131,18 +133,16 @@ public class DefaultAppListChildFragment<PF extends PreferenceFragmentCompat } else { oldWorkPreferenceCategory = preferenceScreen.findPreference(PREFERENCE_KEY_WORK_CATEGORY); - clearPreferenceCategory( - oldWorkPreferenceCategory, preferenceScreen, oldWorkPreferences); + clearPreferenceCategory(oldWorkPreferenceCategory, oldWorkPreferences); oldPrivatePreferenceCategory = preferenceScreen.findPreference(PREFERENCE_KEY_PRIVATE_CATEGORY); - clearPreferenceCategory( - oldPrivatePreferenceCategory, preferenceScreen, oldPrivatePreferences); + clearPreferenceCategory(oldPrivatePreferenceCategory, oldPrivatePreferences); clearPreferences(preferenceScreen, oldPreferences); } - addPreferences(preferenceScreen, roleItems, oldPreferences, this, mViewModel.getUser(), + addRolePreferences(preferenceScreen, roleItems, oldPreferences, this, mViewModel.getUser(), context); addMoreDefaultAppsPreference(preferenceScreen, oldPreferences, context); addManageDomainUrlsPreference(preferenceScreen, oldPreferences, context); @@ -155,7 +155,7 @@ public class DefaultAppListChildFragment<PF extends PreferenceFragmentCompat } String workTitle = Utils.getEnterpriseString(context, DefaultAppSettings.WORK_PROFILE_DEFAULT_APPS_TITLE, defaultWorkTitle); - addPreferenceCategory(oldWorkPreferenceCategory, PREFERENCE_KEY_WORK_CATEGORY, + addRolePreferenceCategory(oldWorkPreferenceCategory, PREFERENCE_KEY_WORK_CATEGORY, workTitle, preferenceScreen, workRoleItems, oldWorkPreferences, this, mViewModel.getWorkProfile(), context); } @@ -166,22 +166,22 @@ public class DefaultAppListChildFragment<PF extends PreferenceFragmentCompat } else { privateTitle = context.getString(R.string.default_apps_for_private_profile); } - addPreferenceCategory(oldPrivatePreferenceCategory, PREFERENCE_KEY_PRIVATE_CATEGORY, - privateTitle, preferenceScreen, privateRoleItems, oldPrivatePreferences, this, - mViewModel.getPrivateProfile(), context); + addRolePreferenceCategory(oldPrivatePreferenceCategory, + PREFERENCE_KEY_PRIVATE_CATEGORY, privateTitle, preferenceScreen, + privateRoleItems, oldPrivatePreferences, this, mViewModel.getPrivateProfile(), + context); } preferenceFragment.onPreferenceScreenChanged(); } private static void clearPreferenceCategory(@Nullable PreferenceCategory preferenceCategory, - @NonNull PreferenceScreen preferenceScreen, @NonNull ArrayMap<String, Preference> oldPreferences) { if (preferenceCategory == null) { return; } clearPreferences(preferenceCategory, oldPreferences); - preferenceScreen.removePreference(preferenceCategory); + preferenceCategory.getParent().removePreference(preferenceCategory); preferenceCategory.setOrder(Preference.DEFAULT_ORDER); } @@ -197,7 +197,7 @@ public class DefaultAppListChildFragment<PF extends PreferenceFragmentCompat } @NonNull - private void addPreferenceCategory( + private void addRolePreferenceCategory( @Nullable PreferenceCategory oldPreferenceCategory, @NonNull String key, @Nullable String title, @NonNull PreferenceScreen preferenceScreen, @NonNull List<RoleItem> roleItems, @NonNull ArrayMap<String, Preference> oldPreferences, @@ -210,11 +210,10 @@ public class DefaultAppListChildFragment<PF extends PreferenceFragmentCompat preferenceCategory.setTitle(title); } preferenceScreen.addPreference(preferenceCategory); - addPreferences(preferenceCategory, roleItems, oldPreferences, listener, - user, context); + addRolePreferences(preferenceCategory, roleItems, oldPreferences, listener, user, context); } - private void addPreferences(@NonNull PreferenceGroup preferenceGroup, + private void addRolePreferences(@NonNull PreferenceGroup preferenceGroup, @NonNull List<RoleItem> roleItems, @NonNull ArrayMap<String, Preference> oldPreferences, @NonNull Preference.OnPreferenceClickListener listener, @NonNull UserHandle user, @NonNull Context context) { @@ -244,10 +243,16 @@ public class DefaultAppListChildFragment<PF extends PreferenceFragmentCompat if (holderApplicationInfos.isEmpty()) { preference.setIcon(null); preference.setSummary(R.string.default_app_none); + rolePreference.setSummaryContentDescription(null); } else { ApplicationInfo holderApplicationInfo = holderApplicationInfos.get(0); preference.setIcon(Utils.getBadgedIcon(context, holderApplicationInfo)); preference.setSummary(Utils.getAppLabel(holderApplicationInfo, context)); + UserPackage userPackage = UserPackage.from(holderApplicationInfo); + rolePreference.setSummaryContentDescription( + AppUtils.getAppContentDescription(context, + userPackage.packageName, + userPackage.user.getIdentifier())); } RoleUiBehaviorUtils.preparePreferenceAsUser(role, holderApplicationInfos, rolePreference, user, context); diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppListViewModel.java b/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppListViewModel.java index 5bc25df54..4a280bd58 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppListViewModel.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppListViewModel.java @@ -28,10 +28,15 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.Transformations; import androidx.lifecycle.ViewModel; +import com.android.permission.flags.Flags; import com.android.permissioncontroller.permission.utils.Utils; import com.android.permissioncontroller.role.utils.UserUtils; +import com.android.role.controller.model.Role; +import com.android.role.controller.util.RoleFlags; import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; /** * {@link ViewModel} for the list of default apps. @@ -55,14 +60,54 @@ public class DefaultAppListViewModel extends AndroidViewModel { super(application); mUser = Process.myUserHandle(); + UserHandle profileParent = UserUtils.getProfileParentOrSelf(mUser, application); + UserHandle workProfile = UserUtils.getWorkProfileOrSelf(application); + boolean isProfileParent = Objects.equals(mUser, profileParent); + boolean isWorkProfile = Objects.equals(mUser, workProfile); + RoleListLiveData liveData = new RoleListLiveData(true, mUser, application); RoleListSortFunction sortFunction = new RoleListSortFunction(application); - mLiveData = Transformations.map(new RoleListLiveData(true, mUser, application), - sortFunction); - mWorkProfile = UserUtils.getWorkProfile(application); - mWorkLiveData = mWorkProfile != null ? Transformations.map(new RoleListLiveData(true, - mWorkProfile, application), sortFunction) : null; + // Only show the work profile section if the current user is a full user + mWorkProfile = isProfileParent ? UserUtils.getWorkProfile(application) : null; + if (RoleFlags.isProfileGroupExclusivityAvailable()) { + Predicate<RoleItem> exclusivityPredicate = roleItem -> + roleItem.getRole().getExclusivity() == Role.EXCLUSIVITY_PROFILE_GROUP; + if (mWorkProfile != null) { + // Show profile group exclusive roles from work profile in primary group. + RoleListLiveData workLiveData = + new RoleListLiveData(true, mWorkProfile, application); + mLiveData = Transformations.map( + new MergeRoleListLiveData(liveData, + Transformations.map(workLiveData, + new ListLiveDataFilterFunction<>(exclusivityPredicate))), + sortFunction); + mWorkLiveData = Transformations.map( + Transformations.map(workLiveData, + new ListLiveDataFilterFunction<>(exclusivityPredicate.negate())), + sortFunction); + } else if (Flags.crossUserRoleUxBugfixEnabled() && isWorkProfile) { + // Show profile group exclusive roles from the profile parent (full user) in primary + // group when the current user (primary group) is a work profile + RoleListLiveData profileParentLiveData = + new RoleListLiveData(true, profileParent, application); + mLiveData = Transformations.map( + new MergeRoleListLiveData(liveData, + Transformations.map(profileParentLiveData, + new ListLiveDataFilterFunction<>(exclusivityPredicate))), + sortFunction); + mWorkLiveData = null; + } else { + mLiveData = Transformations.map(liveData, sortFunction); + mWorkLiveData = null; + } + } else { + mLiveData = Transformations.map(liveData, sortFunction); + mWorkLiveData = mWorkProfile != null ? Transformations.map( + new RoleListLiveData(true, mWorkProfile, application), sortFunction) : null; + } - UserHandle privateProfile = UserUtils.getPrivateProfile(application); + // Only show the private profile section if the current user is a full user + UserHandle privateProfile = + isProfileParent ? UserUtils.getPrivateProfile(application) : null; if (privateProfile != null && Utils.shouldShowInSettings( privateProfile, application.getSystemService(UserManager.class))) { mPrivateProfile = privateProfile; diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppViewModel.java b/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppViewModel.java index c89e1f71e..f4ba94f1d 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppViewModel.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/DefaultAppViewModel.java @@ -18,10 +18,8 @@ package com.android.permissioncontroller.role.ui; import android.app.Application; import android.content.Context; -import android.content.pm.ApplicationInfo; import android.os.UserHandle; import android.util.Log; -import android.util.Pair; import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; @@ -30,9 +28,12 @@ import androidx.lifecycle.Transformations; import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; +import com.android.permissioncontroller.role.utils.RoleUiBehaviorUtils; +import com.android.permissioncontroller.role.utils.UserUtils; import com.android.role.controller.model.Role; import java.util.List; +import java.util.function.Predicate; /** * {@link ViewModel} for a default app. @@ -47,7 +48,10 @@ public class DefaultAppViewModel extends AndroidViewModel { private final UserHandle mUser; @NonNull - private final LiveData<List<Pair<ApplicationInfo, Boolean>>> mRoleLiveData; + private final LiveData<List<RoleApplicationItem>> mRecommendedLiveData; + + @NonNull + private final LiveData<List<RoleApplicationItem>> mLiveData; @NonNull private final ManageRoleHolderStateLiveData mManageRoleHolderStateLiveData = @@ -58,15 +62,43 @@ public class DefaultAppViewModel extends AndroidViewModel { super(application); mRole = role; - mUser = user; + // If EXCLUSIVITY_PROFILE_GROUP this user should be profile parent + mUser = role.getExclusivity() == Role.EXCLUSIVITY_PROFILE_GROUP + ? UserUtils.getProfileParentOrSelf(user, application) + : user; + RoleLiveData userLiveData = new RoleLiveData(role, mUser, application); + RoleSortFunction sortFunction = new RoleSortFunction(application); + LiveData<List<RoleApplicationItem>> liveData; + if (role.getExclusivity() == Role.EXCLUSIVITY_PROFILE_GROUP) { + // Context user might be work profile, ensure we get a non-null UserHandle if work + // profile exists. getWorkProfile returns null if context user is work profile. + UserHandle workProfile = UserUtils.getWorkProfileOrSelf(application); + if (workProfile != null) { + RoleLiveData workLiveData = new RoleLiveData(role, workProfile, application); + liveData = Transformations.map(new MergeRoleLiveData(userLiveData, workLiveData), + sortFunction); + } else { + liveData = Transformations.map(userLiveData, sortFunction); + } + } else { + liveData = Transformations.map(userLiveData, sortFunction); + } + Predicate<RoleApplicationItem> recommendedApplicationFilter = + RoleUiBehaviorUtils.getRecommendedApplicationFilter(role, application); + mRecommendedLiveData = Transformations.map(liveData, + new ListLiveDataFilterFunction<>(recommendedApplicationFilter)); + mLiveData = Transformations.map(liveData, + new ListLiveDataFilterFunction<>(recommendedApplicationFilter.negate())); + } - mRoleLiveData = Transformations.map(new RoleLiveData(mRole, mUser, application), - new RoleSortFunction(application)); + @NonNull + public LiveData<List<RoleApplicationItem>> getRecommendedLiveData() { + return mRecommendedLiveData; } @NonNull - public LiveData<List<Pair<ApplicationInfo, Boolean>>> getRoleLiveData() { - return mRoleLiveData; + public LiveData<List<RoleApplicationItem>> getLiveData() { + return mLiveData; } @NonNull @@ -79,13 +111,13 @@ public class DefaultAppViewModel extends AndroidViewModel { * * @param packageName the package name of the application */ - public void setDefaultApp(@NonNull String packageName) { + public void setDefaultApp(@NonNull String packageName, @NonNull UserHandle user) { if (mManageRoleHolderStateLiveData.getValue() != ManageRoleHolderStateLiveData.STATE_IDLE) { Log.i(LOG_TAG, "Trying to set default app while another request is on-going"); return; } mManageRoleHolderStateLiveData.setRoleHolderAsUser(mRole.getName(), packageName, true, 0, - mUser, getApplication()); + user, getApplication()); } /** @@ -93,12 +125,15 @@ public class DefaultAppViewModel extends AndroidViewModel { */ public void setNoneDefaultApp() { Context context = getApplication(); - mRole.onNoneHolderSelectedAsUser(mUser, context); + UserHandle user = mRole.getExclusivity() == Role.EXCLUSIVITY_PROFILE_GROUP + ? UserUtils.getProfileParentOrSelf(mUser, context) + : mUser; + mRole.onNoneHolderSelectedAsUser(user, context); if (mManageRoleHolderStateLiveData.getValue() != ManageRoleHolderStateLiveData.STATE_IDLE) { Log.i(LOG_TAG, "Trying to set default app while another request is on-going"); return; } - mManageRoleHolderStateLiveData.clearRoleHoldersAsUser(mRole.getName(), 0, mUser, context); + mManageRoleHolderStateLiveData.clearRoleHoldersAsUser(mRole.getName(), 0, user, context); } /** diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/ListLiveDataFilterFunction.java b/PermissionController/src/com/android/permissioncontroller/role/ui/ListLiveDataFilterFunction.java new file mode 100644 index 000000000..8657db0ab --- /dev/null +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/ListLiveDataFilterFunction.java @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2024 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.permissioncontroller.role.ui; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import kotlin.jvm.functions.Function1; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Predicate; + +/** + * A function for + * {@link androidx.lifecycle.Transformations#map(androidx.lifecycle.LiveData, Function1)} + * that filters a live data for a list. + * + * @param <T> the type of the list elements + */ +public class ListLiveDataFilterFunction<T> implements Function1<List<T>, List<T>> { + private final Predicate<T> mPredicate; + + public ListLiveDataFilterFunction(@NonNull Predicate<T> predicate) { + mPredicate = predicate; + } + + @NonNull + @Override + public List<T> invoke(@Nullable List<T> items) { + List<T> filteredItems = new ArrayList<>(); + if (items != null) { + int itemsSize = items.size(); + for (int i = 0; i < itemsSize; i++) { + T item = items.get(i); + if (mPredicate.test(item)) { + filteredItems.add(item); + } + } + } + return filteredItems; + } +} diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/ListLiveDataSortFunction.java b/PermissionController/src/com/android/permissioncontroller/role/ui/ListLiveDataSortFunction.java new file mode 100644 index 000000000..36e7afcc8 --- /dev/null +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/ListLiveDataSortFunction.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2025 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.permissioncontroller.role.ui; + +import androidx.annotation.NonNull; + +import kotlin.jvm.functions.Function1; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; + +/** + * A function for + * {@link androidx.lifecycle.Transformations#map(androidx.lifecycle.LiveData, Function1)} + * that sorts a live data for a list. + * + * @param <T> the type of the list elements + */ +public class ListLiveDataSortFunction<T> implements Function1<List<T>, List<T>> { + + @NonNull + private final Comparator<T> mComparator; + + public ListLiveDataSortFunction(@NonNull Comparator<T> comparator) { + mComparator = comparator; + } + + @Override + public List<T> invoke(List<T> items) { + List<T> sortedItems = new ArrayList<>(items); + sortedItems.sort(mComparator); + return sortedItems; + } +} diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/MergeRoleListLiveData.java b/PermissionController/src/com/android/permissioncontroller/role/ui/MergeRoleListLiveData.java index 0318800f4..0c2d96b2c 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/MergeRoleListLiveData.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/MergeRoleListLiveData.java @@ -14,16 +14,14 @@ * limitations under the License. */ -package com.android.permissioncontroller.role.ui.specialappaccess; +package com.android.permissioncontroller.role.ui; import android.util.ArrayMap; import androidx.annotation.NonNull; +import androidx.lifecycle.LiveData; import androidx.lifecycle.MediatorLiveData; -import com.android.permissioncontroller.role.ui.RoleItem; -import com.android.permissioncontroller.role.ui.RoleListLiveData; - import java.util.ArrayList; import java.util.List; @@ -33,14 +31,14 @@ import java.util.List; public class MergeRoleListLiveData extends MediatorLiveData<List<RoleItem>> { @NonNull - private final RoleListLiveData[] mLiveDatas; + private final LiveData<List<RoleItem>>[] mLiveDatas; - public MergeRoleListLiveData(@NonNull RoleListLiveData... liveDatas) { + public MergeRoleListLiveData(@NonNull LiveData<List<RoleItem>>... liveDatas) { mLiveDatas = liveDatas; int liveDatasLength = mLiveDatas.length; for (int i = 0; i < liveDatasLength; i++) { - RoleListLiveData liveData = mLiveDatas[i]; + LiveData<List<RoleItem>> liveData = mLiveDatas[i]; addSource(liveData, roleItems -> onRoleListChanged()); } @@ -50,7 +48,7 @@ public class MergeRoleListLiveData extends MediatorLiveData<List<RoleItem>> { ArrayMap<String, RoleItem> mergedRoleItemMap = new ArrayMap<>(); int liveDatasLength = mLiveDatas.length; for (int liveDatasIndex = 0; liveDatasIndex < liveDatasLength; liveDatasIndex++) { - RoleListLiveData liveData = mLiveDatas[liveDatasIndex]; + LiveData<List<RoleItem>> liveData = mLiveDatas[liveDatasIndex]; List<RoleItem> roleItems = liveData.getValue(); if (roleItems == null) { diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/MergeRoleLiveData.java b/PermissionController/src/com/android/permissioncontroller/role/ui/MergeRoleLiveData.java index dab59a1ab..72c2264ce 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/MergeRoleLiveData.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/MergeRoleLiveData.java @@ -14,23 +14,18 @@ * limitations under the License. */ -package com.android.permissioncontroller.role.ui.specialappaccess; - -import android.content.pm.ApplicationInfo; -import android.util.Pair; +package com.android.permissioncontroller.role.ui; import androidx.annotation.NonNull; import androidx.lifecycle.MediatorLiveData; -import com.android.permissioncontroller.role.ui.RoleLiveData; - import java.util.ArrayList; import java.util.List; /** * {@link MediatorLiveData} that merges multiple {@link RoleLiveData} instances. */ -public class MergeRoleLiveData extends MediatorLiveData<List<Pair<ApplicationInfo, Boolean>>> { +public class MergeRoleLiveData extends MediatorLiveData<List<RoleApplicationItem>> { @NonNull private final RoleLiveData[] mLiveDatas; @@ -42,23 +37,23 @@ public class MergeRoleLiveData extends MediatorLiveData<List<Pair<ApplicationInf for (int i = 0; i < liveDatasLength; i++) { RoleLiveData liveData = mLiveDatas[i]; - addSource(liveData, roleItems -> onRoleChanged()); + addSource(liveData, items -> onRoleChanged()); } } private void onRoleChanged() { - List<Pair<ApplicationInfo, Boolean>> mergedQualifyingApplications = new ArrayList<>(); + List<RoleApplicationItem> mergedItems = new ArrayList<>(); int liveDatasLength = mLiveDatas.length; for (int i = 0; i < liveDatasLength; i++) { RoleLiveData liveData = mLiveDatas[i]; - List<Pair<ApplicationInfo, Boolean>> qualifyingApplications = liveData.getValue(); - if (qualifyingApplications == null) { + List<RoleApplicationItem> items = liveData.getValue(); + if (items == null) { return; } - mergedQualifyingApplications.addAll(qualifyingApplications); + mergedItems.addAll(items); } - setValue(mergedQualifyingApplications); + setValue(mergedItems); } } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/RequestRoleFragment.java b/PermissionController/src/com/android/permissioncontroller/role/ui/RequestRoleFragment.java index 97ed74c01..89a17004b 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/RequestRoleFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/RequestRoleFragment.java @@ -30,7 +30,6 @@ import android.os.Process; import android.os.UserHandle; import android.text.TextUtils; import android.util.Log; -import android.util.Pair; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -44,6 +43,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.content.res.AppCompatResources; +import androidx.core.os.BundleCompat; import androidx.fragment.app.DialogFragment; import androidx.lifecycle.ViewModelProvider; @@ -51,12 +51,15 @@ import com.android.permissioncontroller.PermissionControllerStatsLog; import com.android.permissioncontroller.R; import com.android.permissioncontroller.permission.utils.PackageRemovalMonitor; import com.android.permissioncontroller.permission.utils.Utils; +import com.android.permissioncontroller.role.UserPackage; import com.android.permissioncontroller.role.model.UserDeniedManager; import com.android.permissioncontroller.role.utils.PackageUtils; import com.android.permissioncontroller.role.utils.RoleUiBehaviorUtils; import com.android.permissioncontroller.role.utils.UiUtils; +import com.android.permissioncontroller.role.utils.UserUtils; import com.android.role.controller.model.Role; import com.android.role.controller.model.Roles; +import com.android.settingslib.utils.applications.AppUtils; import java.util.ArrayList; import java.util.List; @@ -108,6 +111,7 @@ public class RequestRoleFragment extends DialogFragment { @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setCancelable(false); Bundle arguments = getArguments(); mPackageName = arguments.getString(Intent.EXTRA_PACKAGE_NAME); @@ -233,7 +237,7 @@ public class RequestRoleFragment extends DialogFragment { ViewModelProvider.Factory viewModelFactory = new RequestRoleViewModel.Factory(mRole, requireActivity().getApplication()); mViewModel = new ViewModelProvider(this, viewModelFactory).get(RequestRoleViewModel.class); - mViewModel.getRoleLiveData().observe(this, this::onRoleDataChanged); + mViewModel.getLiveData().observe(this, this::onApplicationListChanged); mViewModel.getManageRoleHolderStateLiveData().observe(this, this::onManageRoleHolderStateChanged); } @@ -269,9 +273,9 @@ public class RequestRoleFragment extends DialogFragment { setDeniedOnceAndFinish(); } - private void onRoleDataChanged( - @NonNull List<Pair<ApplicationInfo, Boolean>> qualifyingApplications) { - mAdapter.replace(qualifyingApplications); + private void onApplicationListChanged( + @NonNull List<RoleApplicationItem> applicationItems) { + mAdapter.replace(applicationItems); updateUi(); } @@ -293,29 +297,31 @@ public class RequestRoleFragment extends DialogFragment { } private void setRoleHolder() { - String packageName = mAdapter.getCheckedPackageName(); + UserPackage userPackage = mAdapter.getCheckedUserPackage(); Context context = requireContext(); - UserHandle user = Process.myUserHandle(); - if (packageName == null) { + if (userPackage == null) { reportRequestResult(PermissionControllerStatsLog .ROLE_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_GRANTED_ANOTHER, null); + UserHandle user = mRole.getExclusivity() == Role.EXCLUSIVITY_PROFILE_GROUP + ? UserUtils.getProfileParentOrSelf(Process.myUserHandle(), context) + : Process.myUserHandle(); mRole.onNoneHolderSelectedAsUser(user, context); mViewModel.getManageRoleHolderStateLiveData().clearRoleHoldersAsUser(mRoleName, 0, user, context); } else { - boolean isRequestingApplication = Objects.equals(packageName, mPackageName); + boolean isRequestingApplication = isRequestingApplication(userPackage); if (isRequestingApplication) { reportRequestResult(PermissionControllerStatsLog .ROLE_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED, null); } else { reportRequestResult(PermissionControllerStatsLog .ROLE_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_GRANTED_ANOTHER, - packageName); + userPackage); } int flags = isRequestingApplication ? RoleManager.MANAGE_HOLDERS_FLAG_DONT_KILL_APP : 0; mViewModel.getManageRoleHolderStateLiveData().setRoleHolderAsUser(mRoleName, - packageName, true, flags, user, context); + userPackage.packageName, true, flags, userPackage.user, context); } } @@ -329,11 +335,13 @@ public class RequestRoleFragment extends DialogFragment { ManageRoleHolderStateLiveData liveData = mViewModel.getManageRoleHolderStateLiveData(); String packageName = liveData.getLastPackageName(); - if (packageName != null) { - mRole.onHolderSelectedAsUser(packageName, liveData.getLastUser(), - requireContext()); + UserHandle user = liveData.getLastUser(); + UserPackage userPackage = packageName != null && user != null + ? UserPackage.of(user, packageName) : null; + if (userPackage != null) { + mRole.onHolderSelectedAsUser(packageName, user, requireContext()); } - if (Objects.equals(packageName, mPackageName)) { + if (isRequestingApplication(userPackage)) { Log.i(LOG_TAG, "Application added as a role holder, role: " + mRoleName + ", package: " + mPackageName); clearDeniedSetResultOkAndFinish(); @@ -357,8 +365,8 @@ public class RequestRoleFragment extends DialogFragment { boolean dontAskAgain = mDontAskAgainCheck != null && mDontAskAgainCheck.isChecked(); mAdapter.setDontAskAgain(dontAskAgain); AlertDialog dialog = getDialog(); - boolean hasRoleData = mViewModel.getRoleLiveData().getValue() != null; - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(enabled && hasRoleData + boolean hasApplicationList = mViewModel.getLiveData().getValue() != null; + dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(enabled && hasApplicationList && (dontAskAgain || !mAdapter.isHolderApplicationChecked())); dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(enabled); } @@ -383,20 +391,23 @@ public class RequestRoleFragment extends DialogFragment { requireActivity().finish(); } - private void reportRequestResult(int result, @Nullable String grantedAnotherPackageName) { - String holderPackageName = getHolderPackageName(); - reportRequestResult(getApplicationUid(mPackageName), mPackageName, mRoleName, - getQualifyingApplicationCount(), getQualifyingApplicationUid(holderPackageName), - holderPackageName, getQualifyingApplicationUid(grantedAnotherPackageName), - grantedAnotherPackageName, result); + private void reportRequestResult(int result, @Nullable UserPackage grantedUserPackage) { + UserPackage holderUserPackage = getHolderUserPackage(); + reportRequestResult(getRequestingApplicationUid(), mPackageName, mRoleName, + getQualifyingApplicationCount(), + getQualifyingApplicationUid(holderUserPackage), + holderUserPackage != null ? holderUserPackage.packageName : null, + getQualifyingApplicationUid(grantedUserPackage), + grantedUserPackage != null ? grantedUserPackage.packageName : null, + result); } - private int getApplicationUid(@NonNull String packageName) { - int uid = getQualifyingApplicationUid(packageName); + private int getRequestingApplicationUid() { + int uid = getQualifyingApplicationUid(UserPackage.of(Process.myUserHandle(), mPackageName)); if (uid != -1) { return uid; } - ApplicationInfo applicationInfo = PackageUtils.getApplicationInfo(packageName, + ApplicationInfo applicationInfo = PackageUtils.getApplicationInfo(mPackageName, requireActivity()); if (applicationInfo == null) { return -1; @@ -404,19 +415,19 @@ public class RequestRoleFragment extends DialogFragment { return applicationInfo.uid; } - private int getQualifyingApplicationUid(@Nullable String packageName) { - if (packageName == null || mAdapter == null) { + private int getQualifyingApplicationUid(@Nullable UserPackage userPackage) { + if (userPackage == null || mAdapter == null) { return -1; } int count = mAdapter.getCount(); for (int i = 0; i < count; i++) { - Pair<ApplicationInfo, Boolean> qualifyingApplication = mAdapter.getItem(i); - if (qualifyingApplication == null) { + RoleApplicationItem applicationItem = mAdapter.getItem(i); + if (applicationItem == null) { // Skip the "None" item. continue; } - ApplicationInfo applicationInfo = qualifyingApplication.first; - if (Objects.equals(applicationInfo.packageName, packageName)) { + ApplicationInfo applicationInfo = applicationItem.getApplicationInfo(); + if (Objects.equals(UserPackage.from(applicationInfo), userPackage)) { return applicationInfo.uid; } } @@ -436,11 +447,15 @@ public class RequestRoleFragment extends DialogFragment { } @Nullable - private String getHolderPackageName() { + private UserPackage getHolderUserPackage() { if (mAdapter == null) { return null; } - return mAdapter.mHolderPackageName; + return mAdapter.mHolderUserPackage; + } + + private boolean isRequestingApplication(@Nullable UserPackage userPackage) { + return Objects.equals(userPackage, UserPackage.of(Process.myUserHandle(), mPackageName)); } static void reportRequestResult(int requestingUid, String requestingPackageName, @@ -466,8 +481,8 @@ public class RequestRoleFragment extends DialogFragment { private static final String STATE_USER_CHECKED = Adapter.class.getName() + ".state.USER_CHECKED"; - private static final String STATE_CHECKED_PACKAGE_NAME = Adapter.class.getName() - + ".state.CHECKED_PACKAGE_NAME"; + private static final String STATE_CHECKED_USER_PACKAGE = Adapter.class.getName() + + ".state.CHECKED_USER_PACKAGE"; private static final int LAYOUT_TRANSITION_DURATION_MILLIS = 150; @@ -479,11 +494,10 @@ public class RequestRoleFragment extends DialogFragment { // We'll use a null to represent the "None" item. @NonNull - private final List<Pair<ApplicationInfo, Boolean>> mQualifyingApplications = - new ArrayList<>(); + private final List<RoleApplicationItem> mApplicationItems = new ArrayList<>(); @Nullable - private String mHolderPackageName; + private UserPackage mHolderUserPackage; private boolean mDontAskAgain; @@ -492,7 +506,7 @@ public class RequestRoleFragment extends DialogFragment { private boolean mUserChecked; @Nullable - private String mCheckedPackageName; + private UserPackage mCheckedUserPackage; Adapter(@NonNull ListView listView, @NonNull Role role) { mListView = listView; @@ -502,14 +516,20 @@ public class RequestRoleFragment extends DialogFragment { public void onSaveInstanceState(@NonNull Bundle outState) { outState.putBoolean(STATE_USER_CHECKED, mUserChecked); if (mUserChecked) { - outState.putString(STATE_CHECKED_PACKAGE_NAME, mCheckedPackageName); + if (mCheckedUserPackage != null) { + outState.putParcelable(STATE_CHECKED_USER_PACKAGE, mCheckedUserPackage); + } else { + outState.remove(STATE_CHECKED_USER_PACKAGE); + } } } public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) { mUserChecked = savedInstanceState.getBoolean(STATE_USER_CHECKED); if (mUserChecked) { - mCheckedPackageName = savedInstanceState.getString(STATE_CHECKED_PACKAGE_NAME); + mCheckedUserPackage = + BundleCompat.getParcelable(savedInstanceState, STATE_CHECKED_USER_PACKAGE, + UserPackage.class); } } @@ -520,50 +540,52 @@ public class RequestRoleFragment extends DialogFragment { mDontAskAgain = dontAskAgain; if (mDontAskAgain) { mUserChecked = false; - mCheckedPackageName = mHolderPackageName; + mCheckedUserPackage = mHolderUserPackage; } notifyDataSetChanged(); } public void onItemClicked(int position) { - Pair<ApplicationInfo, Boolean> qualifyingApplication = getItem(position); - if (qualifyingApplication == null) { + RoleApplicationItem applicationItem = getItem(position); + if (applicationItem == null) { mUserChecked = true; - mCheckedPackageName = null; + mCheckedUserPackage = null; } else { - ApplicationInfo applicationInfo = qualifyingApplication.first; + ApplicationInfo applicationInfo = applicationItem.getApplicationInfo(); + UserHandle user = UserHandle.getUserHandleForUid(applicationInfo.uid); Intent restrictionIntent = mRole.getApplicationRestrictionIntentAsUser( - applicationInfo, Process.myUserHandle(), mListView.getContext()); + applicationInfo, user, mListView.getContext()); if (restrictionIntent != null) { mListView.getContext().startActivity(restrictionIntent); return; } else { mUserChecked = true; - mCheckedPackageName = applicationInfo.packageName; + mCheckedUserPackage = UserPackage.from(applicationInfo); } } notifyDataSetChanged(); } - public void replace(@NonNull List<Pair<ApplicationInfo, Boolean>> qualifyingApplications) { - mQualifyingApplications.clear(); + public void replace(@NonNull List<RoleApplicationItem> applicationItems) { + mApplicationItems.clear(); if (mRole.shouldShowNone()) { - mQualifyingApplications.add(0, null); + mApplicationItems.add(0, null); } - mQualifyingApplications.addAll(qualifyingApplications); - mHolderPackageName = getHolderPackageName(qualifyingApplications); + mApplicationItems.addAll(applicationItems); + mHolderUserPackage = getHolderUserPackage(applicationItems); - if (mUserChecked && mCheckedPackageName != null) { + if (mUserChecked && mCheckedUserPackage != null) { boolean isCheckedPackageNameFound = false; int count = getCount(); for (int i = 0; i < count; i++) { - Pair<ApplicationInfo, Boolean> qualifyingApplication = getItem(i); - if (qualifyingApplication == null) { + RoleApplicationItem applicationItem = getItem(i); + if (applicationItem == null) { continue; } - String packageName = qualifyingApplication.first.packageName; + UserPackage userPackage = + UserPackage.from(applicationItem.getApplicationInfo()); - if (Objects.equals(packageName, mCheckedPackageName)) { + if (Objects.equals(userPackage, mCheckedUserPackage)) { mUserChecked = true; isCheckedPackageNameFound = true; break; @@ -571,44 +593,40 @@ public class RequestRoleFragment extends DialogFragment { } if (!isCheckedPackageNameFound) { mUserChecked = false; - mCheckedPackageName = null; + mCheckedUserPackage = null; } } if (!mUserChecked) { - mCheckedPackageName = mHolderPackageName; + mCheckedUserPackage = mHolderUserPackage; } notifyDataSetChanged(); } @Nullable - private static String getHolderPackageName( - @NonNull List<Pair<ApplicationInfo, Boolean>> qualifyingApplications) { - int qualifyingApplicationSize = qualifyingApplications.size(); - for (int i = 0; i < qualifyingApplicationSize; i++) { - Pair<ApplicationInfo, Boolean> qualifyingApplication = qualifyingApplications.get( - i); - if (qualifyingApplication == null) { + private static UserPackage getHolderUserPackage( + @NonNull List<RoleApplicationItem> applicationItems) { + int applicationItemSize = applicationItems.size(); + for (int i = 0; i < applicationItemSize; i++) { + RoleApplicationItem applicationItem = applicationItems.get(i); + if (applicationItem == null) { continue; } - ApplicationInfo applicationInfo = qualifyingApplication.first; - boolean isHolderApplication = qualifyingApplication.second; - - if (isHolderApplication) { - return applicationInfo.packageName; + if (applicationItem.isHolderApplication()) { + return UserPackage.from(applicationItem.getApplicationInfo()); } } return null; } @Nullable - public String getCheckedPackageName() { - return mCheckedPackageName; + public UserPackage getCheckedUserPackage() { + return mCheckedUserPackage; } public boolean isHolderApplicationChecked() { - return Objects.equals(mCheckedPackageName, mHolderPackageName); + return Objects.equals(mCheckedUserPackage, mHolderUserPackage); } @Override @@ -623,13 +641,13 @@ public class RequestRoleFragment extends DialogFragment { @Override public int getCount() { - return mQualifyingApplications.size(); + return mApplicationItems.size(); } @Nullable @Override - public Pair<ApplicationInfo, Boolean> getItem(int position) { - return mQualifyingApplications.get(position); + public RoleApplicationItem getItem(int position) { + return mApplicationItems.get(position); } @Override @@ -638,9 +656,9 @@ public class RequestRoleFragment extends DialogFragment { // Work around AbsListView.confirmCheckedPositionsById() not respecting our count. return ListView.INVALID_ROW_ID; } - Pair<ApplicationInfo, Boolean> qualifyingApplication = getItem(position); - return qualifyingApplication == null ? 0 - : qualifyingApplication.first.packageName.hashCode(); + RoleApplicationItem applicationItem = getItem(position); + return applicationItem == null ? 0 + : applicationItem.getApplicationInfo().packageName.hashCode(); } @Override @@ -648,12 +666,11 @@ public class RequestRoleFragment extends DialogFragment { if (!mDontAskAgain) { return true; } - Pair<ApplicationInfo, Boolean> qualifyingApplication = getItem(position); - if (qualifyingApplication == null) { - return mHolderPackageName == null; + RoleApplicationItem applicationItem = getItem(position); + if (applicationItem == null) { + return mHolderUserPackage == null; } else { - boolean isHolderApplication = qualifyingApplication.second; - return isHolderApplication; + return applicationItem.isHolderApplication(); } } @@ -675,45 +692,53 @@ public class RequestRoleFragment extends DialogFragment { LAYOUT_TRANSITION_DURATION_MILLIS); } - Pair<ApplicationInfo, Boolean> qualifyingApplication = getItem(position); + RoleApplicationItem applicationItem = getItem(position); ApplicationInfo applicationInfo; boolean restricted; boolean checked; Drawable icon; String title; String subtitle; - if (qualifyingApplication == null) { + String contentDescription; + if (applicationItem == null) { applicationInfo = null; restricted = false; - checked = mCheckedPackageName == null; + checked = mCheckedUserPackage == null; icon = AppCompatResources.getDrawable(context, R.drawable.ic_remove_circle); title = context.getString(R.string.default_app_none); - subtitle = mHolderPackageName != null ? context.getString( + subtitle = mHolderUserPackage == null ? context.getString( R.string.request_role_current_default) : null; + contentDescription = null; } else { - applicationInfo = qualifyingApplication.first; + applicationInfo = applicationItem.getApplicationInfo(); + UserPackage userPackage = UserPackage.from(applicationInfo); restricted = mRole.getApplicationRestrictionIntentAsUser(applicationInfo, - Process.myUserHandle(), context) != null; - checked = Objects.equals(applicationInfo.packageName, mCheckedPackageName); + userPackage.user, context) != null; + checked = Objects.equals(userPackage, mCheckedUserPackage); icon = Utils.getBadgedIcon(context, applicationInfo); title = Utils.getAppLabel(applicationInfo, context); - boolean isHolderApplication = qualifyingApplication.second; - subtitle = isHolderApplication + subtitle = applicationItem.isHolderApplication() ? context.getString(R.string.request_role_current_default) : checked ? context.getString(mRole.getRequestDescriptionResource()) : null; + contentDescription = AppUtils.getAppContentDescription(context, + userPackage.packageName, userPackage.user.getIdentifier()); } boolean enabled = isEnabled(position); UiUtils.setViewTreeEnabled(view, enabled && !restricted); view.setEnabled(enabled); view.setChecked(checked); + holder.iconImage.setImageDrawable(icon); holder.titleText.setText(title); + holder.titleText.setContentDescription(contentDescription); holder.subtitleText.setVisibility(!TextUtils.isEmpty(subtitle) ? View.VISIBLE : View.GONE); holder.subtitleText.setText(subtitle); - RoleUiBehaviorUtils.prepareRequestRoleItemViewAsUser(mRole, holder, applicationInfo, - Process.myUserHandle(), context); + if (applicationInfo != null) { + RoleUiBehaviorUtils.prepareRequestRoleItemViewAsUser(mRole, holder, applicationInfo, + UserHandle.getUserHandleForUid(applicationInfo.uid), context); + } return view; } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/RoleApplicationItem.java b/PermissionController/src/com/android/permissioncontroller/role/ui/RoleApplicationItem.java new file mode 100644 index 000000000..b6c489ea1 --- /dev/null +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/RoleApplicationItem.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2025 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.permissioncontroller.role.ui; + +import android.content.pm.ApplicationInfo; + +import androidx.annotation.NonNull; + +/** + * Information about an application to be displayed in a list of applications qualifying for a role. + */ +public class RoleApplicationItem { + + /** + * The {@link ApplicationInfo} for this application. + */ + @NonNull + private final ApplicationInfo mApplicationInfo; + + /** + * Whether this application is holding the role. + */ + private final boolean mIsHolderApplication; + + public RoleApplicationItem(@NonNull ApplicationInfo applicationInfo, + boolean isHolderApplication) { + mApplicationInfo = applicationInfo; + mIsHolderApplication = isHolderApplication; + } + + @NonNull + public ApplicationInfo getApplicationInfo() { + return mApplicationInfo; + } + + public boolean isHolderApplication() { + return mIsHolderApplication; + } +} diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/RoleApplicationPreference.java b/PermissionController/src/com/android/permissioncontroller/role/ui/RoleApplicationPreference.java index 1d3e32c9c..3336aad50 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/RoleApplicationPreference.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/RoleApplicationPreference.java @@ -17,6 +17,7 @@ package com.android.permissioncontroller.role.ui; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.preference.TwoStatePreference; /** @@ -29,4 +30,9 @@ public interface RoleApplicationPreference extends RestrictionAwarePreference { */ @NonNull TwoStatePreference asTwoStatePreference(); + + /** + * Sets the preference's content description. + */ + void setContentDescription(@Nullable String contentDescription); } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/RoleListSortFunction.java b/PermissionController/src/com/android/permissioncontroller/role/ui/RoleListSortFunction.java index ca059aa32..07b4db1f4 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/RoleListSortFunction.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/RoleListSortFunction.java @@ -23,30 +23,23 @@ import androidx.annotation.NonNull; import kotlin.jvm.functions.Function1; -import java.util.ArrayList; import java.util.Comparator; -import java.util.List; /** - * A function for {@link androidx.lifecycle#map(androidx.lifecycle.LiveData, Function1)} + * A function for + * {@link androidx.lifecycle.Transformations#map(androidx.lifecycle.LiveData, Function1)} * that sorts a live data for role list. */ -public class RoleListSortFunction implements Function1<List<RoleItem>, List<RoleItem>> { - - @NonNull - private final Comparator<RoleItem> mComparator; +public class RoleListSortFunction extends ListLiveDataSortFunction<RoleItem> { public RoleListSortFunction(@NonNull Context context) { - Collator collator = Collator.getInstance(context.getResources().getConfiguration() - .getLocales().get(0)); - mComparator = Comparator.comparing(roleItem -> context.getString( - roleItem.getRole().getShortLabelResource()), collator); + super(createComparator(context)); } - @Override - public List<RoleItem> invoke(List<RoleItem> p1) { - List<RoleItem> sorted = new ArrayList<>(p1); - sorted.sort(mComparator); - return sorted; + private static Comparator<RoleItem> createComparator(@NonNull Context context) { + Collator collator = Collator.getInstance(context.getResources().getConfiguration() + .getLocales().get(0)); + return Comparator.comparing(item -> context.getString( + item.getRole().getShortLabelResource()), collator); } } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/RoleLiveData.java b/PermissionController/src/com/android/permissioncontroller/role/ui/RoleLiveData.java index bb492f76d..1b6d42934 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/RoleLiveData.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/RoleLiveData.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.UserHandle; import android.util.Log; -import android.util.Pair; import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; @@ -38,7 +37,7 @@ import java.util.List; /** * {@link LiveData} for a role. */ -public class RoleLiveData extends AsyncTaskLiveData<List<Pair<ApplicationInfo, Boolean>>> +public class RoleLiveData extends AsyncTaskLiveData<List<RoleApplicationItem>> implements OnRoleHoldersChangedListener { private static final String LOG_TAG = RoleLiveData.class.getSimpleName(); @@ -77,12 +76,12 @@ public class RoleLiveData extends AsyncTaskLiveData<List<Pair<ApplicationInfo, B @Override @WorkerThread - protected List<Pair<ApplicationInfo, Boolean>> loadValueInBackground() { + protected List<RoleApplicationItem> loadValueInBackground() { RoleManager roleManager = mContext.getSystemService(RoleManager.class); List<String> holderPackageNames = roleManager.getRoleHoldersAsUser(mRole.getName(), mUser); List<String> qualifyingPackageNames = mRole.getQualifyingPackagesAsUser(mUser, mContext); - List<Pair<ApplicationInfo, Boolean>> qualifyingApplications = new ArrayList<>(); + List<RoleApplicationItem> applicationItems = new ArrayList<>(); int qualifyingPackageNamesSize = qualifyingPackageNames.size(); for (int i = 0; i < qualifyingPackageNamesSize; i++) { String qualifyingPackageName = qualifyingPackageNames.get(i); @@ -98,9 +97,10 @@ public class RoleLiveData extends AsyncTaskLiveData<List<Pair<ApplicationInfo, B continue; } boolean isHolderApplication = holderPackageNames.contains(qualifyingPackageName); - qualifyingApplications.add(new Pair<>(qualifyingApplicationInfo, isHolderApplication)); + applicationItems.add( + new RoleApplicationItem(qualifyingApplicationInfo, isHolderApplication)); } - return qualifyingApplications; + return applicationItems; } } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/RolePreference.java b/PermissionController/src/com/android/permissioncontroller/role/ui/RolePreference.java index bbc123cfe..feafb0ae5 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/RolePreference.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/RolePreference.java @@ -17,6 +17,7 @@ package com.android.permissioncontroller.role.ui; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.preference.Preference; /** @@ -28,4 +29,9 @@ public interface RolePreference extends TwoTargetPreference, RestrictionAwarePre */ @NonNull Preference asPreference(); + + /** + * Sets the preference's summary content description. + */ + void setSummaryContentDescription(@Nullable String summaryContentDescription); } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/RoleSortFunction.java b/PermissionController/src/com/android/permissioncontroller/role/ui/RoleSortFunction.java index 10db9dbcd..9a06a6b01 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/RoleSortFunction.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/RoleSortFunction.java @@ -17,10 +17,8 @@ package com.android.permissioncontroller.role.ui; import android.content.Context; -import android.content.pm.ApplicationInfo; import android.icu.text.Collator; import android.os.UserHandle; -import android.util.Pair; import androidx.annotation.NonNull; @@ -28,34 +26,26 @@ import com.android.permissioncontroller.permission.utils.Utils; import kotlin.jvm.functions.Function1; -import java.util.ArrayList; import java.util.Comparator; -import java.util.List; /** - * A function for {@link androidx.lifecycle#map(androidx.lifecycle.LiveData, Function1)} + * A function for + * {@link androidx.lifecycle.Transformations#map(androidx.lifecycle.LiveData, Function1)} * that sorts a live data for role. */ -public class RoleSortFunction implements Function1<List<Pair<ApplicationInfo, Boolean>>, - List<Pair<ApplicationInfo, Boolean>>> { - - @NonNull - private final Comparator<Pair<ApplicationInfo, Boolean>> mComparator; +public class RoleSortFunction extends ListLiveDataSortFunction<RoleApplicationItem> { public RoleSortFunction(@NonNull Context context) { - Collator collator = Collator.getInstance(context.getResources().getConfiguration() - .getLocales().get(0)); - Comparator<Pair<ApplicationInfo, Boolean>> labelComparator = Comparator.comparing(role -> - Utils.getAppLabel(role.first, context), collator); - Comparator<Pair<ApplicationInfo, Boolean>> userIdComparator = Comparator.comparingInt(role - -> UserHandle.getUserHandleForUid(role.first.uid).getIdentifier()); - mComparator = labelComparator.thenComparing(userIdComparator); + super(createComparator(context)); } - @Override - public List<Pair<ApplicationInfo, Boolean>> invoke(List<Pair<ApplicationInfo, Boolean>> p1) { - List<Pair<ApplicationInfo, Boolean>> sorted = new ArrayList<>(p1); - sorted.sort(mComparator); - return sorted; + private static Comparator<RoleApplicationItem> createComparator(@NonNull Context context) { + Collator collator = Collator.getInstance(context.getResources().getConfiguration() + .getLocales().get(0)); + Comparator<RoleApplicationItem> labelComparator = Comparator.comparing(item -> + Utils.getAppLabel(item.getApplicationInfo(), context), collator); + Comparator<RoleApplicationItem> userIdComparator = Comparator.comparingInt(item + -> UserHandle.getUserHandleForUid(item.getApplicationInfo().uid).getIdentifier()); + return labelComparator.thenComparing(userIdComparator); } } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/auto/AutoRadioPreference.java b/PermissionController/src/com/android/permissioncontroller/role/ui/auto/AutoRadioPreference.java index 764c07497..f0a27284d 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/auto/AutoRadioPreference.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/auto/AutoRadioPreference.java @@ -19,6 +19,7 @@ package com.android.permissioncontroller.role.ui.auto; import android.content.Context; import android.content.Intent; import android.widget.RadioButton; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -30,10 +31,15 @@ import com.android.permissioncontroller.R; import com.android.permissioncontroller.role.ui.RestrictionAwarePreferenceMixin; import com.android.permissioncontroller.role.ui.RoleApplicationPreference; +import java.util.Objects; + /** Preference used to represent apps that can be picked as a default app. */ public class AutoRadioPreference extends TwoStatePreference implements RoleApplicationPreference { + @Nullable + private String mContentDescription; + private final RestrictionAwarePreferenceMixin mRestrictionAwarePreferenceMixin = new RestrictionAwarePreferenceMixin(this); @@ -56,10 +62,21 @@ public class AutoRadioPreference extends TwoStatePreference implements RadioButton radioButton = (RadioButton) holder.findViewById(R.id.radio_button); radioButton.setChecked(isChecked()); + TextView titleText = (TextView) holder.findViewById(android.R.id.title); + titleText.setContentDescription(mContentDescription); + mRestrictionAwarePreferenceMixin.onAfterBindViewHolder(holder); } @Override + public void setContentDescription(@Nullable String contentDescription) { + if (!Objects.equals(mContentDescription, contentDescription)) { + mContentDescription = contentDescription; + notifyChanged(); + } + } + + @Override public void setRestrictionIntent(@Nullable Intent restrictionIntent) { mRestrictionAwarePreferenceMixin.setRestrictionIntent(restrictionIntent); } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/auto/AutoRolePreference.java b/PermissionController/src/com/android/permissioncontroller/role/ui/auto/AutoRolePreference.java index 15fd117d1..28dfc67f9 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/auto/AutoRolePreference.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/auto/AutoRolePreference.java @@ -19,6 +19,7 @@ package com.android.permissioncontroller.role.ui.auto; import android.content.Context; import android.content.Intent; import android.util.AttributeSet; +import android.widget.TextView; import androidx.annotation.AttrRes; import androidx.annotation.NonNull; @@ -31,12 +32,17 @@ import com.android.permissioncontroller.role.ui.RestrictionAwarePreferenceMixin; import com.android.permissioncontroller.role.ui.RolePreference; import com.android.permissioncontroller.role.ui.TwoTargetPreference; +import java.util.Objects; + /** * Preference for use in auto lists. Extends {@link TwoTargetPreference} in order to make sure of * shared logic between phone and auto settings UI. */ public class AutoRolePreference extends Preference implements RolePreference { + @Nullable + private String mSummaryContentDescription; + private RestrictionAwarePreferenceMixin mRestrictionAwarePreferenceMixin = new RestrictionAwarePreferenceMixin(this); @@ -62,6 +68,14 @@ public class AutoRolePreference extends Preference implements RolePreference { public void setOnSecondTargetClickListener(@Nullable OnSecondTargetClickListener listener) {} @Override + public void setSummaryContentDescription(@Nullable String summaryContentDescription) { + if (!Objects.equals(mSummaryContentDescription, summaryContentDescription)) { + mSummaryContentDescription = summaryContentDescription; + notifyChanged(); + } + } + + @Override public void setRestrictionIntent(@Nullable Intent restrictionIntent) { mRestrictionAwarePreferenceMixin.setRestrictionIntent(restrictionIntent); } @@ -70,6 +84,9 @@ public class AutoRolePreference extends Preference implements RolePreference { public void onBindViewHolder(@NonNull PreferenceViewHolder holder) { super.onBindViewHolder(holder); + TextView summaryText = (TextView) holder.findViewById(android.R.id.summary); + summaryText.setContentDescription(mSummaryContentDescription); + mRestrictionAwarePreferenceMixin.onAfterBindViewHolder(holder); } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/auto/AutoSwitchPreference.java b/PermissionController/src/com/android/permissioncontroller/role/ui/auto/AutoSwitchPreference.java index bfb2b5d1d..e7279278c 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/auto/AutoSwitchPreference.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/auto/AutoSwitchPreference.java @@ -19,6 +19,7 @@ package com.android.permissioncontroller.role.ui.auto; import android.content.Context; import android.content.Intent; import android.util.AttributeSet; +import android.widget.TextView; import androidx.annotation.AttrRes; import androidx.annotation.NonNull; @@ -30,12 +31,16 @@ import androidx.preference.SwitchPreference; import com.android.permissioncontroller.role.ui.RestrictionAwarePreferenceMixin; import com.android.permissioncontroller.role.ui.RoleApplicationPreference; +import java.util.Objects; + /** * Role application preference represented as a switch. */ public class AutoSwitchPreference extends SwitchPreference implements RoleApplicationPreference { + @Nullable + private String mContentDescription; private RestrictionAwarePreferenceMixin mRestrictionAwarePreferenceMixin = new RestrictionAwarePreferenceMixin(this); @@ -58,6 +63,14 @@ public class AutoSwitchPreference extends SwitchPreference } @Override + public void setContentDescription(@Nullable String contentDescription) { + if (!Objects.equals(mContentDescription, contentDescription)) { + mContentDescription = contentDescription; + notifyChanged(); + } + } + + @Override public void setRestrictionIntent(@Nullable Intent restrictionIntent) { mRestrictionAwarePreferenceMixin.setRestrictionIntent(restrictionIntent); } @@ -66,6 +79,9 @@ public class AutoSwitchPreference extends SwitchPreference public void onBindViewHolder(@NonNull PreferenceViewHolder holder) { super.onBindViewHolder(holder); + TextView titleText = (TextView) holder.findViewById(android.R.id.title); + titleText.setContentDescription(mContentDescription); + mRestrictionAwarePreferenceMixin.onAfterBindViewHolder(holder); } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/AssistantRoleUiBehavior.java b/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/AssistantRoleUiBehavior.java index 4df3ccf99..c74c3d519 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/AssistantRoleUiBehavior.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/AssistantRoleUiBehavior.java @@ -25,8 +25,15 @@ import android.provider.Settings; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.permission.flags.Flags; import com.android.permissioncontroller.R; +import com.android.permissioncontroller.role.ui.RoleApplicationItem; import com.android.role.controller.model.Role; +import com.android.role.controller.util.SignedPackage; +import com.android.role.controller.util.SignedPackageUtils; + +import java.util.List; +import java.util.function.Predicate; /*** * Class for UI behavior of Assistant role @@ -39,14 +46,26 @@ public class AssistantRoleUiBehavior implements RoleUiBehavior { @NonNull Context context) { boolean isAutomotive = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE); - if (isAutomotive) { return null; } - return new Intent(Settings.ACTION_VOICE_INPUT_SETTINGS); } + @NonNull + @Override + public Predicate<RoleApplicationItem> getRecommendedApplicationFilter( + @NonNull Role role, @NonNull Context context) { + if (Flags.defaultAppsRecommendationEnabled()) { + List<SignedPackage> signedPackages = SignedPackage.parseList( + context.getResources().getString(R.string.config_recommendedAssistants)); + return applicationItem -> SignedPackageUtils.matchesAny( + applicationItem.getApplicationInfo(), signedPackages, context); + } else { + return RoleUiBehavior.super.getRecommendedApplicationFilter(role, context); + } + } + @Nullable @Override public CharSequence getConfirmationMessage(@NonNull Role role, @NonNull String packageName, diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/RoleUiBehavior.java b/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/RoleUiBehavior.java index ae5c03676..e1bf213a0 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/RoleUiBehavior.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/RoleUiBehavior.java @@ -26,10 +26,12 @@ import androidx.annotation.Nullable; import androidx.preference.Preference; import com.android.permissioncontroller.role.ui.RequestRoleItemView; +import com.android.permissioncontroller.role.ui.RoleApplicationItem; import com.android.permissioncontroller.role.ui.TwoTargetPreference; import com.android.role.controller.model.Role; import java.util.List; +import java.util.function.Predicate; /*** * Interface for UI behavior for roles @@ -92,6 +94,20 @@ public interface RoleUiBehavior { @NonNull UserHandle user, @NonNull Context context) {} /** + * Get the filter for recommended applications of this role. + * + * @param role the role to get the recommended application filter for + * @param context the {@code Context} to retrieve system services + * + * @return the filter for recommended applications + */ + @NonNull + default Predicate<RoleApplicationItem> getRecommendedApplicationFilter( + @NonNull Role role, @NonNull Context context) { + return applicationItem -> false; + } + + /** * Get the confirmation message for adding an application as a holder of this role. * * @param role the role to get confirmation message for diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/v35/WalletRoleUiBehavior.java b/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/v35/WalletRoleUiBehavior.java index f1754dde9..eb1dbb5ef 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/v35/WalletRoleUiBehavior.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/v35/WalletRoleUiBehavior.java @@ -22,6 +22,8 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.graphics.Bitmap; +import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.nfc.cardemulation.ApduServiceInfo; import android.nfc.cardemulation.CardEmulation; @@ -39,6 +41,8 @@ import androidx.annotation.RequiresApi; import androidx.core.util.Pair; import androidx.preference.Preference; +import com.android.launcher3.icons.IconFactory; +import com.android.permissioncontroller.role.ui.RequestRoleItemView; import com.android.permissioncontroller.role.ui.TwoTargetPreference; import com.android.permissioncontroller.role.ui.behavior.RoleUiBehavior; import com.android.role.controller.model.Role; @@ -70,6 +74,21 @@ public class WalletRoleUiBehavior implements RoleUiBehavior { } @Override + public void prepareRequestRoleItemViewAsUser(@NonNull Role role, + @NonNull RequestRoleItemView itemView, @NonNull ApplicationInfo applicationInfo, + @NonNull UserHandle user, @NonNull Context context) { + if (isSystemApplication(applicationInfo)) { + Pair<Drawable, CharSequence> bannerAndLabel = getLabelAndIconIfItExists( + applicationInfo, user, context); + + if (bannerAndLabel != null) { + itemView.getIconImageView().setImageDrawable(bannerAndLabel.first); + itemView.getTitleTextView().setText(bannerAndLabel.second); + } + } + } + + @Override public void prepareApplicationPreferenceAsUser(@NonNull Role role, @NonNull Preference preference, @NonNull ApplicationInfo applicationInfo, @NonNull UserHandle user, @NonNull Context context) { @@ -81,21 +100,8 @@ public class WalletRoleUiBehavior implements RoleUiBehavior { @NonNull ApplicationInfo applicationInfo, boolean setTitle, @NonNull UserHandle user, @NonNull Context context) { if (isSystemApplication(applicationInfo)) { - List<ApduServiceInfo> serviceInfos = getNfcServicesForPackage( - applicationInfo.packageName, user, context); - - Pair<Drawable, CharSequence> bannerAndLabel = null; - // If the flag is enabled , attempt to fetch it from property - if (Flags.walletRoleIconPropertyEnabled()) { - bannerAndLabel = - getBannerAndLabelFromPackageProperty(context, user, - applicationInfo.packageName); - } - // If it's null, indicating that the property is not set, perform a legacy icon lookup. - if (bannerAndLabel == null) { - bannerAndLabel = - getNonPaymentServiceBannerAndLabelIfExists(serviceInfos, user, context); - } + Pair<Drawable, CharSequence> bannerAndLabel = getLabelAndIconIfItExists( + applicationInfo, user, context); if (bannerAndLabel != null) { preference.setIcon(bannerAndLabel.first); if (setTitle) { @@ -107,6 +113,26 @@ public class WalletRoleUiBehavior implements RoleUiBehavior { } } + @Nullable + private Pair<Drawable, CharSequence> getLabelAndIconIfItExists( + @NonNull ApplicationInfo applicationInfo, + @NonNull UserHandle user, + @NonNull Context context) { + Pair<Drawable, CharSequence> result = null; + // If the flag is enabled , attempt to fetch it from property + if (Flags.walletRoleIconPropertyEnabled()) { + result = getBannerAndLabelFromPackageProperty(context, user, + applicationInfo.packageName); + } + if (result != null) { + return result; + } + List<ApduServiceInfo> serviceInfos = getNfcServicesForPackage( + applicationInfo.packageName, user, context); + // If it's null, indicating that the property is not set, perform a legacy icon lookup. + return getNonPaymentServiceBannerAndLabelIfExists(serviceInfos, user, context); + } + @Nullable private Pair<Drawable, CharSequence> getBannerAndLabelFromPackageProperty( @@ -122,7 +148,7 @@ public class WalletRoleUiBehavior implements RoleUiBehavior { PackageManager.Property iconProperty = packageManager.getProperty( ApduServiceInfo.PROPERTY_WALLET_PREFERRED_BANNER_AND_LABEL, componentName); if (iconProperty.isBoolean() && iconProperty.getBoolean()) { - return loadBannerAndLabel(serviceInfo, packageManager); + return loadBannerAndLabel(serviceInfo, packageManager, context, user); } } catch (PackageManager.NameNotFoundException e) { continue; @@ -186,7 +212,8 @@ public class WalletRoleUiBehavior implements RoleUiBehavior { for (int i = 0; i < apduServiceInfoSize; i++) { ApduServiceInfo serviceInfo = apduServiceInfos.get(i); if (serviceInfo.getAids().isEmpty()) { - bannerAndLabel = loadBannerAndLabel(serviceInfo, userPackageManager); + bannerAndLabel = loadBannerAndLabel(serviceInfo, userPackageManager, context, + user); if (bannerAndLabel != null) { return bannerAndLabel; } @@ -197,7 +224,8 @@ public class WalletRoleUiBehavior implements RoleUiBehavior { String aid = aids.get(j); String category = serviceInfo.getCategoryForAid(aid); if (!CardEmulation.CATEGORY_PAYMENT.equals(category)) { - bannerAndLabel = loadBannerAndLabel(serviceInfo, userPackageManager); + bannerAndLabel = loadBannerAndLabel(serviceInfo, userPackageManager, + context, user); if (bannerAndLabel != null) { return bannerAndLabel; } @@ -210,8 +238,20 @@ public class WalletRoleUiBehavior implements RoleUiBehavior { @Nullable private Pair<Drawable, CharSequence> loadBannerAndLabel(@NonNull ApduServiceInfo info, - @NonNull PackageManager userPackageManager) { + @NonNull PackageManager userPackageManager, @NonNull Context context, + @NonNull UserHandle user) { Drawable drawable = info.loadBanner(userPackageManager); + if (drawable != null) { + try (IconFactory factory = IconFactory.obtain(context)) { + Bitmap badged = + factory.createBadgedIconBitmap(drawable, user, + false).icon; + if (badged != null) { + drawable = new BitmapDrawable(context.getResources(), badged); + } + } + } + CharSequence label = info.loadLabel(userPackageManager); if (drawable != null && !TextUtils.isEmpty(label)) { return new Pair<>(drawable, label); diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/v36/ReservedForTestingProfileGroupExclusivityRoleUiBehavior.java b/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/v36/ReservedForTestingProfileGroupExclusivityRoleUiBehavior.java new file mode 100644 index 000000000..00b1ce5b1 --- /dev/null +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/v36/ReservedForTestingProfileGroupExclusivityRoleUiBehavior.java @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2024 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.permissioncontroller.role.ui.behavior.v36; + +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.os.Build; +import android.os.UserHandle; + +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; +import androidx.preference.Preference; + +import com.android.permissioncontroller.permission.utils.Utils; +import com.android.permissioncontroller.role.ui.RequestRoleItemView; +import com.android.permissioncontroller.role.ui.TwoTargetPreference; +import com.android.permissioncontroller.role.ui.behavior.RoleUiBehavior; +import com.android.role.controller.model.Role; +import com.android.role.controller.util.UserUtils; + +import java.util.List; + +@RequiresApi(Build.VERSION_CODES.BAKLAVA) +public class ReservedForTestingProfileGroupExclusivityRoleUiBehavior implements RoleUiBehavior { + @Override + public void preparePreferenceAsUser(@NonNull Role role, @NonNull TwoTargetPreference preference, + @NonNull List<ApplicationInfo> applicationInfos, @NonNull UserHandle user, + @NonNull Context context) { + if (!applicationInfos.isEmpty()) { + preparePreferenceInternal(preference.asPreference(), applicationInfos.get(0), false, + user, context); + } + } + + @Override + public void prepareApplicationPreferenceAsUser(@NonNull Role role, + @NonNull Preference preference, @NonNull ApplicationInfo applicationInfo, + @NonNull UserHandle user, @NonNull Context context) { + preparePreferenceInternal(preference, applicationInfo, true, user, context); + } + + @Override + public void prepareRequestRoleItemViewAsUser(@NonNull Role role, + @NonNull RequestRoleItemView itemView, @NonNull ApplicationInfo applicationInfo, + @NonNull UserHandle user, @NonNull Context context) { + Context userContext = UserUtils.getUserContext(context, user); + String title = getTitle(applicationInfo, userContext); + itemView.getTitleTextView().setText(title); + } + + private void preparePreferenceInternal(@NonNull Preference preference, + @NonNull ApplicationInfo applicationInfo, boolean setTitle, @NonNull UserHandle user, + @NonNull Context context) { + Context userContext = UserUtils.getUserContext(context, user); + String title = getTitle(applicationInfo, userContext); + if (setTitle) { + preference.setTitle(title); + } else { + preference.setSummary(title); + } + } + + @NonNull + private static String getTitle(@NonNull ApplicationInfo applicationInfo, + @NonNull Context context) { + return Utils.getFullAppLabel(applicationInfo, context) + "@" + + UserHandle.getUserHandleForUid(applicationInfo.uid).getIdentifier(); + } +} diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/handheld/HandheldRadioPreference.java b/PermissionController/src/com/android/permissioncontroller/role/ui/handheld/HandheldRadioPreference.java index 67f04051c..2a943d3d7 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/handheld/HandheldRadioPreference.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/handheld/HandheldRadioPreference.java @@ -19,6 +19,7 @@ package com.android.permissioncontroller.role.ui.handheld; import android.content.Context; import android.content.Intent; import android.util.AttributeSet; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -28,12 +29,17 @@ import com.android.permissioncontroller.role.ui.RestrictionAwarePreferenceMixin; import com.android.permissioncontroller.role.ui.RoleApplicationPreference; import com.android.settingslib.widget.SelectorWithWidgetPreference; +import java.util.Objects; + /** * Preference used to represent apps that can be picked as a default app. */ public class HandheldRadioPreference extends SelectorWithWidgetPreference implements RoleApplicationPreference { + @Nullable + private String mContentDescription; + private final RestrictionAwarePreferenceMixin mRestrictionAwarePreferenceMixin = new RestrictionAwarePreferenceMixin(this); @@ -56,6 +62,14 @@ public class HandheldRadioPreference extends SelectorWithWidgetPreference implem } @Override + public void setContentDescription(@Nullable String contentDescription) { + if (!Objects.equals(mContentDescription, contentDescription)) { + mContentDescription = contentDescription; + notifyChanged(); + } + } + + @Override public void setRestrictionIntent(@Nullable Intent restrictionIntent) { mRestrictionAwarePreferenceMixin.setRestrictionIntent(restrictionIntent); } @@ -64,6 +78,9 @@ public class HandheldRadioPreference extends SelectorWithWidgetPreference implem public void onBindViewHolder(@NonNull PreferenceViewHolder holder) { super.onBindViewHolder(holder); + TextView titleText = (TextView) holder.findViewById(android.R.id.title); + titleText.setContentDescription(mContentDescription); + mRestrictionAwarePreferenceMixin.onAfterBindViewHolder(holder); } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/handheld/HandheldRolePreference.java b/PermissionController/src/com/android/permissioncontroller/role/ui/handheld/HandheldRolePreference.java index 3d09f0b46..46bf3b173 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/handheld/HandheldRolePreference.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/handheld/HandheldRolePreference.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.Intent; import android.util.AttributeSet; import android.view.View; +import android.widget.TextView; import androidx.annotation.AttrRes; import androidx.annotation.NonNull; @@ -33,6 +34,8 @@ import com.android.permissioncontroller.role.ui.RestrictionAwarePreferenceMixin; import com.android.permissioncontroller.role.ui.RolePreference; import com.android.settingslib.widget.TwoTargetPreference; +import java.util.Objects; + /** * {@link Preference} with a settings button. * @@ -45,6 +48,9 @@ public class HandheldRolePreference extends TwoTargetPreference implements RoleP new RestrictionAwarePreferenceMixin(this); @Nullable + private String mSummaryContentDescription; + + @Nullable private OnSecondTargetClickListener mOnSecondTargetClickListener; public HandheldRolePreference(@NonNull Context context, @Nullable AttributeSet attrs, @@ -94,6 +100,14 @@ public class HandheldRolePreference extends TwoTargetPreference implements RoleP } @Override + public void setSummaryContentDescription(@Nullable String summaryContentDescription) { + if (!Objects.equals(mSummaryContentDescription, summaryContentDescription)) { + mSummaryContentDescription = summaryContentDescription; + notifyChanged(); + } + } + + @Override public void setRestrictionIntent(@Nullable Intent restrictionIntent) { mRestrictionAwarePreferenceMixin.setRestrictionIntent(restrictionIntent); } @@ -114,6 +128,9 @@ public class HandheldRolePreference extends TwoTargetPreference implements RoleP // Make the settings button enabled even if the preference itself is disabled. settingsButton.setEnabled(true); + TextView summaryText = (TextView) holder.findViewById(android.R.id.summary); + summaryText.setContentDescription(mSummaryContentDescription); + mRestrictionAwarePreferenceMixin.onAfterBindViewHolder(holder); } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/SpecialAppAccessChildFragment.java b/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/SpecialAppAccessChildFragment.java index 0963635e7..7a13eb2b5 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/SpecialAppAccessChildFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/SpecialAppAccessChildFragment.java @@ -23,7 +23,6 @@ import android.content.pm.ApplicationInfo; import android.os.Bundle; import android.os.UserHandle; import android.util.ArrayMap; -import android.util.Pair; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -37,6 +36,7 @@ import androidx.preference.TwoStatePreference; import com.android.permissioncontroller.permission.utils.Utils; import com.android.permissioncontroller.role.ui.ManageRoleHolderStateLiveData; +import com.android.permissioncontroller.role.ui.RoleApplicationItem; import com.android.permissioncontroller.role.ui.RoleApplicationPreference; import com.android.permissioncontroller.role.utils.RoleUiBehaviorUtils; import com.android.role.controller.model.Role; @@ -107,12 +107,12 @@ public class SpecialAppAccessChildFragment<PF extends PreferenceFragmentCompat activity.getApplication()); mViewModel = new ViewModelProvider(this, viewModelFactory) .get(SpecialAppAccessViewModel.class); - mViewModel.getRoleLiveData().observe(this, this::onRoleChanged); + mViewModel.getLiveData().observe(this, this::onApplicationListChanged); mViewModel.observeManageRoleHolderState(this, this::onManageRoleHolderStateChanged); } - private void onRoleChanged( - @NonNull List<Pair<ApplicationInfo, Boolean>> qualifyingApplications) { + private void onApplicationListChanged( + @NonNull List<RoleApplicationItem> applicationItems) { PF preferenceFragment = requirePreferenceFragment(); PreferenceManager preferenceManager = preferenceFragment.getPreferenceManager(); Context context = preferenceManager.getContext(); @@ -138,14 +138,12 @@ public class SpecialAppAccessChildFragment<PF extends PreferenceFragmentCompat } } - int qualifyingApplicationsSize = qualifyingApplications.size(); - for (int i = 0; i < qualifyingApplicationsSize; i++) { - Pair<ApplicationInfo, Boolean> qualifyingApplication = qualifyingApplications.get(i); - ApplicationInfo qualifyingApplicationInfo = qualifyingApplication.first; - boolean isHolderPackage = qualifyingApplication.second; - - String key = qualifyingApplicationInfo.packageName + '_' - + qualifyingApplicationInfo.uid; + int applicationItemsSize = applicationItems.size(); + for (int i = 0; i < applicationItemsSize; i++) { + RoleApplicationItem applicationItem = applicationItems.get(i); + ApplicationInfo applicationInfo = applicationItem.getApplicationInfo(); + String key = applicationInfo.packageName + '_' + + applicationInfo.uid; RoleApplicationPreference roleApplicationPreference = (RoleApplicationPreference) oldPreferences.get(key); TwoStatePreference preference; @@ -153,24 +151,23 @@ public class SpecialAppAccessChildFragment<PF extends PreferenceFragmentCompat roleApplicationPreference = preferenceFragment.createApplicationPreference(); preference = roleApplicationPreference.asTwoStatePreference(); preference.setKey(key); - preference.setIcon(Utils.getBadgedIcon(context, qualifyingApplicationInfo)); - preference.setTitle(Utils.getFullAppLabel(qualifyingApplicationInfo, context)); + preference.setIcon(Utils.getBadgedIcon(context, applicationInfo)); + preference.setTitle(Utils.getFullAppLabel(applicationInfo, context)); preference.setPersistent(false); preference.setOnPreferenceChangeListener((preference2, newValue) -> false); preference.setOnPreferenceClickListener(this); preference.getExtras().putParcelable(PREFERENCE_EXTRA_APPLICATION_INFO, - qualifyingApplicationInfo); + applicationInfo); } else { preference = roleApplicationPreference.asTwoStatePreference(); } - preference.setChecked(isHolderPackage); - UserHandle user = UserHandle.getUserHandleForUid(qualifyingApplicationInfo.uid); + preference.setChecked(applicationItem.isHolderApplication()); + UserHandle user = UserHandle.getUserHandleForUid(applicationInfo.uid); roleApplicationPreference.setRestrictionIntent( - mRole.getApplicationRestrictionIntentAsUser(qualifyingApplicationInfo, user, - context)); + mRole.getApplicationRestrictionIntentAsUser(applicationInfo, user, context)); RoleUiBehaviorUtils.prepareApplicationPreferenceAsUser(mRole, roleApplicationPreference, - qualifyingApplicationInfo, user, context); + applicationInfo, user, context); preferenceScreen.addPreference(preference); } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/SpecialAppAccessListViewModel.java b/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/SpecialAppAccessListViewModel.java index ee5a0dbbd..e96fb0943 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/SpecialAppAccessListViewModel.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/SpecialAppAccessListViewModel.java @@ -26,6 +26,7 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.Transformations; import androidx.lifecycle.ViewModel; +import com.android.permissioncontroller.role.ui.MergeRoleListLiveData; import com.android.permissioncontroller.role.ui.RoleItem; import com.android.permissioncontroller.role.ui.RoleListLiveData; import com.android.permissioncontroller.role.ui.RoleListSortFunction; diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/SpecialAppAccessViewModel.java b/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/SpecialAppAccessViewModel.java index 0cc00abc1..f4abc0db1 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/SpecialAppAccessViewModel.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/SpecialAppAccessViewModel.java @@ -17,12 +17,10 @@ package com.android.permissioncontroller.role.ui.specialappaccess; import android.app.Application; -import android.content.pm.ApplicationInfo; import android.os.Process; import android.os.UserHandle; import android.util.ArrayMap; import android.util.Log; -import android.util.Pair; import androidx.annotation.NonNull; import androidx.lifecycle.AndroidViewModel; @@ -33,6 +31,8 @@ import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; import com.android.permissioncontroller.role.ui.ManageRoleHolderStateLiveData; +import com.android.permissioncontroller.role.ui.MergeRoleLiveData; +import com.android.permissioncontroller.role.ui.RoleApplicationItem; import com.android.permissioncontroller.role.ui.RoleLiveData; import com.android.permissioncontroller.role.ui.RoleSortFunction; import com.android.permissioncontroller.role.utils.UserUtils; @@ -51,7 +51,7 @@ public class SpecialAppAccessViewModel extends AndroidViewModel { private final Role mRole; @NonNull - private final LiveData<List<Pair<ApplicationInfo, Boolean>>> mRoleLiveData; + private final LiveData<List<RoleApplicationItem>> mLiveData; @NonNull private final ArrayMap<String, ManageRoleHolderStateLiveData> mManageRoleHolderStateLiveDatas = @@ -67,17 +67,17 @@ public class SpecialAppAccessViewModel extends AndroidViewModel { UserHandle workProfile = UserUtils.getWorkProfile(application); RoleSortFunction sortFunction = new RoleSortFunction(application); if (workProfile == null) { - mRoleLiveData = Transformations.map(roleLiveData, sortFunction); + mLiveData = Transformations.map(roleLiveData, sortFunction); } else { RoleLiveData workRoleLiveData = new RoleLiveData(role, workProfile, application); - mRoleLiveData = Transformations.map(new MergeRoleLiveData(roleLiveData, + mLiveData = Transformations.map(new MergeRoleLiveData(roleLiveData, workRoleLiveData), sortFunction); } } @NonNull - public LiveData<List<Pair<ApplicationInfo, Boolean>>> getRoleLiveData() { - return mRoleLiveData; + public LiveData<List<RoleApplicationItem>> getLiveData() { + return mLiveData; } /** diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/handheld/HandheldSwitchPreference.java b/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/handheld/HandheldSwitchPreference.java index ded6d5cb5..a801c2182 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/handheld/HandheldSwitchPreference.java +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/handheld/HandheldSwitchPreference.java @@ -19,6 +19,7 @@ package com.android.permissioncontroller.role.ui.specialappaccess.handheld; import android.content.Context; import android.content.Intent; import android.util.AttributeSet; +import android.widget.TextView; import androidx.annotation.AttrRes; import androidx.annotation.NonNull; @@ -30,10 +31,14 @@ import com.android.permissioncontroller.role.ui.RestrictionAwarePreferenceMixin; import com.android.permissioncontroller.role.ui.RoleApplicationPreference; import com.android.settingslib.widget.AppSwitchPreference; +import java.util.Objects; + /** {@link AppSwitchPreference} that is a role application preference. */ public class HandheldSwitchPreference extends AppSwitchPreference implements RoleApplicationPreference { + @Nullable + private String mContentDescription; private RestrictionAwarePreferenceMixin mRestrictionAwarePreferenceMixin = new RestrictionAwarePreferenceMixin(this); @@ -56,6 +61,14 @@ public class HandheldSwitchPreference extends AppSwitchPreference } @Override + public void setContentDescription(@Nullable String contentDescription) { + if (!Objects.equals(mContentDescription, contentDescription)) { + mContentDescription = contentDescription; + notifyChanged(); + } + } + + @Override public void setRestrictionIntent(@Nullable Intent restrictionIntent) { mRestrictionAwarePreferenceMixin.setRestrictionIntent(restrictionIntent); } @@ -64,6 +77,9 @@ public class HandheldSwitchPreference extends AppSwitchPreference public void onBindViewHolder(@NonNull PreferenceViewHolder holder) { super.onBindViewHolder(holder); + TextView titleText = (TextView) holder.findViewById(android.R.id.title); + titleText.setContentDescription(mContentDescription); + mRestrictionAwarePreferenceMixin.onAfterBindViewHolder(holder); } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppFragment.kt b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppFragment.kt index 156656e33..dc8f3bf88 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppFragment.kt +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppFragment.kt @@ -27,11 +27,11 @@ import androidx.compose.ui.platform.ComposeView import androidx.core.os.BundleCompat import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionTheme import com.android.permissioncontroller.role.ui.DefaultAppViewModel import com.android.permissioncontroller.role.ui.ManageRoleHolderStateLiveData import com.android.permissioncontroller.role.ui.wear.model.DefaultAppConfirmDialogViewModel import com.android.permissioncontroller.role.ui.wear.model.DefaultAppConfirmDialogViewModelFactory +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionTheme import com.android.role.controller.model.Role import com.android.role.controller.model.Roles @@ -46,14 +46,13 @@ class WearDefaultAppFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View? { val roleName = arguments?.getString(Intent.EXTRA_ROLE_NAME) ?: "" val user = arguments?.let { BundleCompat.getParcelable(it, Intent.EXTRA_USER, UserHandle::class.java)!! - } - ?: UserHandle.SYSTEM + } ?: UserHandle.SYSTEM val activity = requireActivity() role = @@ -82,7 +81,7 @@ class WearDefaultAppFragment : Fragment() { user, role, viewModel, - confirmDialogViewModel + confirmDialogViewModel, ) ) } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppHelper.kt b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppHelper.kt index a47719cf7..65548d9a1 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppHelper.kt +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppHelper.kt @@ -17,12 +17,11 @@ package com.android.permissioncontroller.role.ui.wear import android.content.Context -import android.content.pm.ApplicationInfo import android.os.UserHandle -import android.util.Pair import com.android.permissioncontroller.R import com.android.permissioncontroller.permission.utils.Utils import com.android.permissioncontroller.role.ui.DefaultAppViewModel +import com.android.permissioncontroller.role.ui.RoleApplicationItem import com.android.permissioncontroller.role.ui.wear.model.ConfirmDialogArgs import com.android.permissioncontroller.role.ui.wear.model.DefaultAppConfirmDialogViewModel import com.android.permissioncontroller.role.utils.RoleUiBehaviorUtils @@ -34,19 +33,19 @@ class WearDefaultAppHelper( val user: UserHandle, val role: Role, val viewModel: DefaultAppViewModel, - val confirmDialogViewModel: DefaultAppConfirmDialogViewModel + val confirmDialogViewModel: DefaultAppConfirmDialogViewModel, ) { fun getTitle() = context.getString(role.labelResource) fun getNonePreference( - qualifyingApplications: List<Pair<ApplicationInfo, Boolean>> + applicationItems: List<RoleApplicationItem> ): WearRoleApplicationPreference? = if (role.shouldShowNone()) { WearRoleApplicationPreference( context = context, defaultLabel = context.getString(R.string.default_app_none), - checked = !hasHolderApplication(qualifyingApplications), - onDefaultCheckChanged = { _ -> viewModel.setNoneDefaultApp() } + checked = !hasHolderApplication(applicationItems), + onDefaultCheckChanged = { _ -> viewModel.setNoneDefaultApp() }, ) .apply { icon = context.getDrawable(R.drawable.ic_remove_circle) } } else { @@ -54,12 +53,13 @@ class WearDefaultAppHelper( } fun getPreferences( - qualifyingApplications: List<Pair<ApplicationInfo, Boolean>> + applicationItems: List<RoleApplicationItem> ): List<WearRoleApplicationPreference> { - return qualifyingApplications - .map { pair -> - val appInfo = pair.first - val selected = pair.second + return applicationItems + .map { applicationItem -> + val appInfo = applicationItem.applicationInfo + val selected = applicationItem.isHolderApplication + val user = UserHandle.getUserHandleForUid(appInfo.uid) WearRoleApplicationPreference( context = context, defaultLabel = Utils.getFullAppLabel(appInfo, context), @@ -71,15 +71,19 @@ class WearDefaultAppHelper( RoleUiBehaviorUtils.getConfirmationMessage( role, packageName, - context + context, ) if (confirmationMessage != null) { - showConfirmDialog(packageName, confirmationMessage.toString()) + showConfirmDialog( + packageName, + user, + confirmationMessage.toString(), + ) } else { - setDefaultApp(packageName) + setDefaultApp(packageName, user) } } - } + }, ) .apply { icon = appInfo.loadIcon(context.packageManager) @@ -91,22 +95,22 @@ class WearDefaultAppHelper( this, appInfo, user, - context + context, ) } } .toList() } - private fun showConfirmDialog(packageName: String, message: String) { + private fun showConfirmDialog(packageName: String, userHandle: UserHandle, message: String) { confirmDialogViewModel.confirmDialogArgs = ConfirmDialogArgs( message = message, onOkButtonClick = { - setDefaultApp(packageName) + setDefaultApp(packageName, userHandle) dismissConfirmDialog() }, - onCancelButtonClick = { dismissConfirmDialog() } + onCancelButtonClick = { dismissConfirmDialog() }, ) confirmDialogViewModel.showConfirmDialogLiveData.value = true } @@ -116,13 +120,12 @@ class WearDefaultAppHelper( confirmDialogViewModel.showConfirmDialogLiveData.value = false } - private fun setDefaultApp(packageName: String) { - viewModel.setDefaultApp(packageName) + private fun setDefaultApp(packageName: String, user: UserHandle) { + viewModel.setDefaultApp(packageName, user) } fun getDescription() = context.getString(role.descriptionResource) - private fun hasHolderApplication( - qualifyingApplications: List<Pair<ApplicationInfo, Boolean>> - ): Boolean = qualifyingApplications.map { it.second }.contains(true) + private fun hasHolderApplication(applicationItems: List<RoleApplicationItem>): Boolean = + applicationItems.map { it.isHolderApplication }.contains(true) } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppListScreen.kt b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppListScreen.kt index afee50389..131897fb9 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppListScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppListScreen.kt @@ -29,11 +29,11 @@ import androidx.compose.ui.res.stringResource import androidx.lifecycle.LiveData import androidx.wear.compose.material.Text import com.android.permissioncontroller.R -import com.android.permissioncontroller.permission.ui.wear.elements.Chip -import com.android.permissioncontroller.permission.ui.wear.elements.ScrollableScreen -import com.android.permissioncontroller.permission.ui.wear.elements.chipDefaultColors -import com.android.permissioncontroller.permission.ui.wear.elements.chipDisabledColors import com.android.permissioncontroller.role.ui.RoleItem +import com.android.permissioncontroller.wear.permission.components.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButton +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButtonStyle +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionIconBuilder @Composable fun WearDefaultAppListScreen( @@ -52,20 +52,20 @@ fun WearDefaultAppListScreen( } preferences.forEach { pref -> item { - Chip( + WearPermissionButton( label = pref.label, - icon = pref.icon, - colors = - if (pref.isEnabled()) { - chipDefaultColors() + iconBuilder = pref.icon?.let { WearPermissionIconBuilder.builder(it) }, + style = + if (pref.isEnabled) { + WearPermissionButtonStyle.Secondary } else { - chipDisabledColors() + WearPermissionButtonStyle.DisabledLike }, secondaryLabel = pref.summary?.toString(), onClick = pref.getOnClicked(), modifier = Modifier.fillMaxWidth(), labelMaxLines = Int.MAX_VALUE, - secondaryLabelMaxLines = Integer.MAX_VALUE + secondaryLabelMaxLines = Integer.MAX_VALUE, ) } } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppScreen.kt b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppScreen.kt index 5d4233c6e..c3cbe4670 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearDefaultAppScreen.kt @@ -16,8 +16,6 @@ package com.android.permissioncontroller.role.ui.wear -import android.content.pm.ApplicationInfo -import android.util.Pair import androidx.compose.foundation.layout.Box import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -25,27 +23,32 @@ import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue -import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState -import androidx.wear.compose.material.ToggleChipDefaults -import com.android.permissioncontroller.permission.ui.wear.elements.AlertDialog -import com.android.permissioncontroller.permission.ui.wear.elements.ListFooter -import com.android.permissioncontroller.permission.ui.wear.elements.ScrollableScreen -import com.android.permissioncontroller.permission.ui.wear.elements.ToggleChip -import com.android.permissioncontroller.permission.ui.wear.elements.ToggleChipToggleControl -import com.android.permissioncontroller.permission.ui.wear.elements.toggleChipDisabledColors +import com.android.permissioncontroller.role.ui.RoleApplicationItem import com.android.permissioncontroller.role.ui.wear.model.ConfirmDialogArgs +import com.android.permissioncontroller.wear.permission.components.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.material3.DialogButtonContent +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionConfirmationDialog +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionIconBuilder +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionListFooter +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionToggleControl +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionToggleControlStyle +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionToggleControlType +import com.android.permissioncontroller.wear.permission.components.theme.ResourceHelper +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionMaterialUIVersion @Composable fun WearDefaultAppScreen(helper: WearDefaultAppHelper) { - val roleLiveData = helper.viewModel.roleLiveData.observeAsState(emptyList()) + val roleLiveData = helper.viewModel.liveData.observeAsState(emptyList()) val showConfirmDialog = helper.confirmDialogViewModel.showConfirmDialogLiveData.observeAsState(false) var isLoading by remember { mutableStateOf(true) } + val materialUIVersion = ResourceHelper.materialUIVersionInSettings Box { WearDefaultAppContent(isLoading, roleLiveData.value, helper) ConfirmDialog( + materialUIVersion = materialUIVersion, showDialog = showConfirmDialog.value, - args = helper.confirmDialogViewModel.confirmDialogArgs + args = helper.confirmDialogViewModel.confirmDialogArgs, ) } if (isLoading && roleLiveData.value.isNotEmpty()) { @@ -56,56 +59,60 @@ fun WearDefaultAppScreen(helper: WearDefaultAppHelper) { @Composable private fun WearDefaultAppContent( isLoading: Boolean, - qualifyingApplications: List<Pair<ApplicationInfo, Boolean>>, - helper: WearDefaultAppHelper + applicationItems: List<RoleApplicationItem>, + helper: WearDefaultAppHelper, ) { ScrollableScreen(title = helper.getTitle(), isLoading = isLoading) { - helper.getNonePreference(qualifyingApplications)?.let { + helper.getNonePreference(applicationItems)?.let { item { - ToggleChip( + WearPermissionToggleControl( label = it.title.toString(), - icon = it.icon, + iconBuilder = it.icon?.let { WearPermissionIconBuilder.builder(it) }, checked = it.checked, onCheckedChanged = it.onDefaultCheckChanged, - toggleControl = ToggleChipToggleControl.Radio, - labelMaxLine = Integer.MAX_VALUE + toggleControl = WearPermissionToggleControlType.Radio, + labelMaxLines = Integer.MAX_VALUE, ) } } - for (pref in helper.getPreferences(qualifyingApplications)) { + for (pref in helper.getPreferences(applicationItems)) { item { - ToggleChip( + WearPermissionToggleControl( label = pref.title.toString(), - icon = pref.icon, - colors = + iconBuilder = pref.icon?.let { WearPermissionIconBuilder.builder(it) }, + style = if (pref.isEnabled) { - ToggleChipDefaults.toggleChipColors() + WearPermissionToggleControlStyle.Default } else { - toggleChipDisabledColors() + WearPermissionToggleControlStyle.DisabledLike }, secondaryLabel = pref.summary?.toString(), checked = pref.checked, onCheckedChanged = pref.getOnCheckChanged(), - toggleControl = ToggleChipToggleControl.Radio, - labelMaxLine = Integer.MAX_VALUE, - secondaryLabelMaxLine = Integer.MAX_VALUE + toggleControl = WearPermissionToggleControlType.Radio, + labelMaxLines = Integer.MAX_VALUE, + secondaryLabelMaxLines = Integer.MAX_VALUE, ) } } - item { ListFooter(description = helper.getDescription()) } + item { WearPermissionListFooter(label = helper.getDescription()) } } } @Composable -private fun ConfirmDialog(showDialog: Boolean, args: ConfirmDialogArgs?) { - args?.let { - AlertDialog( - showDialog = showDialog, - message = it.message, - onOKButtonClick = it.onOkButtonClick, - onCancelButtonClick = it.onCancelButtonClick, - scalingLazyListState = rememberScalingLazyListState() +private fun ConfirmDialog( + materialUIVersion: WearPermissionMaterialUIVersion, + showDialog: Boolean, + args: ConfirmDialogArgs?, +) { + args?.run { + WearPermissionConfirmationDialog( + materialUIVersion = materialUIVersion, + show = showDialog, + message = message, + positiveButtonContent = DialogButtonContent(onClick = onOkButtonClick), + negativeButtonContent = DialogButtonContent(onClick = onCancelButtonClick), ) } } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleFragment.kt b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleFragment.kt index 728ea8e99..99f2fe36f 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleFragment.kt +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleFragment.kt @@ -32,12 +32,14 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import com.android.permissioncontroller.PermissionControllerStatsLog import com.android.permissioncontroller.permission.utils.PackageRemovalMonitor +import com.android.permissioncontroller.role.UserPackage import com.android.permissioncontroller.role.model.UserDeniedManager import com.android.permissioncontroller.role.ui.ManageRoleHolderStateLiveData import com.android.permissioncontroller.role.ui.RequestRoleViewModel import com.android.permissioncontroller.role.ui.wear.model.WearRequestRoleViewModel import com.android.permissioncontroller.role.ui.wear.model.WearRequestRoleViewModelFactory import com.android.permissioncontroller.role.utils.PackageUtils +import com.android.permissioncontroller.role.utils.UserUtils import com.android.role.controller.model.Role import com.android.role.controller.model.Roles import java.util.Objects @@ -56,7 +58,7 @@ class WearRequestRoleFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View? { roleName = arguments?.getString(Intent.EXTRA_ROLE_NAME) ?: "" packageName = arguments?.getString(Intent.EXTRA_PACKAGE_NAME) ?: "" @@ -74,12 +76,12 @@ class WearRequestRoleFragment : Fragment() { if (currentPackageNames.contains(packageName)) { Log.i( TAG, - "Application is already a role holder, role: $roleName, package: $packageName" + "Application is already a role holder, role: $roleName, package: $packageName", ) reportRequestResult( PermissionControllerStatsLog .ROLE_REQUEST_RESULT_REPORTED__RESULT__IGNORED_ALREADY_GRANTED, - null + null, ) clearDeniedSetResultOkAndFinish() return null @@ -89,7 +91,7 @@ class WearRequestRoleFragment : Fragment() { Log.w(TAG, "Unknown application: $packageName") reportRequestResult( PermissionControllerStatsLog.ROLE_REQUEST_RESULT_REPORTED__RESULT__IGNORED, - null + null, ) finish() return null @@ -98,7 +100,7 @@ class WearRequestRoleFragment : Fragment() { viewModel = ViewModelProvider( this, - RequestRoleViewModel.Factory(role, requireActivity().application) + RequestRoleViewModel.Factory(role, requireActivity().application), ) .get(RequestRoleViewModel::class.java) viewModel.manageRoleHolderStateLiveData.observe(this, this::onManageRoleHolderStateChanged) @@ -117,25 +119,25 @@ class WearRequestRoleFragment : Fragment() { roleName, packageName, viewModel, - wearViewModel + wearViewModel, ) - val onSetAsDefault: (Boolean, String?) -> Unit = { dontAskAgain, selectedPackageName -> + val onSetAsDefault: (Boolean, UserPackage?) -> Unit = { dontAskAgain, selectedUserPackage -> run { if (dontAskAgain) { Log.i( TAG, "Request denied with don't ask again, role: $roleName" + - ", package: $packageName" + ", package: $packageName", ) reportRequestResult( PermissionControllerStatsLog .ROLE_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_WITH_ALWAYS, - null + null, ) setDeniedAlwaysAndFinish() } else { - setRoleHolder(selectedPackageName) + setRoleHolder(selectedUserPackage) } } } @@ -143,7 +145,7 @@ class WearRequestRoleFragment : Fragment() { Log.i(TAG, "Dialog cancelled, role: $roleName , package: $packageName") reportRequestResult( PermissionControllerStatsLog.ROLE_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED, - null + null, ) setDeniedOnceAndFinish() } @@ -158,25 +160,28 @@ class WearRequestRoleFragment : Fragment() { when (state) { ManageRoleHolderStateLiveData.STATE_SUCCESS -> { val lastPackageName = liveData.lastPackageName + val lastUser = liveData.lastUser + val lastUserPackage: UserPackage? = + if (lastPackageName == null || lastUser == null) { + null + } else { + UserPackage.of(lastUser, lastPackageName) + } if (lastPackageName != null) { - role.onHolderSelectedAsUser( - lastPackageName, - liveData.lastUser, - requireContext() - ) + role.onHolderSelectedAsUser(lastPackageName, lastUser, requireContext()) } - if (lastPackageName == packageName) { + if (isRequestingApplication(lastUserPackage)) { Log.i( TAG, "Application added as a role holder, role: $roleName, package: " + - packageName + packageName, ) clearDeniedSetResultOkAndFinish() } else { Log.i( TAG, "Request denied with another application added as a role holder, " + - "role: $roleName, package: $packageName" + "role: $roleName, package: $packageName", ) setDeniedOnceAndFinish() } @@ -196,23 +201,24 @@ class WearRequestRoleFragment : Fragment() { finish() } - private fun reportRequestResult(result: Int, grantedAnotherPackageName: String?) { - val holderPackageName: String? = getHolderPackageName() + private fun reportRequestResult(result: Int, grantedUserPackage: UserPackage?) { + val holderUserPackage: UserPackage? = getHolderUserPackage() reportRequestResult( - getApplicationUid(packageName), + getRequestingApplicationUid(), packageName, roleName, getQualifyingApplicationCount(), - getQualifyingApplicationUid(holderPackageName), - holderPackageName, - getQualifyingApplicationUid(grantedAnotherPackageName), - grantedAnotherPackageName, - result + getQualifyingApplicationUid(holderUserPackage), + holderUserPackage?.packageName, + getQualifyingApplicationUid(grantedUserPackage), + grantedUserPackage?.packageName, + result, ) } - private fun getApplicationUid(packageName: String): Int { - val uid: Int = getQualifyingApplicationUid(packageName) + private fun getRequestingApplicationUid(): Int { + val uid: Int = + getQualifyingApplicationUid(UserPackage.of(Process.myUserHandle(), packageName)) if (uid != -1) { return uid } @@ -221,14 +227,15 @@ class WearRequestRoleFragment : Fragment() { return applicationInfo.uid } - private fun getQualifyingApplicationUid(packageName: String?): Int { - if (packageName == null) { + private fun getQualifyingApplicationUid(userPackage: UserPackage?): Int { + if (userPackage == null) { return -1 } - viewModel.roleLiveData.value?.let { qualifyingApplications -> - for (qualifyingApplication in qualifyingApplications) { - val qualifyingApplicationInfo = qualifyingApplication.first - if (Objects.equals(qualifyingApplicationInfo.packageName, packageName)) { + viewModel.liveData.value?.let { applicationItems -> + for (applicationItem in applicationItems) { + val qualifyingApplicationInfo = applicationItem.applicationInfo + val qualifyingUserPackage = UserPackage.from(qualifyingApplicationInfo) + if (Objects.equals(qualifyingUserPackage, userPackage)) { return qualifyingApplicationInfo.uid } } @@ -236,12 +243,11 @@ class WearRequestRoleFragment : Fragment() { return -1 } - private fun getHolderPackageName(): String? { - viewModel.roleLiveData.value?.let { qualifyingApplications -> + private fun getHolderUserPackage(): UserPackage? { + viewModel.liveData.value?.let { qualifyingApplications -> for (qualifyingApplication in qualifyingApplications) { - val isHolderApplication = qualifyingApplication.second - if (isHolderApplication) { - return qualifyingApplication.first.packageName + if (qualifyingApplication.isHolderApplication) { + return UserPackage.from(qualifyingApplication.applicationInfo) } } } @@ -249,7 +255,7 @@ class WearRequestRoleFragment : Fragment() { } private fun getQualifyingApplicationCount(): Int { - return viewModel.roleLiveData.value?.size ?: -1 + return viewModel.liveData.value?.size ?: -1 } private fun setDeniedAlwaysAndFinish() { @@ -261,49 +267,58 @@ class WearRequestRoleFragment : Fragment() { requireActivity().finish() } - private fun setRoleHolder(selectedPackageName: String?) { + private fun setRoleHolder(selectedUserPackage: UserPackage?) { val context: Context = requireContext() - val user: UserHandle = Process.myUserHandle() - if (selectedPackageName == null) { + if (selectedUserPackage == null) { reportRequestResult( PermissionControllerStatsLog .ROLE_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_GRANTED_ANOTHER, - null + null, ) + val user: UserHandle = + if (role.exclusivity == Role.EXCLUSIVITY_PROFILE_GROUP) { + UserUtils.getProfileParentOrSelf(Process.myUserHandle(), context) + } else { + Process.myUserHandle() + } role.onNoneHolderSelectedAsUser(user, context) viewModel.manageRoleHolderStateLiveData.clearRoleHoldersAsUser( roleName, 0, user, - context + context, ) } else { - val isRequestingApplication = selectedPackageName == packageName + val isRequestingApplication = isRequestingApplication(selectedUserPackage) if (isRequestingApplication) { reportRequestResult( PermissionControllerStatsLog.ROLE_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED, - null + null, ) } else { reportRequestResult( PermissionControllerStatsLog .ROLE_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_GRANTED_ANOTHER, - selectedPackageName + selectedUserPackage, ) } val flags = if (isRequestingApplication) RoleManager.MANAGE_HOLDERS_FLAG_DONT_KILL_APP else 0 viewModel.manageRoleHolderStateLiveData.setRoleHolderAsUser( roleName, - selectedPackageName, + selectedUserPackage.packageName, true, flags, - user, - context + selectedUserPackage.user, + context, ) } } + private fun isRequestingApplication(userPackage: UserPackage?): Boolean { + return Objects.equals(userPackage, UserPackage.of(Process.myUserHandle(), packageName)) + } + override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) wearViewModel.onSaveInstanceState(outState) @@ -318,12 +333,12 @@ class WearRequestRoleFragment : Fragment() { TAG, "Application is uninstalled, role: $roleName" + ", package: " + - packageName + packageName, ) reportRequestResult( PermissionControllerStatsLog .ROLE_REQUEST_RESULT_REPORTED__RESULT__IGNORED, - null + null, ) finish() } @@ -364,7 +379,7 @@ class WearRequestRoleFragment : Fragment() { currentPackageName: String?, grantedAnotherUid: Int, grantedAnotherPackageName: String?, - result: Int + result: Int, ) { Log.i( TAG, @@ -376,7 +391,7 @@ class WearRequestRoleFragment : Fragment() { " currentPackageName=$currentPackageName" + " grantedAnotherUid=$grantedAnotherUid" + " grantedAnotherPackageName=$grantedAnotherPackageName" + - " result=$result" + " result=$result", ) PermissionControllerStatsLog.write( PermissionControllerStatsLog.ROLE_REQUEST_RESULT_REPORTED, @@ -388,7 +403,7 @@ class WearRequestRoleFragment : Fragment() { currentPackageName, grantedAnotherUid, grantedAnotherPackageName, - result + result, ) } } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleHelper.kt b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleHelper.kt index c7f14b862..f95f1ee90 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleHelper.kt +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleHelper.kt @@ -19,13 +19,16 @@ package com.android.permissioncontroller.role.ui.wear import android.content.Context import android.content.pm.ApplicationInfo import android.graphics.drawable.Drawable -import android.util.Pair +import android.os.Process import com.android.permissioncontroller.R import com.android.permissioncontroller.permission.utils.Utils +import com.android.permissioncontroller.role.UserPackage import com.android.permissioncontroller.role.model.UserDeniedManager import com.android.permissioncontroller.role.ui.RequestRoleViewModel +import com.android.permissioncontroller.role.ui.RoleApplicationItem import com.android.permissioncontroller.role.ui.wear.model.WearRequestRoleViewModel import com.android.role.controller.model.Role +import java.util.Objects /** A helper class for [WearRequestRoleScreen]. */ class WearRequestRoleHelper( @@ -35,7 +38,7 @@ class WearRequestRoleHelper( val roleName: String, val packageName: String, val viewModel: RequestRoleViewModel, - val wearViewModel: WearRequestRoleViewModel + val wearViewModel: WearRequestRoleViewModel, ) { fun getIcon() = Utils.getBadgedIcon(context, applicationInfo) @@ -47,13 +50,13 @@ class WearRequestRoleHelper( UserDeniedManager.getInstance(context).isDeniedOnce(roleName, packageName) fun getNonePreference( - qualifyingApplications: List<Pair<ApplicationInfo, Boolean>>, - selectedPackage: String? + applicationItems: List<RoleApplicationItem>, + selectedPackage: UserPackage?, ): RequestRolePreference? = if (role.shouldShowNone()) { - val hasHolderApplication = hasHolderApplication(qualifyingApplications) + val hasHolderApplication = hasHolderApplication(applicationItems) RequestRolePreference( - packageName = null, + userPackage = null, label = context.getString(R.string.default_app_none), subTitle = if (!hasHolderApplication) { @@ -62,66 +65,70 @@ class WearRequestRoleHelper( null }, icon = context.getDrawable(R.drawable.ic_remove_circle), - checked = selectedPackage.isNullOrEmpty(), + checked = selectedPackage == null, enabled = if (!wearViewModel.dontAskAgain()) { true } else { !hasHolderApplication }, - isHolder = !hasHolderApplication + isHolder = !hasHolderApplication, ) } else { null } fun getPreferences( - qualifyingApplications: List<Pair<ApplicationInfo, Boolean>>, - selectedPackage: String? + applicationItems: List<RoleApplicationItem>, + selectedPackage: UserPackage?, ): List<RequestRolePreference> { - return qualifyingApplications - .map { qualifyingApplication -> + return applicationItems + .map { applicationItem -> + val userPackage = UserPackage.from(applicationItem.applicationInfo) RequestRolePreference( - packageName = qualifyingApplication.first.packageName, - label = Utils.getAppLabel(qualifyingApplication.first, context), + userPackage = userPackage, + label = Utils.getAppLabel(applicationItem.applicationInfo, context), subTitle = - if (qualifyingApplication.second) { + if (applicationItem.isHolderApplication) { context.getString(R.string.request_role_current_default) } else { context.getString(role.requestDescriptionResource) }, - icon = Utils.getBadgedIcon(context, qualifyingApplication.first), - checked = qualifyingApplication.first.packageName.equals(selectedPackage), + icon = Utils.getBadgedIcon(context, applicationItem.applicationInfo), + checked = Objects.equals(userPackage, selectedPackage), enabled = if (!wearViewModel.dontAskAgain()) { true } else { - qualifyingApplication.second + applicationItem.isHolderApplication }, - isHolder = qualifyingApplication.second + isHolder = applicationItem.isHolderApplication, ) } .toList() } - private fun hasHolderApplication( - qualifyingApplications: List<Pair<ApplicationInfo, Boolean>> - ): Boolean = qualifyingApplications.map { it.second }.contains(true) + private fun hasHolderApplication(applicationItems: List<RoleApplicationItem>): Boolean = + applicationItems.map { it.isHolderApplication }.contains(true) fun shouldSetAsDefaultEnabled(enabled: Boolean): Boolean { return enabled && (wearViewModel.dontAskAgain() || !wearViewModel.isHolderChecked) } - fun initializeHolderPackageName(qualifyingApplications: List<Pair<ApplicationInfo, Boolean>>) { - wearViewModel.holderPackageName = - qualifyingApplications.find { it.second }?.first?.packageName + fun initializeHolderPackage(applicationItems: List<RoleApplicationItem>) { + wearViewModel.holderPackage = + applicationItems + .find { it.isHolderApplication } + ?.applicationInfo + ?.let { appInfo -> UserPackage.from(appInfo) } } - fun initializeSelectedPackageName() { - if (wearViewModel.holderPackageName == null) { - wearViewModel.selectedPackageName.value = null + fun initializeSelectedPackage() { + if (wearViewModel.holderPackage == null) { + wearViewModel.selectedPackage.value = null } else { - wearViewModel.selectedPackageName.value = packageName + wearViewModel.selectedPackage.value = + UserPackage.of(Process.myUserHandle(), packageName) } } @@ -131,7 +138,7 @@ class WearRequestRoleHelper( val icon: Drawable?, val checked: Boolean, val enabled: Boolean, - val packageName: String?, - val isHolder: Boolean + val userPackage: UserPackage?, + val isHolder: Boolean, ) } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleScreen.kt b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleScreen.kt index aa9b31e0d..1367f4c3c 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleScreen.kt +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRequestRoleScreen.kt @@ -16,8 +16,6 @@ package com.android.permissioncontroller.role.ui.wear -import android.content.pm.ApplicationInfo -import android.util.Pair import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height import androidx.compose.runtime.Composable @@ -31,67 +29,62 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.android.permissioncontroller.R -import com.android.permissioncontroller.permission.ui.wear.elements.ScrollableScreen -import com.android.permissioncontroller.permission.ui.wear.elements.ToggleChipToggleControl -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionButton -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionButtonStyle -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionIconBuilder -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionListFooter -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionToggleControl -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionToggleControlStyle -import com.android.permissioncontroller.permission.ui.wear.theme.ResourceHelper -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion.MATERIAL2_5 -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion.MATERIAL3 +import com.android.permissioncontroller.role.UserPackage import com.android.permissioncontroller.role.ui.ManageRoleHolderStateLiveData +import com.android.permissioncontroller.role.ui.RoleApplicationItem +import com.android.permissioncontroller.wear.permission.components.ScrollableScreen +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButton +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButtonStyle +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionIconBuilder +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionListFooter +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionToggleControl +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionToggleControlStyle +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionToggleControlType +import com.android.permissioncontroller.wear.permission.components.theme.ResourceHelper +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionMaterialUIVersion @Composable fun WearRequestRoleScreen( helper: WearRequestRoleHelper, - onSetAsDefault: (Boolean, String?) -> Unit, + onSetAsDefault: (Boolean, UserPackage?) -> Unit, onCanceled: () -> Unit, ) { - val roleLiveData = helper.viewModel.roleLiveData.observeAsState(emptyList()) + val roleLiveData = helper.viewModel.liveData.observeAsState(emptyList()) val manageRoleHolderState = helper.viewModel.manageRoleHolderStateLiveData.observeAsState( ManageRoleHolderStateLiveData.STATE_WORKING ) val dontAskAgain = helper.wearViewModel.dontAskAgain.observeAsState(false) - val selectedPackageName = helper.wearViewModel.selectedPackageName.observeAsState(null) + val selectedPackage = helper.wearViewModel.selectedPackage.observeAsState(null) var isLoading by remember { mutableStateOf(true) } if (isLoading && roleLiveData.value.isNotEmpty()) { - helper.initializeHolderPackageName(roleLiveData.value) - helper.initializeSelectedPackageName() + helper.initializeHolderPackage(roleLiveData.value) + helper.initializeSelectedPackage() } - val onCheckedChanged: (Boolean, String?, Boolean) -> Unit = { checked, packageName, isHolder -> - if (checked) { - helper.wearViewModel.selectedPackageName.value = packageName - helper.wearViewModel.isHolderChecked = isHolder + val onCheckedChanged: (Boolean, UserPackage?, Boolean) -> Unit = + { checked, userPackage, isHolder -> + if (checked) { + helper.wearViewModel.selectedPackage.value = userPackage + helper.wearViewModel.isHolderChecked = isHolder + } } - } val onDontAskAgainCheckedChanged: (Boolean) -> Unit = { checked -> helper.wearViewModel.dontAskAgain.value = checked if (checked) { - helper.initializeSelectedPackageName() + helper.initializeSelectedPackage() } } - val materialUIVersion = - if (ResourceHelper.material3Enabled) { - MATERIAL3 - } else { - MATERIAL2_5 - } WearRequestRoleContent( - materialUIVersion, + ResourceHelper.materialUIVersionInApp, isLoading, helper, roleLiveData.value, manageRoleHolderState.value == ManageRoleHolderStateLiveData.STATE_IDLE, dontAskAgain.value, - selectedPackageName.value, + selectedPackage.value, onCheckedChanged, onDontAskAgainCheckedChanged, onSetAsDefault, @@ -108,13 +101,13 @@ internal fun WearRequestRoleContent( materialUIVersion: WearPermissionMaterialUIVersion, isLoading: Boolean, helper: WearRequestRoleHelper, - qualifyingApplications: List<Pair<ApplicationInfo, Boolean>>, + applicationItems: List<RoleApplicationItem>, enabled: Boolean, dontAskAgain: Boolean, - selectedPackageName: String?, - onCheckedChanged: (Boolean, String?, Boolean) -> Unit, + selectedPackage: UserPackage?, + onCheckedChanged: (Boolean, UserPackage?, Boolean) -> Unit, onDontAskAgainCheckedChanged: (Boolean) -> Unit, - onSetAsDefault: (Boolean, String?) -> Unit, + onSetAsDefault: (Boolean, UserPackage?) -> Unit, onCanceled: () -> Unit, ) { ScrollableScreen( @@ -124,7 +117,7 @@ internal fun WearRequestRoleContent( showTimeText = false, isLoading = isLoading, ) { - helper.getNonePreference(qualifyingApplications, selectedPackageName)?.let { pref -> + helper.getNonePreference(applicationItems, selectedPackage)?.let { pref -> item { WearPermissionToggleControl( materialUIVersion = materialUIVersion, @@ -133,9 +126,9 @@ internal fun WearRequestRoleContent( enabled = enabled && pref.enabled, checked = pref.checked, onCheckedChanged = { checked -> - onCheckedChanged(checked, pref.packageName, pref.isHolder) + onCheckedChanged(checked, pref.userPackage, pref.isHolder) }, - toggleControl = ToggleChipToggleControl.Radio, + toggleControl = WearPermissionToggleControlType.Radio, labelMaxLines = Integer.MAX_VALUE, ) } @@ -149,7 +142,7 @@ internal fun WearRequestRoleContent( } } - for (pref in helper.getPreferences(qualifyingApplications, selectedPackageName)) { + for (pref in helper.getPreferences(applicationItems, selectedPackage)) { item { WearPermissionToggleControl( materialUIVersion = materialUIVersion, @@ -158,9 +151,9 @@ internal fun WearRequestRoleContent( enabled = enabled && pref.enabled, checked = pref.checked, onCheckedChanged = { checked -> - onCheckedChanged(checked, pref.packageName, pref.isHolder) + onCheckedChanged(checked, pref.userPackage, pref.isHolder) }, - toggleControl = ToggleChipToggleControl.Radio, + toggleControl = WearPermissionToggleControlType.Radio, ) } pref.subTitle?.let { subTitle -> @@ -181,7 +174,7 @@ internal fun WearRequestRoleContent( enabled = enabled, onCheckedChanged = { checked -> run { onDontAskAgainCheckedChanged(checked) } }, label = stringResource(R.string.request_role_dont_ask_again), - toggleControl = ToggleChipToggleControl.Checkbox, + toggleControl = WearPermissionToggleControlType.Checkbox, style = WearPermissionToggleControlStyle.Transparent, modifier = Modifier.testTag("com.android.permissioncontroller:id/dont_ask_again"), @@ -197,7 +190,7 @@ internal fun WearRequestRoleContent( label = stringResource(R.string.request_role_set_as_default), style = WearPermissionButtonStyle.Primary, enabled = helper.shouldSetAsDefaultEnabled(enabled), - onClick = { onSetAsDefault(dontAskAgain, selectedPackageName) }, + onClick = { onSetAsDefault(dontAskAgain, selectedPackage) }, modifier = Modifier.testTag("android:id/button1"), ) } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRoleApplicationPreference.kt b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRoleApplicationPreference.kt index 6cd52f576..cb12bf70a 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRoleApplicationPreference.kt +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRoleApplicationPreference.kt @@ -18,6 +18,7 @@ package com.android.permissioncontroller.role.ui.wear import android.content.Context import android.content.Intent +import androidx.preference.PreferenceViewHolder import androidx.preference.TwoStatePreference import com.android.permissioncontroller.role.ui.RoleApplicationPreference @@ -30,7 +31,8 @@ class WearRoleApplicationPreference( defaultLabel: String, val checked: Boolean, val onDefaultCheckChanged: (Boolean) -> Unit = {}, - private var restrictionIntent: Intent? = null + private var restrictionIntent: Intent? = null, + private var contentDescription: String? = null, ) : TwoStatePreference(context), RoleApplicationPreference { init { title = defaultLabel @@ -39,10 +41,22 @@ class WearRoleApplicationPreference( fun getOnCheckChanged(): (Boolean) -> Unit = restrictionIntent?.let { { _ -> context.startActivity(it) } } ?: onDefaultCheckChanged + override fun setContentDescription(contentDescription: String?) { + if (this.contentDescription != contentDescription) { + this.contentDescription = contentDescription + notifyChanged() + } + } + override fun setRestrictionIntent(restrictionIntent: Intent?) { this.restrictionIntent = restrictionIntent isEnabled = restrictionIntent == null } override fun asTwoStatePreference(): TwoStatePreference = this + + override fun onBindViewHolder(holder: PreferenceViewHolder) { + super.onBindViewHolder(holder) + holder.findViewById(android.R.id.title)?.let { it.contentDescription = contentDescription } + } } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRolePreference.kt b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRolePreference.kt index 43acf4293..670c136ea 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRolePreference.kt +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/WearRolePreference.kt @@ -19,6 +19,7 @@ package com.android.permissioncontroller.role.ui.wear import android.content.Context import android.content.Intent import androidx.preference.Preference +import androidx.preference.PreferenceViewHolder import com.android.permissioncontroller.role.ui.RolePreference import com.android.permissioncontroller.role.ui.TwoTargetPreference.OnSecondTargetClickListener import com.android.settingslib.widget.TwoTargetPreference @@ -28,13 +29,21 @@ class WearRolePreference( context: Context, val label: String, val onDefaultClicked: () -> Unit = {}, - private var restrictionIntent: Intent? = null + private var restrictionIntent: Intent? = null, + private var summaryContentDescription: String? = null, ) : TwoTargetPreference(context), RolePreference { override fun setOnSecondTargetClickListener(listener: OnSecondTargetClickListener?) { // no-op } + override fun setSummaryContentDescription(summaryContentDescription: String?) { + if (this.summaryContentDescription != summaryContentDescription) { + this.summaryContentDescription = summaryContentDescription + notifyChanged() + } + } + override fun setRestrictionIntent(restrictionIntent: Intent?) { this.restrictionIntent = restrictionIntent setEnabled(restrictionIntent == null) @@ -42,6 +51,14 @@ class WearRolePreference( override fun asPreference(): Preference = this + override fun onBindViewHolder(holder: PreferenceViewHolder) { + super.onBindViewHolder(holder) + + holder.findViewById(android.R.id.summary)?.let { + it.contentDescription = summaryContentDescription + } + } + fun getOnClicked(): () -> Unit = restrictionIntent?.let { { context.startActivity(it) } } ?: onDefaultClicked } diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/model/WearRequestRoleViewModel.kt b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/model/WearRequestRoleViewModel.kt index 692533916..7cc0b2b52 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/ui/wear/model/WearRequestRoleViewModel.kt +++ b/PermissionController/src/com/android/permissioncontroller/role/ui/wear/model/WearRequestRoleViewModel.kt @@ -17,16 +17,18 @@ package com.android.permissioncontroller.role.ui.wear.model import android.os.Bundle +import androidx.core.os.BundleCompat import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider +import com.android.permissioncontroller.role.UserPackage /** ViewModel for WearRequestRoleScreen. */ class WearRequestRoleViewModel : ViewModel() { val dontAskAgain = MutableLiveData<Boolean>(false) - val selectedPackageName = MutableLiveData<String?>(null) + val selectedPackage = MutableLiveData<UserPackage?>(null) var isHolderChecked: Boolean = false - var holderPackageName: String? = null + var holderPackage: UserPackage? = null fun dontAskAgain(): Boolean { return dontAskAgain.value ?: false @@ -34,20 +36,25 @@ class WearRequestRoleViewModel : ViewModel() { fun onSaveInstanceState(outState: Bundle) { outState.putBoolean(STATE_DONT_ASK_AGAIN, dontAskAgain()) - outState.putString(STATE_SELECTED_PACKAGE_NAME, selectedPackageName.value) + outState.putParcelable(STATE_SELECTED_USER_PACKAGE, selectedPackage.value) outState.putBoolean(STATE_IS_HOLDER_CHECKED, isHolderChecked) } fun onRestoreInstanceState(savedInstanceState: Bundle) { dontAskAgain.value = savedInstanceState.getBoolean(STATE_DONT_ASK_AGAIN) - selectedPackageName.value = savedInstanceState.getString(STATE_SELECTED_PACKAGE_NAME) isHolderChecked = savedInstanceState.getBoolean(STATE_IS_HOLDER_CHECKED) + selectedPackage.value = + BundleCompat.getParcelable( + savedInstanceState, + STATE_SELECTED_USER_PACKAGE, + UserPackage::class.java, + ) } companion object { const val STATE_DONT_ASK_AGAIN = "WearRequestRoleViewModel.state.DONT_ASK_AGAIN" - const val STATE_SELECTED_PACKAGE_NAME = - "WearRequestRoleViewModel.state.SELECTED_PACKAGE_NAME" + const val STATE_SELECTED_USER_PACKAGE = + "WearRequestRoleViewModel.state.SELECTED_USER_PACKAGE" const val STATE_IS_HOLDER_CHECKED = "WearRequestRoleViewModel.state.IS_HOLDER_CHECKED" } } @@ -55,6 +62,7 @@ class WearRequestRoleViewModel : ViewModel() { /** Factory for a WearRequestRoleViewModel */ class WearRequestRoleViewModelFactory : ViewModelProvider.Factory { override fun <T : ViewModel> create(modelClass: Class<T>): T { - @Suppress("UNCHECKED_CAST") return WearRequestRoleViewModel() as T + @Suppress("UNCHECKED_CAST") + return WearRequestRoleViewModel() as T } } diff --git a/PermissionController/src/com/android/permissioncontroller/role/utils/RoleUiBehaviorUtils.java b/PermissionController/src/com/android/permissioncontroller/role/utils/RoleUiBehaviorUtils.java index c11a74259..255d88ff0 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/utils/RoleUiBehaviorUtils.java +++ b/PermissionController/src/com/android/permissioncontroller/role/utils/RoleUiBehaviorUtils.java @@ -26,12 +26,14 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.permissioncontroller.role.ui.RequestRoleItemView; +import com.android.permissioncontroller.role.ui.RoleApplicationItem; import com.android.permissioncontroller.role.ui.RoleApplicationPreference; import com.android.permissioncontroller.role.ui.RolePreference; import com.android.permissioncontroller.role.ui.behavior.RoleUiBehavior; import com.android.role.controller.model.Role; import java.util.List; +import java.util.function.Predicate; /** * Utility methods for Role UI behavior @@ -117,6 +119,19 @@ public final class RoleUiBehaviorUtils { } /** + * @see RoleUiBehavior#getRecommendedApplicationFilter + */ + @NonNull + public static Predicate<RoleApplicationItem> getRecommendedApplicationFilter( + @NonNull Role role, @NonNull Context context) { + RoleUiBehavior uiBehavior = getUiBehavior(role); + if (uiBehavior == null) { + return applicationItem -> false; + } + return uiBehavior.getRecommendedApplicationFilter(role, context); + } + + /** * @see RoleUiBehavior#getConfirmationMessage */ @Nullable diff --git a/PermissionController/src/com/android/permissioncontroller/role/utils/UserUtils.java b/PermissionController/src/com/android/permissioncontroller/role/utils/UserUtils.java index 339b2a12a..10e8dd0e1 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/utils/UserUtils.java +++ b/PermissionController/src/com/android/permissioncontroller/role/utils/UserUtils.java @@ -37,11 +37,24 @@ public class UserUtils { private UserUtils() {} /** + * Returns the parent of a given user, or user if it has no parent (e.g. it is the primary + * user) + */ + @NonNull + public static UserHandle getProfileParentOrSelf(@NonNull UserHandle user, + @NonNull Context context) { + return com.android.role.controller.util.UserUtils.getProfileParentOrSelf(user, context); + } + + /** * Get the work profile of current user, if any. + * <p> + * If {@link Process#myUserHandle()} is the work profile, then {@code null} is returned * * @param context the {@code Context} to retrieve system services * - * @return the work profile of current user, or {@code null} if none + * @return the work profile of current user, or {@code null} if none or if work profile is the + * current process user */ @Nullable public static UserHandle getWorkProfile(@NonNull Context context) { @@ -65,6 +78,30 @@ public class UserUtils { } /** + * Get the work profile of current profile-group, if any. + * <p> + * {@link Process#myUserHandle()} may be the work profile, and is a valid returned value + * + * @param context the {@code Context} to retrieve system services + * + * @return the work profile in the current profile-group, or {@code null} if none + */ + @Nullable + public static UserHandle getWorkProfileOrSelf(@NonNull Context context) { + UserManager userManager = context.getSystemService(UserManager.class); + List<UserHandle> profiles = userManager.getUserProfiles(); + int profilesSize = profiles.size(); + for (int i = 0; i < profilesSize; i++) { + UserHandle profile = profiles.get(i); + if (!userManager.isManagedProfile(profile.getIdentifier())) { + continue; + } + return profile; + } + return null; + } + + /** * Get the private profile of current user, if any. * * @param context the {@code Context} to retrieve system services @@ -94,9 +131,15 @@ public class UserUtils { return null; } + /** + * Returns whether the user is a private profile or not. + * + * @param userHandle the {@code UserHandle} to check is private profile + * @param context the {@code Context} to retrieve system services + */ private static boolean isPrivateProfile(@NonNull UserHandle userHandle, @NonNull Context context) { - if (!SdkLevel.isAtLeastV() || !android.os.Flags.allowPrivateProfile()) { + if (!SdkLevel.isAtLeastV()) { return false; } Context userContext = context.createContextAsUser(userHandle, /* flags= */ 0); diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterSearchIndexablesProvider.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterSearchIndexablesProvider.kt index c5e59d3df..307ef9cf6 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterSearchIndexablesProvider.kt +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/service/SafetyCenterSearchIndexablesProvider.kt @@ -81,7 +81,7 @@ class SafetyCenterSearchIndexablesProvider : BaseSearchIndexablesProvider() { cursor.addSafetySourcesGroupRow( safetySourcesGroup, safetyCenterResourcesApk, - screenTitle + screenTitle, ) } safetySourcesGroup.safetySources @@ -93,7 +93,7 @@ class SafetyCenterSearchIndexablesProvider : BaseSearchIndexablesProvider() { safetySource, safetyCenterResourcesApk, safetyCenterManager, - screenTitle + screenTitle, ) } } @@ -123,14 +123,14 @@ class SafetyCenterSearchIndexablesProvider : BaseSearchIndexablesProvider() { collectAllRemovableKeys( safetyCenterManager, keysToRemove, - staticEntryGroupsAreRemovable = SdkLevel.isAtLeastU() + staticEntryGroupsAreRemovable = SdkLevel.isAtLeastU(), ) keepActiveEntriesFromRemoval(safetyCenterManager, context, keysToRemove) } else { collectAllRemovableKeys( safetyCenterManager, keysToRemove, - staticEntryGroupsAreRemovable = true + staticEntryGroupsAreRemovable = true, ) } @@ -169,8 +169,6 @@ class SafetyCenterSearchIndexablesProvider : BaseSearchIndexablesProvider() { ) { val searchTerms = safetyCenterResourcesApk.getNotEmptyStringOrNull(safetySource.searchTermsResId) - var isPersonalEntryAdded = false - var isWorkEntryAdded = false fun MatrixCursor.addIndexableRow(title: CharSequence, profileType: ProfileType) = newRow() @@ -181,40 +179,41 @@ class SafetyCenterSearchIndexablesProvider : BaseSearchIndexablesProvider() { .add(COLUMN_INTENT_ACTION, Intent.ACTION_SAFETY_CENTER) .add(COLUMN_SCREEN_TITLE, screenTitle) - if (safetySource.id == BIOMETRIC_SOURCE_ID) { - // Correct Biometric Unlock title is only available when Biometric SafetySource have - // sent the data to SafetyCenter. Only the main user and the work profile send data for - // the Biometric Safety Source. + // If we prefer live title instead of config title for this entry, check for live source + // data first. Then later, add all missing entries that weren't found in live source data. + // Even if we index hidden entries, those will be filtered out via queryNonIndexableKeys. + var isSourceDataPersonalEntryAdded = false + var isSourceDataWorkEntryAdded = false + if (biometricsSources.contains(safetySource.id)) { context.getSystemService(UserManager::class.java)?.let { userManager -> safetyCenterManager.safetyEntries - .associateBy { it.entryId } - .filter { it.key.safetySourceId == BIOMETRIC_SOURCE_ID } + .filter { it.entryId.safetySourceId == safetySource.id } .forEach { - val isWorkProfile = userManager.isManagedProfile(it.key.userId) + val isWorkProfile = userManager.isManagedProfile(it.entryId.userId) if (isWorkProfile) { - isWorkEntryAdded = true - addIndexableRow(it.value.title, ProfileType.MANAGED) + addIndexableRow(it.title, ProfileType.MANAGED) + isSourceDataWorkEntryAdded = true } else { - addIndexableRow(it.value.title, ProfileType.PRIMARY) - isPersonalEntryAdded = true + addIndexableRow(it.title, ProfileType.PRIMARY) + isSourceDataPersonalEntryAdded = true } } } } - if (!isPersonalEntryAdded) { + if (!isSourceDataPersonalEntryAdded) { safetyCenterResourcesApk.getNotEmptyStringOrNull(safetySource.titleResId)?.let { addIndexableRow(title = it, ProfileType.PRIMARY) } } if (safetySource.profile == SafetySource.PROFILE_ALL) { - if (!isWorkEntryAdded) { + if (!isSourceDataWorkEntryAdded) { safetyCenterResourcesApk .getNotEmptyStringOrNull(safetySource.titleForWorkResId) ?.let { addIndexableRow(title = it, ProfileType.MANAGED) } } - if (safetySource.id != BIOMETRIC_SOURCE_ID && isPrivateProfileSupported()) { + if (!biometricsSources.contains(safetySource.id) && isPrivateProfileSupported()) { safetyCenterResourcesApk .getNotEmptyStringOrNull(safetySource.titleForPrivateProfileResId) ?.let { addIndexableRow(title = it, ProfileType.PRIVATE) } @@ -242,13 +241,12 @@ class SafetyCenterSearchIndexablesProvider : BaseSearchIndexablesProvider() { get() = safetyCenterConfig?.safetySourcesGroups?.asSequence()?.filter { it.type != SAFETY_SOURCES_GROUP_TYPE_HIDDEN - } - ?: emptySequence() + } ?: emptySequence() private fun collectAllRemovableKeys( safetyCenterManager: SafetyCenterManager, keysToRemove: MutableSet<String>, - staticEntryGroupsAreRemovable: Boolean + staticEntryGroupsAreRemovable: Boolean, ) { safetyCenterManager.safetySourcesGroupsWithEntries .filter { @@ -279,7 +277,7 @@ class SafetyCenterSearchIndexablesProvider : BaseSearchIndexablesProvider() { private fun keepActiveEntriesFromRemoval( safetyCenterManager: SafetyCenterManager, context: Context, - keysToRemove: MutableSet<String> + keysToRemove: MutableSet<String>, ) { val safetyCenterData = safetyCenterManager.safetyCenterData safetyCenterData.entriesOrGroups.forEach { entryOrGroup -> @@ -306,7 +304,7 @@ class SafetyCenterSearchIndexablesProvider : BaseSearchIndexablesProvider() { private fun keepEntryFromRemoval( entryId: SafetyCenterEntryId, context: Context, - keysToRemove: MutableSet<String> + keysToRemove: MutableSet<String>, ) { val userContext = context.createContextAsUser(UserHandle.of(entryId.userId), /* flags= */ 0) val userUserManager = userContext.getSystemService(UserManager::class.java) ?: return @@ -333,13 +331,17 @@ class SafetyCenterSearchIndexablesProvider : BaseSearchIndexablesProvider() { get() = SafetyCenterIds.entryIdFromString(id) private fun isPrivateProfileSupported(): Boolean { - return SdkLevel.isAtLeastV() && - com.android.permission.flags.Flags.privateProfileSupported() && - android.os.Flags.allowPrivateProfile() + return SdkLevel.isAtLeastV() && com.android.permission.flags.Flags.privateProfileSupported() } companion object { private const val BIOMETRIC_SOURCE_ID = "AndroidBiometrics" + private const val FACE_SOURCE_ID = "AndroidFaceUnlock" + private const val FINGERPRINT_SOURCE_ID = "AndroidFingerprintUnlock" + private const val WEAR_SOURCE_ID = "AndroidWearUnlock" + + private val biometricsSources = + listOf(BIOMETRIC_SOURCE_ID, FACE_SOURCE_ID, FINGERPRINT_SOURCE_ID, WEAR_SOURCE_ID) private val privacyControlKeys: List<String> get() = Pref.values().map { it.key } @@ -373,6 +375,6 @@ class SafetyCenterSearchIndexablesProvider : BaseSearchIndexablesProvider() { enum class ProfileType { PRIMARY, MANAGED, - PRIVATE + PRIVATE, } } diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/HighlightablePreferenceGroupAdapter.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/HighlightablePreferenceGroupAdapter.java index c6cfa3a9a..a079405e6 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/HighlightablePreferenceGroupAdapter.java +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/HighlightablePreferenceGroupAdapter.java @@ -21,17 +21,23 @@ import android.animation.AnimatorListenerAdapter; import android.animation.ArgbEvaluator; import android.animation.ValueAnimator; import android.content.Context; +import android.graphics.PorterDuff; +import android.graphics.PorterDuffColorFilter; import android.text.TextUtils; import android.util.Log; import android.util.TypedValue; import android.view.View; +import androidx.annotation.DrawableRes; +import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceGroupAdapter; import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; import com.android.permissioncontroller.R; +import com.android.settingslib.widget.SettingsPreferenceGroupAdapter; +import com.android.settingslib.widget.SettingsThemeHelper; import com.google.android.material.appbar.AppBarLayout; @@ -41,7 +47,7 @@ import com.google.android.material.appbar.AppBarLayout; * * @see com.android.settings.widget.HighlightablePreferenceGroupAdapter */ -public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter { +public class HighlightablePreferenceGroupAdapter extends SettingsPreferenceGroupAdapter { private static final String TAG = "HighlightableAdapter"; private static final long DELAY_COLLAPSE_DURATION_MILLIS = 300L; @@ -50,10 +56,12 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter private static final long HIGHLIGHT_FADE_OUT_DURATION = 500L; private static final long HIGHLIGHT_FADE_IN_DURATION = 200L; + private final int mInitialBackgroundColor; private final int mHighlightColor; - private boolean mFadeInAnimated; + boolean mFadeInAnimated; - private final int mNormalBackgroundRes; + private final Context mContext; + private final @DrawableRes int mNormalBackgroundRes; private final String mHighlightKey; private boolean mHighlightRequested; private int mHighlightPosition = RecyclerView.NO_POSITION; @@ -63,13 +71,27 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter super(preferenceGroup); mHighlightKey = key; mHighlightRequested = highlightRequested; - final Context context = preferenceGroup.getContext(); - final TypedValue outValue = new TypedValue(); - context.getTheme() + mContext = preferenceGroup.getContext(); + + final TypedValue backgroundResOutValue = new TypedValue(); + mContext.getTheme() .resolveAttribute( - android.R.attr.selectableItemBackground, outValue, true /* resolveRefs */); - mNormalBackgroundRes = outValue.resourceId; - mHighlightColor = context.getColor(R.color.preference_highlight_color); + android.R.attr.selectableItemBackground, + backgroundResOutValue, + true /* resolveRefs */); + mNormalBackgroundRes = backgroundResOutValue.resourceId; + + if (SettingsThemeHelper.isExpressiveTheme(mContext)) { + final TypedValue backgroundColorOutValue = new TypedValue(); + mContext.getTheme() + .resolveAttribute( + R.attr.colorSurface, backgroundColorOutValue, true /* resolveRefs */); + mInitialBackgroundColor = backgroundColorOutValue.resourceId; + } else { + mInitialBackgroundColor = mContext.getColor(android.R.color.transparent); + } + + mHighlightColor = mContext.getColor(R.color.preference_highlight_color); } @Override @@ -78,11 +100,13 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter updateBackground(holder, position); } - private void updateBackground(PreferenceViewHolder holder, int position) { + void updateBackground(PreferenceViewHolder holder, int position) { View v = holder.itemView; - if (position == mHighlightPosition - && (mHighlightKey != null - && TextUtils.equals(mHighlightKey, getItem(position).getKey()))) { + Preference preference = getItem(position); + if (preference != null + && position == mHighlightPosition + && (mHighlightKey != null && TextUtils.equals(mHighlightKey, preference.getKey())) + && v.isShown()) { // This position should be highlighted. If it's highlighted before - skip animation. addHighlightBackground(holder, !mFadeInAnimated); } else if (Boolean.TRUE.equals(v.getTag(R.id.preference_highlighted))) { @@ -109,31 +133,46 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter // Collapse app bar after 300 milliseconds. if (appBarLayout != null) { root.postDelayed( - () -> { - appBarLayout.setExpanded(false, true); - }, - DELAY_COLLAPSE_DURATION_MILLIS); + () -> appBarLayout.setExpanded(false, true), DELAY_COLLAPSE_DURATION_MILLIS); } // Remove the animator as early as possible to avoid a RecyclerView crash. recyclerView.setItemAnimator(null); - // Scroll to correct position after 600 milliseconds. + // Scroll to correct position after a short delay. root.postDelayed( () -> { if (ensureHighlightPosition()) { recyclerView.smoothScrollToPosition(mHighlightPosition); + highlightAndFocusTargetItem(recyclerView, mHighlightPosition); } }, DELAY_HIGHLIGHT_DURATION_MILLIS); + } - // Highlight preference after 900 milliseconds. - root.postDelayed( - () -> { - if (ensureHighlightPosition()) { - notifyItemChanged(mHighlightPosition); - } - }, - DELAY_COLLAPSE_DURATION_MILLIS + DELAY_HIGHLIGHT_DURATION_MILLIS); + private void highlightAndFocusTargetItem(RecyclerView recyclerView, int highlightPosition) { + RecyclerView.ViewHolder target = + recyclerView.findViewHolderForAdapterPosition(highlightPosition); + if (target != null) { // view already visible + notifyItemChanged(mHighlightPosition); + target.itemView.requestFocus(); + } else { // otherwise we're about to scroll to that view (but we might not be scrolling yet) + recyclerView.addOnScrollListener( + new RecyclerView.OnScrollListener() { + @Override + public void onScrollStateChanged(RecyclerView recyclerView, int newState) { + if (newState == RecyclerView.SCROLL_STATE_IDLE) { + notifyItemChanged(mHighlightPosition); + RecyclerView.ViewHolder target = + recyclerView.findViewHolderForAdapterPosition( + highlightPosition); + if (target != null) { + target.itemView.requestFocus(); + } + recyclerView.removeOnScrollListener(this); + } + } + }); + } } /** @@ -159,7 +198,7 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter } /** Remove the highlighted background with a delay */ - public void requestRemoveHighlightDelayed(PreferenceViewHolder holder) { + private void requestRemoveHighlightDelayed(PreferenceViewHolder holder) { final View v = holder.itemView; v.postDelayed( () -> { @@ -172,33 +211,36 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter private void addHighlightBackground(PreferenceViewHolder holder, boolean animate) { final View v = holder.itemView; v.setTag(R.id.preference_highlighted, true); + if (!animate) { - v.setBackgroundColor(mHighlightColor); + setBackgroundColor(v, mHighlightColor); Log.d(TAG, "AddHighlight: Not animation requested - setting highlight background"); requestRemoveHighlightDelayed(holder); return; } mFadeInAnimated = true; - final int colorFrom = mNormalBackgroundRes; - final int colorTo = mHighlightColor; + final ValueAnimator fadeInLoop = - ValueAnimator.ofObject(new ArgbEvaluator(), colorFrom, colorTo); + ValueAnimator.ofObject( + new ArgbEvaluator(), mInitialBackgroundColor, mHighlightColor); fadeInLoop.setDuration(HIGHLIGHT_FADE_IN_DURATION); fadeInLoop.addUpdateListener( - animator -> v.setBackgroundColor((int) animator.getAnimatedValue())); + animator -> setBackgroundColor(v, (int) animator.getAnimatedValue())); fadeInLoop.setRepeatMode(ValueAnimator.REVERSE); fadeInLoop.setRepeatCount(4); fadeInLoop.start(); Log.d(TAG, "AddHighlight: starting fade in animation"); + holder.setIsRecyclable(false); requestRemoveHighlightDelayed(holder); } private void removeHighlightBackground(PreferenceViewHolder holder, boolean animate) { final View v = holder.itemView; + if (!animate) { v.setTag(R.id.preference_highlighted, false); - v.setBackgroundResource(mNormalBackgroundRes); + clearBackgroundColor(v); Log.d(TAG, "RemoveHighlight: No animation requested - setting normal background"); return; } @@ -208,27 +250,44 @@ public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter Log.d(TAG, "RemoveHighlight: Not highlighted - skipping"); return; } - int colorFrom = mHighlightColor; - int colorTo = mNormalBackgroundRes; v.setTag(R.id.preference_highlighted, false); final ValueAnimator colorAnimation = - ValueAnimator.ofObject(new ArgbEvaluator(), colorFrom, colorTo); + ValueAnimator.ofObject( + new ArgbEvaluator(), mHighlightColor, mInitialBackgroundColor); colorAnimation.setDuration(HIGHLIGHT_FADE_OUT_DURATION); colorAnimation.addUpdateListener( - animator -> v.setBackgroundColor((int) animator.getAnimatedValue())); + animator -> setBackgroundColor(v, (int) animator.getAnimatedValue())); colorAnimation.addListener( new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { - // Animation complete - the background is now white. Change to - // mNormalBackgroundRes - // so it is white and has ripple on touch. - v.setBackgroundResource(mNormalBackgroundRes); + // Animation complete - the background needs to be the target background. + clearBackgroundColor(v); holder.setIsRecyclable(true); } }); colorAnimation.start(); Log.d(TAG, "Starting fade out animation"); } + + private void setBackgroundColor(View v, int color) { + if (SettingsThemeHelper.isExpressiveTheme(mContext)) { + v.getBackground() + .setColorFilter( + new PorterDuffColorFilter( + color, + PorterDuff.Mode.SRC_ATOP)); + } else { + v.setBackgroundColor(color); + } + } + + private void clearBackgroundColor(View v) { + if (SettingsThemeHelper.isExpressiveTheme(mContext)) { + v.getBackground().clearColorFilter(); + } else { + v.setBackgroundResource(mNormalBackgroundRes); + } + } } diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/IssueCardPreference.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/IssueCardPreference.java index 88759797e..e47565e3b 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/IssueCardPreference.java +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/IssueCardPreference.java @@ -295,7 +295,8 @@ public class IssueCardPreference extends Preference public static class ConfirmDismissalDialogFragment extends DialogFragment { private static final String ISSUE_KEY = "confirm_dialog_sc_issue"; - private static ConfirmDismissalDialogFragment newInstance(SafetyCenterIssue issue) { + /** Create new fragment with the data it will need. */ + public static ConfirmDismissalDialogFragment newInstance(SafetyCenterIssue issue) { ConfirmDismissalDialogFragment fragment = new ConfirmDismissalDialogFragment(); Bundle args = new Bundle(); diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyBrandChipPreference.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyBrandChipPreference.kt index c5287af53..e0f284d16 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyBrandChipPreference.kt +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyBrandChipPreference.kt @@ -45,6 +45,11 @@ internal class SafetyBrandChipPreference(context: Context, attrs: AttributeSet) super.onBindViewHolder(holder) val brandChipButton = holder.findViewById(R.id.brand_chip)!! brandChipButton.setOnClickListener(brandChipClickListener) + SafetyCenterTouchTarget.configureSize( + brandChipButton, + R.dimen.sc_icon_button_touch_target_size, + useWidthHeightFix = true, + ) } /** diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterDashboardFragment.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterDashboardFragment.java index ed6bc382c..47f9fd591 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterDashboardFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterDashboardFragment.java @@ -35,7 +35,6 @@ import android.safetycenter.SafetyCenterData; import android.safetycenter.SafetyCenterEntry; import android.safetycenter.SafetyCenterEntryGroup; import android.safetycenter.SafetyCenterEntryOrGroup; -import android.safetycenter.SafetyCenterIssue; import android.safetycenter.SafetyCenterStaticEntry; import android.safetycenter.SafetyCenterStaticEntryGroup; import android.util.Log; @@ -52,6 +51,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.modules.utils.build.SdkLevel; import com.android.permissioncontroller.R; +import com.android.permissioncontroller.safetycenter.ui.expressive.SafetyBannerMessagePreference; +import com.android.permissioncontroller.safetycenter.ui.model.IssueUiData; import com.android.permissioncontroller.safetycenter.ui.model.SafetyCenterUiData; import com.android.permissioncontroller.safetycenter.ui.model.StatusUiData; import com.android.safetycenter.internaldata.SafetyCenterBundles; @@ -61,7 +62,6 @@ import com.android.settingslib.widget.SettingsThemeHelper; import kotlin.Unit; import java.util.List; -import java.util.Map; import java.util.Objects; /** Dashboard fragment for the Safety Center. */ @@ -81,6 +81,7 @@ public final class SafetyCenterDashboardFragment extends SafetyCenterFragment { new CollapsableGroupCardHelper(); private PreferenceGroup mIssuesGroup; private PreferenceGroup mEntriesGroup; + @Nullable private PreferenceGroup mPrivacyEntriesGroup; private PreferenceGroup mStaticEntriesGroup; private boolean mIsQuickSettingsFragment; @@ -214,7 +215,7 @@ public final class SafetyCenterDashboardFragment extends SafetyCenterFragment { // TODO(b/208212820): Only update entries that have changed since last // update, rather than deleting and re-adding all. - updateIssues(context, data.getIssues(), uiData.getResolvedIssues()); + updateIssues(context, uiData); if (!mIsQuickSettingsFragment) { updateSafetyEntries(context, data.getEntriesOrGroups()); @@ -222,19 +223,29 @@ public final class SafetyCenterDashboardFragment extends SafetyCenterFragment { } } - private void updateIssues( - Context context, List<SafetyCenterIssue> issues, Map<String, String> resolvedIssues) { + private void updateIssues(Context context, SafetyCenterUiData uiData) { mIssuesGroup.removeAll(); - getCollapsableIssuesCardHelper() - .addIssues( - context, - getSafetyCenterViewModel(), - getChildFragmentManager(), - mIssuesGroup, - issues, - emptyList(), - resolvedIssues, - getActivity().getTaskId()); + if (SettingsThemeHelper.isExpressiveTheme(context)) { + for (IssueUiData issueUiData : uiData.getIssueUiDatas()) { + mIssuesGroup.addPreference( + new SafetyBannerMessagePreference( + context, + issueUiData, + getSafetyCenterViewModel(), + getChildFragmentManager())); + } + } else { + getCollapsableIssuesCardHelper() + .addIssues( + context, + getSafetyCenterViewModel(), + getChildFragmentManager(), + mIssuesGroup, + uiData.getSafetyCenterData().getIssues(), + emptyList(), + uiData.getResolvedIssues(), + requireActivity().getTaskId()); + } } // TODO(b/208212820): Add groups and move to separate controller @@ -253,12 +264,17 @@ public final class SafetyCenterDashboardFragment extends SafetyCenterFragment { if (SdkLevel.isAtLeastV() && group != null && Objects.equals(group.getId(), PRIVACY_SOURCES_GROUP_ID)) { - // Add an extra header before the privacy sources - PreferenceCategory category = new ComparablePreferenceCategory(context); - SafetyCenterResourcesApk safetyCenterResourcesApk = - new SafetyCenterResourcesApk(requireContext()); - category.setTitle(safetyCenterResourcesApk.getStringByName("privacy_title")); - mEntriesGroup.addPreference(category); + // Add a special group for the privacy sources + mPrivacyEntriesGroup = new ComparablePreferenceCategory(context); + mPrivacyEntriesGroup.setTitle( + new SafetyCenterResourcesApk(requireContext()) + .getStringByName("privacy_title")); + mEntriesGroup.addPreference(mPrivacyEntriesGroup); + + mPrivacyEntriesGroup.addPreference( + new SafetyHomepageEntryPreference( + context, group, getSafetyCenterSessionId())); + continue; } if (SafetyCenterUiFlags.getShowSubpages() && group != null) { @@ -317,10 +333,14 @@ public final class SafetyCenterDashboardFragment extends SafetyCenterFragment { private void updateStaticSafetyEntries(Context context, SafetyCenterData data) { mStaticEntriesGroup.removeAll(); - for (SafetyCenterStaticEntryGroup group : data.getStaticEntryGroups()) { - if (group.getTitle().toString().isEmpty()) { - // Interpret an empty title as signal to not create a titled category - addStaticEntriesTo(context, data, mStaticEntriesGroup, group.getStaticEntries()); + List<SafetyCenterStaticEntryGroup> staticEntryGroups = data.getStaticEntryGroups(); + for (int i = 0, size = staticEntryGroups.size(); i < size; i++) { + SafetyCenterStaticEntryGroup group = staticEntryGroups.get(i); + + if (i == 0 && group.getTitle().toString().isEmpty() && mPrivacyEntriesGroup != null) { + // Interpret an empty title for the first group as signal to extend the privacy + // category. + addStaticEntriesTo(context, data, mPrivacyEntriesGroup, group.getStaticEntries()); } else { PreferenceCategory category = new ComparablePreferenceCategory(context); category.setTitle(group.getTitle()); diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterFragment.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterFragment.kt index 04503de5e..d29b0aa3e 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterFragment.kt +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterFragment.kt @@ -33,7 +33,6 @@ import com.android.permissioncontroller.safetycenter.ui.model.SafetyCenterUiData import com.android.permissioncontroller.safetycenter.ui.model.SafetyCenterViewModel import com.android.safetycenter.resources.SafetyCenterResourcesApk import com.android.settingslib.widget.SettingsBasePreferenceFragment -import com.android.settingslib.widget.SettingsThemeHelper /** A base fragment that represents a page in Safety Center. */ @RequiresApi(TIRAMISU) @@ -57,17 +56,11 @@ abstract class SafetyCenterFragment : SettingsBasePreferenceFragment() { * subpages i.e. non expand-and-collapse type entries. Hence, we check that the flag is * enabled before using an adapter that does the highlighting and scrolling. */ val adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder> = - if ( - SafetyCenterUiFlags.getShowSubpages() && - !SettingsThemeHelper.isExpressiveTheme(requireContext()) - ) { - // TODO: b/378433878 - Create highlight adapter for settings expressive theme, which - // has a different base class. + if (SafetyCenterUiFlags.getShowSubpages()) { highlightManager.createAdapter(preferenceScreen) } else { super.onCreateAdapter(preferenceScreen) } - /* By default, the PreferenceGroupAdapter does setHasStableIds(true). Since each Preference * is internally allocated with an auto-incremented ID, it does not allow us to gracefully * update only changed preferences based on SafetyPreferenceComparisonCallback. In order to @@ -83,10 +76,15 @@ abstract class SafetyCenterFragment : SettingsBasePreferenceFragment() { .split(",") safetyCenterSessionId = requireArguments().getLong(EXTRA_SESSION_ID, INVALID_SESSION_ID) + val activity = requireActivity() safetyCenterViewModel = ViewModelProvider( - requireActivity(), - LiveSafetyCenterViewModelFactory(requireActivity().getApplication()), + activity, + LiveSafetyCenterViewModelFactory( + activity.application, + activity.taskId, + sameTaskSourceIds, + ), ) .get(SafetyCenterViewModel::class.java) safetyCenterViewModel.safetyCenterUiLiveData.observe(this) { uiData: SafetyCenterUiData? -> @@ -97,8 +95,7 @@ abstract class SafetyCenterFragment : SettingsBasePreferenceFragment() { displayErrorDetails(errorDetails) } - val safetyCenterIntent: ParsedSafetyCenterIntent = - requireActivity().intent.toSafetyCenterIntent() + val safetyCenterIntent: ParsedSafetyCenterIntent = activity.intent.toSafetyCenterIntent() val isQsFragment = getArguments()?.getBoolean(QUICK_SETTINGS_SAFETY_CENTER_FRAGMENT, false) ?: false collapsableIssuesCardHelper = diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt index 01d23241f..ccfa8f867 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt @@ -22,6 +22,7 @@ import android.view.TouchDelegate import android.view.View import androidx.annotation.DimenRes import androidx.annotation.RequiresApi +import com.android.permission.flags.Flags /** Class to configure touch targets for Safety Center. */ @RequiresApi(Build.VERSION_CODES.TIRAMISU) @@ -34,6 +35,23 @@ object SafetyCenterTouchTarget { */ @JvmStatic fun configureSize(view: View, @DimenRes minTouchTargetSizeResource: Int) { + configureSize(view, minTouchTargetSizeResource, useWidthHeightFix = false) + } + + @JvmStatic + fun configureSize( + view: View, + @DimenRes minTouchTargetSizeResource: Int, + useWidthHeightFix: Boolean, + ) { + if (useWidthHeightFix || Flags.fixSafetyCenterTouchTarget()) { + configureSizeUsingBothWidthAndHeight(view, minTouchTargetSizeResource) + } else { + configureSizeUsingWidthOnly(view, minTouchTargetSizeResource) + } + } + + private fun configureSizeUsingWidthOnly(view: View, @DimenRes minTouchTargetSizeResource: Int) { val parent = view.parent as View val res = view.context.resources val minTouchTargetSize = res.getDimensionPixelSize(minTouchTargetSizeResource) @@ -53,4 +71,37 @@ object SafetyCenterTouchTarget { } } } + + private fun configureSizeUsingBothWidthAndHeight( + view: View, + @DimenRes minTouchTargetSizeResource: Int, + ) { + val parent = view.parent as View + val res = view.context.resources + val minTouchTargetSize = res.getDimensionPixelSize(minTouchTargetSizeResource) + + // Defer getHitRect so that it's called after the parent's children are laid out. + parent.post { + val hitRect = Rect() + view.getHitRect(hitRect) + val currentTouchTargetWidth = hitRect.width() + val adjustWidthInsetBy = + if (currentTouchTargetWidth < minTouchTargetSize) { + (minTouchTargetSize - currentTouchTargetWidth) / 2 + } else { + 0 + } + val currentTouchTargetHeight = hitRect.height() + val adjustHeightInsetBy = + if (currentTouchTargetHeight < minTouchTargetSize) { + (minTouchTargetSize - currentTouchTargetHeight) / 2 + } else { + 0 + } + if (adjustWidthInsetBy != 0 || adjustHeightInsetBy != 0) { + hitRect.inset(-adjustWidthInsetBy, -adjustHeightInsetBy) + parent.touchDelegate = TouchDelegate(hitRect, view) + } + } + } } diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java index abf159955..0bef71b3e 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java @@ -29,7 +29,6 @@ import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.widget.ImageView; -import android.widget.TextView; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; @@ -42,9 +41,6 @@ import com.android.permissioncontroller.safetycenter.ui.model.StatusUiData; import com.android.permissioncontroller.safetycenter.ui.view.StatusCardView; import com.android.settingslib.widget.GroupSectionDividerMixin; -import kotlin.Pair; - -import java.util.List; import java.util.Objects; /** Preference which displays a visual representation of {@link SafetyCenterStatus}. */ @@ -54,25 +50,16 @@ public class SafetyStatusPreference extends Preference private static final String TAG = "SafetyStatusPreference"; + private final SafetyStatusAnimationSequencer mSequencer = new SafetyStatusAnimationSequencer(); + @Nullable private StatusUiData mStatus; @Nullable private SafetyCenterViewModel mViewModel; - private final TextFadeAnimator mTitleTextAnimator = new TextFadeAnimator(R.id.status_title); - - private final TextFadeAnimator mSummaryTextAnimator = new TextFadeAnimator(R.id.status_summary); - - private final TextFadeAnimator mAllTextAnimator = - new TextFadeAnimator(List.of(R.id.status_title, R.id.status_summary)); - - private boolean mFirstBind = true; - public SafetyStatusPreference(Context context, AttributeSet attrs) { super(context, attrs); setLayoutResource(R.layout.preference_safety_status); } - private boolean mIsTextChangeAnimationRunning; - private final SafetyStatusAnimationSequencer mSequencer = new SafetyStatusAnimationSequencer(); @Override public void onBindViewHolder(PreferenceViewHolder holder) { @@ -93,9 +80,7 @@ public class SafetyStatusPreference extends Preference updateStatusIcon(statusCardView); - updateStatusText(statusCardView.getTitleView(), statusCardView.getSummaryView()); - - mFirstBind = false; + statusCardView.showText(mStatus); } private void configureButtons(Context context, StatusCardView statusCardView) { @@ -125,14 +110,6 @@ public class SafetyStatusPreference extends Preference statusCardView.showButtons(mStatus); } - private void updateStatusText(TextView title, TextView summary) { - if (mFirstBind) { - title.setText(mStatus.getTitle()); - summary.setText(mStatus.getSummary(getContext())); - } - runTextAnimationIfNeeded(title, summary); - } - private void updateStatusIcon(StatusCardView statusCardView) { int severityLevel = mStatus.getSeverityLevel(); boolean isRefreshing = mStatus.isRefreshInProgress(); @@ -143,33 +120,6 @@ public class SafetyStatusPreference extends Preference /* scanningAnimation= */ null); } - private void runTextAnimationIfNeeded(TextView titleView, TextView summaryView) { - if (mIsTextChangeAnimationRunning) { - return; - } - Log.v(TAG, "Starting status text animation"); - String titleText = mStatus.getTitle().toString(); - String summaryText = mStatus.getSummary(getContext()).toString(); - boolean titleEquals = titleView.getText().toString().equals(titleText); - boolean summaryEquals = summaryView.getText().toString().equals(summaryText); - Runnable onFinish = - () -> { - Log.v(TAG, "Finishing status text animation"); - mIsTextChangeAnimationRunning = false; - runTextAnimationIfNeeded(titleView, summaryView); - }; - mIsTextChangeAnimationRunning = !titleEquals || !summaryEquals; - if (!titleEquals && !summaryEquals) { - Pair<TextView, String> titleChange = new Pair<>(titleView, titleText); - Pair<TextView, String> summaryChange = new Pair<>(summaryView, summaryText); - mAllTextAnimator.animateChangeText(List.of(titleChange, summaryChange), onFinish); - } else if (!titleEquals) { - mTitleTextAnimator.animateChangeText(titleView, titleText, onFinish); - } else if (!summaryEquals) { - mSummaryTextAnimator.animateChangeText(summaryView, summaryText, onFinish); - } - } - private void startScanningAnimation(StatusCardView statusCardView) { mSequencer.onStartScanningAnimationStart(); ImageView statusImage = statusCardView.getStatusImageView(); diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt index b89abde13..551f676f1 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetySubpageEntryPreference.kt @@ -49,7 +49,7 @@ class SafetySubpageEntryPreference( context: Context, private val launchTaskId: Int?, private val entry: SafetyCenterEntry, - private val viewModel: SafetyCenterViewModel + private val viewModel: SafetyCenterViewModel, ) : TwoTargetPreference(context), ComparablePreference { init { @@ -108,9 +108,7 @@ class SafetySubpageEntryPreference( } private fun isPrivateProfileSupported(): Boolean { - return SdkLevel.isAtLeastV() && - com.android.permission.flags.Flags.privateProfileSupported() && - android.os.Flags.allowPrivateProfile() + return SdkLevel.isAtLeastV() && com.android.permission.flags.Flags.privateProfileSupported() } override fun onBindViewHolder(holder: PreferenceViewHolder) { @@ -125,7 +123,7 @@ class SafetySubpageEntryPreference( PendingIntentSender.send(iconAction.pendingIntent, launchTaskId) viewModel.interactionLogger.recordForEntry( Action.ENTRY_ICON_ACTION_CLICKED, - entry + entry, ) } catch (ex: Exception) { Log.e(TAG, "Failed to execute icon action intent for $entry", ex) diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/StaticSafetyEntryPreference.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/StaticSafetyEntryPreference.java index 87d8744a8..0da8286f6 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/StaticSafetyEntryPreference.java +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/StaticSafetyEntryPreference.java @@ -98,8 +98,7 @@ public class StaticSafetyEntryPreference extends Preference implements Comparabl private Boolean isPrivateProfileSupported() { return SdkLevel.isAtLeastV() - && com.android.permission.flags.Flags.privateProfileSupported() - && android.os.Flags.allowPrivateProfile(); + && com.android.permission.flags.Flags.privateProfileSupported(); } @Override diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/expressive/SafetyBannerMessagePreference.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/expressive/SafetyBannerMessagePreference.kt new file mode 100644 index 000000000..0f2239c60 --- /dev/null +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/expressive/SafetyBannerMessagePreference.kt @@ -0,0 +1,190 @@ +/* + * Copyright (C) 2025 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.permissioncontroller.safetycenter.ui.expressive + +import android.content.Context +import android.os.Build +import android.safetycenter.SafetyCenterIssue +import android.util.Log +import android.view.View +import android.widget.LinearLayout +import androidx.annotation.RequiresApi +import androidx.fragment.app.FragmentManager +import androidx.preference.Preference +import androidx.preference.PreferenceViewHolder +import com.android.modules.utils.build.SdkLevel +import com.android.permissioncontroller.R +import com.android.permissioncontroller.safetycenter.ui.Action +import com.android.permissioncontroller.safetycenter.ui.ComparablePreference +import com.android.permissioncontroller.safetycenter.ui.IssueCardPreference.ConfirmActionDialogFragment +import com.android.permissioncontroller.safetycenter.ui.IssueCardPreference.ConfirmDismissalDialogFragment +import com.android.permissioncontroller.safetycenter.ui.model.IssueUiData +import com.android.permissioncontroller.safetycenter.ui.model.SafetyCenterViewModel +import com.android.settingslib.widget.BannerMessagePreference + +@RequiresApi(Build.VERSION_CODES.TIRAMISU) +class SafetyBannerMessagePreference( + context: Context, + private val issueUiData: IssueUiData, + private val viewModel: SafetyCenterViewModel, + private val dialogFragmentManager: FragmentManager, +) : BannerMessagePreference(context), ComparablePreference { + + init { + setButtonOrientation(LinearLayout.VERTICAL) + displayIssue() + } + + override fun onBindViewHolder(holder: PreferenceViewHolder) { + super.onBindViewHolder(holder) + + viewModel.interactionLogger.recordIssueViewed(issueUiData.issue, issueUiData.isDismissed) + } + + private fun displayIssue() { + setAttentionLevel(issueUiData.issue.severityLevel.toAttentionLevel()) + + title = issueUiData.issue.title + summary = issueUiData.issue.summary + setHeader(issueUiData.issue.attributionTitle) + setSubtitle(issueUiData.issue.subtitle) + // Note: BannerMessagePreference i think always shows an icon (even if it's set to null), + // which is not in the spec + + configureDismissButton() + configureActionButtons() + maybeStartResolution() + } + + private fun configureDismissButton() { + if (issueUiData.issue.isDismissible && !issueUiData.isDismissed) { + setDismissButtonVisible(true) + setDismissButtonOnClickListener { + if (issueUiData.issue.shouldConfirmDismissal()) { + ConfirmDismissalDialogFragment.newInstance(issueUiData.issue) + .showNow(dialogFragmentManager, /* tag= */ null) + } else { + viewModel.dismissIssue(issueUiData.issue) + viewModel.interactionLogger.recordForIssue( + Action.ISSUE_DISMISS_CLICKED, + issueUiData.issue, + isDismissed = false, + ) + } + } + } else { + setDismissButtonVisible(false) + setDismissButtonOnClickListener(null) + } + } + + private fun configureActionButtons() { + val primaryAction = issueUiData.issue.actions.getOrNull(0) + if (primaryAction != null) { + setPositiveButtonText(primaryAction.label) + setPositiveButtonEnabled(issueUiData.resolvedIssueActionId != primaryAction.id) + setPositiveButtonVisible(true) + setPositiveButtonOnClickListener( + ActionButtonOnClickListener(primaryAction, isPrimaryButton = true) + ) + } else { + setPositiveButtonVisible(false) + setPositiveButtonOnClickListener(null) + } + + val secondaryAction = issueUiData.issue.actions.getOrNull(1) + if (secondaryAction != null) { + setNegativeButtonText(secondaryAction.label) + setNegativeButtonEnabled(issueUiData.resolvedIssueActionId != secondaryAction.id) + setNegativeButtonVisible(true) + setNegativeButtonOnClickListener( + ActionButtonOnClickListener(secondaryAction, isPrimaryButton = false) + ) + } else { + setNegativeButtonVisible(false) + setNegativeButtonOnClickListener(null) + } + } + + private inner class ActionButtonOnClickListener( + private val action: SafetyCenterIssue.Action, + private val isPrimaryButton: Boolean, + ) : View.OnClickListener { + override fun onClick(v: View?) { + if (SdkLevel.isAtLeastU() && action.confirmationDialogDetails != null) { + ConfirmActionDialogFragment.newInstance( + issueUiData.issue, + action, + issueUiData.launchTaskId, + isPrimaryButton, + issueUiData.isDismissed, + ) + .showNow(dialogFragmentManager, /* tag= */ null) + } else { + if (action.willResolve()) { + setPositiveButtonEnabled(false) + } + viewModel.executeIssueAction(issueUiData.issue, action, issueUiData.launchTaskId) + viewModel.interactionLogger.recordForIssue( + if (isPrimaryButton) { + Action.ISSUE_PRIMARY_ACTION_CLICKED + } else { + Action.ISSUE_SECONDARY_ACTION_CLICKED + }, + issueUiData.issue, + issueUiData.isDismissed, + ) + } + } + } + + private fun maybeStartResolution() { + val resolvedActionId = issueUiData.resolvedIssueActionId ?: return + + val action = issueUiData.issue.actions.firstOrNull { it.id == resolvedActionId } ?: return + val successMessage = + action.successMessage?.ifEmpty { null } + ?: context.getString(R.string.safety_center_resolved_issue_fallback) + + showResolutionAnimation(successMessage) { + viewModel.markIssueResolvedUiCompleted(issueUiData.issue.id) + } + } + + private fun Int.toAttentionLevel(): AttentionLevel { + return when (this) { + SafetyCenterIssue.ISSUE_SEVERITY_LEVEL_OK -> AttentionLevel.LOW + SafetyCenterIssue.ISSUE_SEVERITY_LEVEL_RECOMMENDATION -> AttentionLevel.MEDIUM + SafetyCenterIssue.ISSUE_SEVERITY_LEVEL_CRITICAL_WARNING -> AttentionLevel.HIGH + else -> { + Log.w(TAG, "Unexpected issue severity level $this") + AttentionLevel.LOW + } + } + } + + private companion object { + const val TAG = "SafetyBannerMessagePref" + } + + override fun isSameItem(preference: Preference): Boolean = + preference is SafetyBannerMessagePreference && + preference.issueUiData.issue.id == issueUiData.issue.id + + override fun hasSameContents(preference: Preference): Boolean = + preference is SafetyBannerMessagePreference && preference.issueUiData == issueUiData +} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/package-info.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/IssueUiData.kt index b724ba43f..e260bb917 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/model/livedatatypes/v31/package-info.java +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/IssueUiData.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 The Android Open Source Project + * Copyright (C) 2025 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. @@ -14,5 +14,14 @@ * limitations under the License. */ -@androidx.annotation.RequiresApi(android.os.Build.VERSION_CODES.S) -package com.android.permissioncontroller.permission.model.livedatatypes.v31; +package com.android.permissioncontroller.safetycenter.ui.model + +import android.safetycenter.SafetyCenterIssue + +/** UI model representation of [SafetyCenterIssue] */ +data class IssueUiData( + val issue: SafetyCenterIssue, + val isDismissed: Boolean, + val resolvedIssueActionId: String? = null, + val launchTaskId: Int? = null, +) diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt index 4ddcf1c3d..0b976f49d 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/LiveSafetyCenterViewModel.kt @@ -43,11 +43,16 @@ import com.android.safetycenter.internaldata.SafetyCenterIds /* A SafetyCenterViewModel that talks to the real backing service for Safety Center. */ @RequiresApi(Build.VERSION_CODES.TIRAMISU) -class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) { +class LiveSafetyCenterViewModel( + app: Application, + private val taskId: Int, + private val sameTaskSourceIds: List<String>, +) : SafetyCenterViewModel(app) { private val TAG: String = LiveSafetyCenterViewModel::class.java.simpleName override val statusUiLiveData: LiveData<StatusUiData> get() = safetyCenterUiLiveData.map { StatusUiData(it.safetyCenterData) } + override val safetyCenterUiLiveData: LiveData<SafetyCenterUiData> by this::_safetyCenterLiveData override val errorLiveData: LiveData<SafetyCenterErrorDetails> by this::_errorLiveData @@ -65,7 +70,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) { private val safetyCenterManager = app.getSystemService(SafetyCenterManager::class.java)!! override fun getCurrentSafetyCenterDataAsUiData(): SafetyCenterUiData = - SafetyCenterUiData(safetyCenterManager.safetyCenterData) + uiData(safetyCenterManager.safetyCenterData) override fun dismissIssue(issue: SafetyCenterIssue) { safetyCenterManager.dismissSafetyCenterIssue(issue.id) @@ -74,7 +79,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) { override fun executeIssueAction( issue: SafetyCenterIssue, action: SafetyCenterIssue.Action, - launchTaskId: Int? + launchTaskId: Int?, ) { val issueId = if (launchTaskId != null) { @@ -107,9 +112,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) { override fun navigateToSafetyCenter(context: Context, navigationSource: NavigationSource?) { val intent = Intent(ACTION_SAFETY_CENTER) - if (navigationSource != null) { - navigationSource.addToIntent(intent) - } + navigationSource?.addToIntent(intent) context.startActivity(intent) } @@ -132,7 +135,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) { } else { safetyCenterManager.refreshSafetySources( SafetyCenterManager.REFRESH_REASON_PAGE_OPEN, - safetySourceIds + safetySourceIds, ) } } @@ -174,7 +177,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) { override fun onActive() { safetyCenterManager.addOnSafetyCenterDataChangedListener( getMainExecutor(app.applicationContext), - this + this, ) super.onActive() } @@ -209,7 +212,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) { Log.d( TAG, "Received SafetyCenterData while issue resolution animations" + - " occurring. Will update UI with new data soon." + " occurring. Will update UI with new data soon.", ) return } @@ -254,7 +257,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) { private fun isCurrentlyScanning(): Boolean = value?.safetyCenterData?.isScanning() ?: false private fun sendNextData() { - value = SafetyCenterUiData(safetyCenterDataQueue.removeFirst()) + value = uiData(safetyCenterDataQueue.removeFirst()) } private fun skipNextData() = safetyCenterDataQueue.removeFirst() @@ -270,7 +273,7 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) { // The current SafetyCenterData still contains the resolved SafetyCenterIssue objects. // Send it with the resolved IDs so the UI can generate the correct preferences and // trigger the right animations for issue resolution. - value = SafetyCenterUiData(currentData, currentResolvedIssues) + value = uiData(currentData, currentResolvedIssues) } @MainThread @@ -279,6 +282,11 @@ class LiveSafetyCenterViewModel(app: Application) : SafetyCenterViewModel(app) { maybeProcessDataToNextResolvedIssues() } } + + private fun uiData( + safetyCenterData: SafetyCenterData, + resolvedIssues: Map<IssueId, ActionId> = emptyMap(), + ) = SafetyCenterUiData(safetyCenterData, taskId, sameTaskSourceIds, resolvedIssues) } /** Returns inflight issues pending resolution */ @@ -309,8 +317,15 @@ private val SafetyCenterData.allResolvableIssues: Sequence<SafetyCenterIssue> } @RequiresApi(Build.VERSION_CODES.TIRAMISU) -class LiveSafetyCenterViewModelFactory(private val app: Application) : ViewModelProvider.Factory { +class LiveSafetyCenterViewModelFactory +@JvmOverloads +constructor( + private val app: Application, + private val taskId: Int = 0, + private val sameTaskSourceIds: List<String> = emptyList(), +) : ViewModelProvider.Factory { override fun <T : ViewModel> create(modelClass: Class<T>): T { - @Suppress("UNCHECKED_CAST") return LiveSafetyCenterViewModel(app) as T + @Suppress("UNCHECKED_CAST") + return LiveSafetyCenterViewModel(app, taskId, sameTaskSourceIds) as T } } diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/SafetyCenterUiData.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/SafetyCenterUiData.kt index 69a315f08..1595b5812 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/SafetyCenterUiData.kt +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/model/SafetyCenterUiData.kt @@ -29,11 +29,19 @@ import com.android.safetycenter.internaldata.SafetyCenterIds import com.android.safetycenter.internaldata.SafetyCenterIssueKey /** UI model representation of Safety Center Data */ +@RequiresApi(TIRAMISU) data class SafetyCenterUiData( val safetyCenterData: SafetyCenterData, - val resolvedIssues: Map<IssueId, ActionId> = emptyMap() + private val taskId: Int, + private val sameTaskSourceIds: List<String>, + val resolvedIssues: Map<IssueId, ActionId> = emptyMap(), ) { - @RequiresApi(TIRAMISU) + + val issueUiDatas: List<IssueUiData> by + lazy(LazyThreadSafetyMode.NONE) { + safetyCenterData.issues.map { toIssueUiData(it, isDismissed = false) } + } + fun getMatchingIssue(issueKey: SafetyCenterIssueKey): SafetyCenterIssue? { return safetyCenterData.issues.find { SafetyCenterIds.issueIdFromString(it.id).safetyCenterIssueKey == issueKey @@ -67,7 +75,7 @@ data class SafetyCenterUiData( @RequiresApi(UPSIDE_DOWN_CAKE) private fun selectMatchingIssuesForGroup( groupId: String, - issues: List<SafetyCenterIssue> + issues: List<SafetyCenterIssue>, ): List<SafetyCenterIssue> { val issuesToGroups = safetyCenterData.extras.getBundle(ISSUES_TO_GROUPS_BUNDLE_KEY) return issues.filter { @@ -82,6 +90,18 @@ data class SafetyCenterUiData( /** Returns the [SafetyCenterData.getDismissedIssues] that are meant to be visible in the UI. */ @RequiresApi(UPSIDE_DOWN_CAKE) - fun SafetyCenterData.visibleDismissedIssues() = + private fun SafetyCenterData.visibleDismissedIssues() = dismissedIssues.filter { it.severityLevel > ISSUE_SEVERITY_LEVEL_OK } + + /** Converts a [SafetyCenterIssue] into [IssueUiData]. */ + private fun toIssueUiData(issue: SafetyCenterIssue, isDismissed: Boolean) = + IssueUiData(issue, isDismissed, resolvedIssues[issue.id], getLaunchTaskIdForIssue(issue)) + + private fun getLaunchTaskIdForIssue(issue: SafetyCenterIssue): Int? { + val sourceId: String = + SafetyCenterIds.issueIdFromString(issue.id) + .getSafetyCenterIssueKey() + .getSafetySourceId() + return if (sameTaskSourceIds.contains(sourceId)) taskId else null + } } diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/MoreIssuesHeaderView.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/MoreIssuesHeaderView.kt index ebfbef714..3eb2e7904 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/MoreIssuesHeaderView.kt +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/MoreIssuesHeaderView.kt @@ -35,7 +35,7 @@ constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0, - defStyleRes: Int = 0 + defStyleRes: Int = 0, ) : ConstraintLayout(context, attrs, defStyleAttr, defStyleRes) { init { @@ -55,32 +55,36 @@ constructor( nextData: MoreIssuesCardData, title: String, @DrawableRes overrideChevronIconResId: Int?, - onClick: () -> Unit + onClick: () -> Unit, ) { titleView.text = title updateStatusIcon(previousData?.severityLevel, nextData.severityLevel) updateExpandCollapseButton( previousData?.isExpanded, nextData.isExpanded, - overrideChevronIconResId + overrideChevronIconResId, ) updateIssueCount(previousData?.hiddenIssueCount, nextData.hiddenIssueCount) updateBackground(previousData?.isExpanded, nextData.isExpanded) setOnClickListener { onClick() } - val expansionString = - StringUtils.getIcuPluralsString( - context, - R.string.safety_center_more_issues_card_expand_action, - nextData.hiddenIssueCount - ) + val actionString = + if (nextData.isExpanded) { + context.getString(R.string.safety_center_more_issues_card_collapse_action) + } else { + StringUtils.getIcuPluralsString( + context, + R.string.safety_center_more_issues_card_expand_action, + nextData.hiddenIssueCount, + ) + } // Replacing the on-click label to indicate the number of hidden issues. The on-click // command is set to null so that it uses the existing expansion behaviour. ViewCompat.replaceAccessibilityAction( this, AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CLICK, - expansionString, - null + actionString, + null, ) } @@ -96,7 +100,7 @@ constructor( private fun updateExpandCollapseButton( wasExpanded: Boolean?, isExpanded: Boolean, - @DrawableRes overrideChevronIconResId: Int? + @DrawableRes overrideChevronIconResId: Int?, ) { expandCollapseLayout.isVisible = true if (overrideChevronIconResId != null) { @@ -105,12 +109,12 @@ constructor( if (isExpanded) { expandCollapseIcon.animate( R.drawable.more_issues_expand_anim, - R.drawable.ic_collapse_issues + R.drawable.ic_collapse_issues, ) } else { expandCollapseIcon.animate( R.drawable.more_issues_collapse_anim, - R.drawable.ic_expand_issues + R.drawable.ic_expand_issues, ) } } else { @@ -132,7 +136,7 @@ constructor( statusIconView, previousSeverityLevel, endSeverityLevel, - selectIconResId(endSeverityLevel) + selectIconResId(endSeverityLevel), ) } else { statusIconView.setImageResource(selectIconResId(endSeverityLevel)) @@ -198,7 +202,7 @@ constructor( bottomRadiusStart, bottomRadiusStart, bottomRadiusStart, - bottomRadiusStart + bottomRadiusStart, ) setCornerRadii(ripple, cornerRadii) if (bottomRadiusEnd != bottomRadiusStart) { diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/StatusCardView.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/StatusCardView.kt index 6a415c563..bb417104d 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/StatusCardView.kt +++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/StatusCardView.kt @@ -21,6 +21,7 @@ import android.os.Build import android.util.AttributeSet import android.widget.ImageView import android.widget.LinearLayout +import android.widget.TextSwitcher import android.widget.TextView import androidx.annotation.RequiresApi import androidx.constraintlayout.widget.ConstraintLayout @@ -35,7 +36,7 @@ constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0, - defStyleRes: Int = 0 + defStyleRes: Int = 0, ) : ConstraintLayout(context, attrs, defStyleAttr, defStyleRes) { init { @@ -44,11 +45,29 @@ constructor( val statusImageView: ImageView by lazyView(R.id.status_image) val titleAndSummaryContainerView: LinearLayout by lazyView(R.id.status_title_and_summary) - val titleView: TextView by lazyView(R.id.status_title) - val summaryView: TextView by lazyView(R.id.status_summary) + private val titleView: TextSwitcher by lazyView(R.id.status_title) + private val summaryView: TextSwitcher by lazyView(R.id.status_summary) val reviewSettingsButton: MaterialButton by lazyView(R.id.review_settings_button) val rescanButton: MaterialButton by lazyView(R.id.rescan_button) + fun showText(statusUiData: StatusUiData) { + titleView.updateText(statusUiData.title) + summaryView.updateText(statusUiData.getSummary(context)) + } + + private fun TextSwitcher.updateText(newText: CharSequence) { + val currentText: CharSequence? = (currentView as TextView).text + if (currentText == newText) { + return + } + + if (currentText.isNullOrBlank()) { + setCurrentText(newText) + } else { + setText(newText) + } + } + fun showButtons(statusUiData: StatusUiData) { rescanButton.isEnabled = !statusUiData.isRefreshInProgress diff --git a/PermissionController/tests/inprocess/Android.bp b/PermissionController/tests/inprocess/Android.bp index 4cd9e0e6f..49e4e9474 100644 --- a/PermissionController/tests/inprocess/Android.bp +++ b/PermissionController/tests/inprocess/Android.bp @@ -53,6 +53,7 @@ android_test { // This may result in two flag libs being included. This should only be used for Flag //string referencing for test annotations. "com.android.permission.flags-aconfig-java-export", + "android.permission.flags-aconfig-java-export", ], data: [ diff --git a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/GetPermissionGroupInfoTest.kt b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/GetPermissionGroupInfoTest.kt index b20e99c38..d06de169b 100644 --- a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/GetPermissionGroupInfoTest.kt +++ b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/GetPermissionGroupInfoTest.kt @@ -18,12 +18,14 @@ package com.android.permissioncontroller.permission import android.content.Context import android.os.Build +import androidx.arch.core.executor.testing.InstantTaskExecutorRule import androidx.test.filters.SdkSuppress import androidx.test.platform.app.InstrumentationRegistry import com.android.permissioncontroller.permission.utils.PermissionMapping import com.google.common.truth.Truth.assertThat import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import org.junit.Rule import org.junit.Test @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") @@ -32,6 +34,8 @@ class GetPermissionGroupInfoTest { private val packageManager = context.packageManager private val timeoutMs: Long = 10000 + @JvmField @Rule val instantTaskExecutorRule = InstantTaskExecutorRule() + @Test fun assertAllPlatformPermGroupPermListsMatch() { val groups = PermissionMapping.getPlatformPermissionGroups() diff --git a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/data/AttributionLabelLiveDataTest.kt b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/data/AttributionLabelLiveDataTest.kt index bc9e5d6ff..7c735a451 100644 --- a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/data/AttributionLabelLiveDataTest.kt +++ b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/data/AttributionLabelLiveDataTest.kt @@ -22,10 +22,12 @@ import android.os.Process.myUserHandle import android.os.UserHandle import android.permission.cts.PermissionUtils.install import android.permission.cts.PermissionUtils.uninstallApp +import androidx.arch.core.executor.testing.InstantTaskExecutorRule import androidx.test.platform.app.InstrumentationRegistry import com.google.common.truth.Truth.assertThat import org.junit.After import org.junit.Before +import org.junit.Rule import org.junit.Test private const val APK = "/data/local/tmp/pc-inprocess/AppThatUsesCameraPermission.apk" @@ -34,6 +36,8 @@ private const val PKG = "com.android.permissioncontroller.tests.appthatrequestpe class AttributionLabelLiveDataTest { private val context = InstrumentationRegistry.getInstrumentation().context as Context + @JvmField @Rule val instantTaskExecutorRule = InstantTaskExecutorRule() + @Before fun installAttributingApp() { install(APK) diff --git a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/ui/model/PermissionUsageDetailsViewModelTest.kt b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/ui/model/PermissionUsageDetailsViewModelTest.kt index eb5fdefdb..644bdfd15 100644 --- a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/ui/model/PermissionUsageDetailsViewModelTest.kt +++ b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/ui/model/PermissionUsageDetailsViewModelTest.kt @@ -16,16 +16,14 @@ package com.android.permissioncontroller.permission.ui.model -import android.platform.test.annotations.RequiresFlagsEnabled import android.platform.test.flag.junit.DeviceFlagsValueProvider import androidx.arch.core.executor.testing.InstantTaskExecutorRule import androidx.lifecycle.SavedStateHandle import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.modules.utils.build.SdkLevel -import com.android.permission.flags.Flags import com.android.permissioncontroller.PermissionControllerApplication +import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.PermissionUsageDetailsUiState -import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModelV2 import com.google.common.truth.Truth import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit @@ -42,15 +40,14 @@ class PermissionUsageDetailsViewModelTest { @JvmField @Rule val instantTaskExecutorRule = InstantTaskExecutorRule() @Test - @RequiresFlagsEnabled(Flags.FLAG_LIVEDATA_REFACTOR_PERMISSION_TIMELINE_ENABLED) fun verifyUiStateIsGeneratedSuccessfully() { Assume.assumeTrue(SdkLevel.isAtLeastS()) lateinit var uiState: PermissionUsageDetailsUiState.Success val viewModel = - PermissionUsageDetailsViewModelV2.create( + PermissionUsageDetailsViewModel.create( PermissionControllerApplication.get(), SavedStateHandle(mapOf("show7Days" to true, "showSystem" to true)), - LOCATION_PERMISSION_GROUP + LOCATION_PERMISSION_GROUP, ) val countDownLatch = CountDownLatch(1) diff --git a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/util/PermissionMappingTest.kt b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/util/PermissionMappingTest.kt deleted file mode 100644 index aa7d7da60..000000000 --- a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/util/PermissionMappingTest.kt +++ /dev/null @@ -1,79 +0,0 @@ -/* - * 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.permissioncontroller.permission.util - -import android.Manifest -import android.app.AppOpsManager -import android.health.connect.HealthPermissions -import androidx.test.ext.junit.runners.AndroidJUnit4 -import com.android.permissioncontroller.permission.utils.PermissionMapping -import com.google.common.truth.Truth.assertThat -import org.junit.Test -import org.junit.runner.RunWith - -@RunWith(AndroidJUnit4::class) -class PermissionMappingTest { - @Test - fun testGetPlatformPermissionGroupForOp_healthPermissionGroup() { - assertThat( - PermissionMapping.getPlatformPermissionGroupForOp( - AppOpsManager.OPSTR_READ_WRITE_HEALTH_DATA - ) - ) - .isEqualTo(HealthPermissions.HEALTH_PERMISSION_GROUP) - } - - @Test - fun testGetPlatformPermissionGroupForOp_microphone() { - assertThat( - PermissionMapping.getPlatformPermissionGroupForOp( - AppOpsManager.OPSTR_PHONE_CALL_MICROPHONE - ) - ) - .isEqualTo(Manifest.permission_group.MICROPHONE) - } - - @Test - fun testGetPlatformPermissionGroupForOp_camera() { - assertThat( - PermissionMapping.getPlatformPermissionGroupForOp( - AppOpsManager.OPSTR_PHONE_CALL_CAMERA - ) - ) - .isEqualTo(Manifest.permission_group.CAMERA) - } - - @Test - fun testGetPlatformPermissionGroupForOp_InvalidOpName() { - try { - assertThat(PermissionMapping.getPlatformPermissionGroupForOp("invalid_opName")) - .isEqualTo(null) - } catch (e: IllegalArgumentException) { - // ignore wtf may throw in some configuration. - } - } - - @Test - fun testGetPlatformPermissionGroupForOp_readContacts() { - assertThat( - PermissionMapping.getPlatformPermissionGroupForOp(AppOpsManager.OPSTR_READ_CONTACTS) - ) - .isEqualTo( - PermissionMapping.getGroupOfPlatformPermission(Manifest.permission.READ_CONTACTS) - ) - } -} diff --git a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/util/ArrayUtilsTest.kt b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/ArrayUtilsTest.kt index 708d4222f..6590a4516 100644 --- a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/util/ArrayUtilsTest.kt +++ b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/ArrayUtilsTest.kt @@ -14,13 +14,16 @@ * limitations under the License. */ -package com.android.permissioncontroller.permission.util +package com.android.permissioncontroller.permission.utils -import com.android.permissioncontroller.permission.utils.ArrayUtils +import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.google.common.truth.Truth.assertThat +import org.junit.Rule import org.junit.Test class ArrayUtilsTest { + @JvmField @Rule val instantTaskExecutorRule = InstantTaskExecutorRule() + @Test fun appendString_appendToNull_returnsArrayWithString() { assertThat(ArrayUtils.appendString(null, TEST_STRING)).isEqualTo(arrayOf(TEST_STRING)) diff --git a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/util/CollectionUtilsTest.kt b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/CollectionUtilsTest.kt index 3d4bd28ff..771f4ab6e 100644 --- a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/util/CollectionUtilsTest.kt +++ b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/CollectionUtilsTest.kt @@ -14,13 +14,16 @@ * limitations under the License. */ -package com.android.permissioncontroller.permission.util +package com.android.permissioncontroller.permission.utils -import com.android.permissioncontroller.permission.utils.CollectionUtils +import androidx.arch.core.executor.testing.InstantTaskExecutorRule import com.google.common.truth.Truth.assertThat +import org.junit.Rule import org.junit.Test class CollectionUtilsTest { + @JvmField @Rule val instantTaskExecutorRule = InstantTaskExecutorRule() + @Test fun testContains_true() { val byteArrays = setOf(TEST_BYTE_ARRAY_1, TEST_BYTE_ARRAY_2, TEST_BYTE_ARRAY_3) diff --git a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/util/KotlinUtilsTest.kt b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/KotlinUtilsTest.kt index 37aa8d988..2c8eefcd3 100644 --- a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/util/KotlinUtilsTest.kt +++ b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/KotlinUtilsTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.permissioncontroller.permission.util +package com.android.permissioncontroller.permission.utils import android.Manifest.permission.READ_MEDIA_IMAGES import android.Manifest.permission.READ_MEDIA_VIDEO @@ -30,11 +30,12 @@ import android.graphics.Canvas import android.graphics.ColorFilter import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable +import androidx.arch.core.executor.testing.InstantTaskExecutorRule import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import com.android.permissioncontroller.permission.utils.KotlinUtils import com.google.common.truth.Truth.assertThat import kotlin.test.assertFailsWith +import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.any @@ -48,6 +49,8 @@ import org.mockito.Mockito.`when` as whenever class KotlinUtilsTest { private val targetContext = InstrumentationRegistry.getInstrumentation().targetContext + @JvmField @Rule val instantTaskExecutorRule = InstantTaskExecutorRule() + @Test fun convertToBitmap_argb888BitmapDrawable_returnsSameBitmap() { val bitmap = Bitmap.createBitmap(/* width= */ 5, /* height= */ 10, Bitmap.Config.ARGB_8888) @@ -64,11 +67,15 @@ class KotlinUtilsTest { class FakeDrawable(private val intrinsicSize: Int) : Drawable() { override fun getIntrinsicWidth() = intrinsicSize + override fun getIntrinsicHeight() = intrinsicSize override fun draw(canvas: Canvas) = Unit // no-op + override fun getOpacity() = throw UnsupportedOperationException() + override fun setAlpha(alpha: Int) = throw UnsupportedOperationException() + override fun setColorFilter(colorFilter: ColorFilter?) = throw UnsupportedOperationException() } diff --git a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/PermissionMappingTest.kt b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/PermissionMappingTest.kt new file mode 100644 index 000000000..cf349b8d4 --- /dev/null +++ b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/PermissionMappingTest.kt @@ -0,0 +1,171 @@ +/* + * 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.permissioncontroller.permission.utils + +import android.Manifest +import android.app.AppOpsManager +import android.health.connect.HealthPermissions +import android.os.Build +import android.permission.flags.Flags +import android.platform.test.annotations.RequiresFlagsDisabled +import android.platform.test.annotations.RequiresFlagsEnabled +import android.platform.test.flag.junit.CheckFlagsRule +import android.platform.test.flag.junit.DeviceFlagsValueProvider +import androidx.arch.core.executor.testing.InstantTaskExecutorRule +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SdkSuppress +import com.google.common.truth.Truth.assertThat +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +import org.junit.Assume.assumeTrue +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class PermissionMappingTest { + + @JvmField @Rule val instantTaskExecutorRule = InstantTaskExecutorRule() + @JvmField @Rule val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() + + @Test + fun testGetPlatformPermissionGroupForOp_healthPermissionGroup() { + assertThat( + PermissionMapping.getPlatformPermissionGroupForOp( + AppOpsManager.OPSTR_READ_WRITE_HEALTH_DATA + ) + ) + .isEqualTo(HealthPermissions.HEALTH_PERMISSION_GROUP) + } + + @Test + fun testGetPlatformPermissionGroupForOp_microphone() { + assertThat( + PermissionMapping.getPlatformPermissionGroupForOp( + AppOpsManager.OPSTR_PHONE_CALL_MICROPHONE + ) + ) + .isEqualTo(Manifest.permission_group.MICROPHONE) + } + + @Test + fun testGetPlatformPermissionGroupForOp_camera() { + assertThat( + PermissionMapping.getPlatformPermissionGroupForOp( + AppOpsManager.OPSTR_PHONE_CALL_CAMERA + ) + ) + .isEqualTo(Manifest.permission_group.CAMERA) + } + + @Test + fun testGetPlatformPermissionGroupForOp_InvalidOpName() { + try { + assertThat(PermissionMapping.getPlatformPermissionGroupForOp("invalid_opName")) + .isEqualTo(null) + } catch (e: IllegalArgumentException) { + // ignore wtf may throw in some configuration. + } + } + + @Test + fun testGetPlatformPermissionGroupForOp_readContacts() { + assertThat( + PermissionMapping.getPlatformPermissionGroupForOp(AppOpsManager.OPSTR_READ_CONTACTS) + ) + .isEqualTo( + PermissionMapping.getGroupOfPlatformPermission(Manifest.permission.READ_CONTACTS) + ) + } + + @Test + fun testHealthPermissionIsRuntime_healthPermissionUiEnabled_isRuntime() { + assumeTrue(Utils.isHealthPermissionUiEnabled()) + + assertThat(PermissionMapping.isRuntimePlatformPermission( + HealthPermissions.READ_HEART_RATE)).isTrue() + } + + @Test + fun testHealthPermissionGroupIsPlatform_healthPermissionUiEnabled_isPlatform() { + assumeTrue(Utils.isHealthPermissionUiEnabled()) + + assertThat(PermissionMapping.isPlatformPermissionGroup( + HealthPermissions.HEALTH_PERMISSION_GROUP)).isTrue() + } + + @Test + fun testGetGroupForHealthPermission_healthPermissionUiEnabled_isHealthPermissionGroup() { + assumeTrue(Utils.isHealthPermissionUiEnabled()) + + assertThat(PermissionMapping.getGroupOfPlatformPermission( + HealthPermissions.READ_HEART_RATE)).isEqualTo( + HealthPermissions.HEALTH_PERMISSION_GROUP) + } + + @Test + fun testGetPermNameForHealthPermissionGroup_healthPermissionUiEnabled_isHealthPermission() { + assumeTrue(Utils.isHealthPermissionUiEnabled()) + + assertThat(PermissionMapping.getPlatformPermissionNamesOfGroup( + HealthPermissions.HEALTH_PERMISSION_GROUP)).contains( + HealthPermissions.READ_HEART_RATE) + } + + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA) + @RequiresFlagsEnabled(Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + @Test + fun getGroupOfPlatformPermission_replaceBodySensorFlagEnabled_notHaveSensorsGroup() { + assertNull(PermissionMapping.getGroupOfPlatformPermission(Manifest.permission.BODY_SENSORS)) + assertNull( + PermissionMapping.getGroupOfPlatformPermission( + Manifest.permission.BODY_SENSORS_BACKGROUND + ) + ) + } + + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA) + @RequiresFlagsDisabled(Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + @Test + fun getGroupOfPlatformPermission_replaceBodySensorFlagDisabled_haveSensorsGroup() { + assertNotNull( + PermissionMapping.getGroupOfPlatformPermission(Manifest.permission.BODY_SENSORS) + ) + assertNotNull( + PermissionMapping.getGroupOfPlatformPermission( + Manifest.permission.BODY_SENSORS_BACKGROUND + ) + ) + } + + + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.TIRAMISU, + maxSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, + ) + @Test + fun getGroupOfPlatformPermission_preV_haveSensorsGroup() { + assertNotNull( + PermissionMapping.getGroupOfPlatformPermission(Manifest.permission.BODY_SENSORS) + ) + assertNotNull( + PermissionMapping.getGroupOfPlatformPermission( + Manifest.permission.BODY_SENSORS_BACKGROUND + ) + ) + } +} diff --git a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/util/UtilsTest.kt b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/UtilsTest.kt index 11bcca356..8cc6b952c 100644 --- a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/util/UtilsTest.kt +++ b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/UtilsTest.kt @@ -14,8 +14,10 @@ * limitations under the License. */ -package com.android.permissioncontroller.permission.util +package com.android.permissioncontroller.permission.utils +import android.Manifest.permission.BODY_SENSORS +import android.Manifest.permission.BODY_SENSORS_BACKGROUND import android.Manifest.permission.READ_CONTACTS import android.Manifest.permission_group.ACTIVITY_RECOGNITION import android.Manifest.permission_group.CALENDAR @@ -38,20 +40,35 @@ import android.content.Intent import android.content.SharedPreferences import android.content.pm.PackageManager.NameNotFoundException import android.content.res.Resources +import android.os.Build +import android.permission.flags.Flags +import android.platform.test.annotations.RequiresFlagsDisabled +import android.platform.test.annotations.RequiresFlagsEnabled +import android.platform.test.flag.junit.CheckFlagsRule +import android.platform.test.flag.junit.DeviceFlagsValueProvider +import androidx.arch.core.executor.testing.InstantTaskExecutorRule +import androidx.test.filters.SdkSuppress import androidx.test.platform.app.InstrumentationRegistry import com.android.permissioncontroller.Constants.EXTRA_SESSION_ID import com.android.permissioncontroller.Constants.INVALID_SESSION_ID import com.android.permissioncontroller.R -import com.android.permissioncontroller.permission.utils.Utils import com.android.permissioncontroller.privacysources.WorkPolicyInfo import com.google.common.truth.Truth.assertThat import kotlin.test.assertFailsWith +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue import org.junit.Ignore +import org.junit.Rule import org.junit.Test class UtilsTest { + + @JvmField @Rule val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() + private val context = InstrumentationRegistry.getInstrumentation().targetContext as Context + @JvmField @Rule val instantTaskExecutorRule = InstantTaskExecutorRule() + @Test fun getAbsoluteTimeString_zero_returnsNull() { assertThat(Utils.getAbsoluteTimeString(context, 0)).isNull() @@ -96,6 +113,7 @@ class UtilsTest { fun getBlockedTitle_invalidGroupName_returnsMinusOne() { assertThat(Utils.getBlockedTitle(INVALID_GROUP_NAME)).isEqualTo(-1) } + @Test fun getBlockedTitle_validGroupName() { assertThat(Utils.getBlockedTitle(CAMERA)).isEqualTo(R.string.blocked_camera_title) @@ -295,6 +313,59 @@ class UtilsTest { assertThat(permissionInfos[0].name).isEqualTo(READ_CONTACTS) } + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA) + @RequiresFlagsEnabled(Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + @Test + fun getInstalledRuntimePermissionInfosForGroup_bodySensorFlagEnabled_bodySensorPermissionsNotIncluded() { + val permissionNamesInUndefinedGroup = + Utils.getInstalledRuntimePermissionInfosForGroup(context.packageManager, UNDEFINED) + .map { it.name } + val permissionNamesInSensorsGroup = + Utils.getInstalledRuntimePermissionInfosForGroup(context.packageManager, SENSORS) + .map { it.name } + + assertFalse(permissionNamesInUndefinedGroup.contains(BODY_SENSORS)) + assertFalse(permissionNamesInUndefinedGroup.contains(BODY_SENSORS_BACKGROUND)) + assertFalse(permissionNamesInSensorsGroup.contains(BODY_SENSORS)) + assertFalse(permissionNamesInSensorsGroup.contains(BODY_SENSORS_BACKGROUND)) + } + + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA) + @RequiresFlagsDisabled(Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + @Test + fun getInstalledRuntimePermissionInfosForGroup_bodySensorFlagDisabled_bodySensorPermissionsIncluded() { + val permissionNamesInUndefinedGroup = + Utils.getInstalledRuntimePermissionInfosForGroup(context.packageManager, UNDEFINED) + .map { it.name } + val permissionNamesInSensorsGroup = + Utils.getInstalledRuntimePermissionInfosForGroup(context.packageManager, SENSORS) + .map { it.name } + + assertFalse(permissionNamesInUndefinedGroup.contains(BODY_SENSORS)) + assertFalse(permissionNamesInUndefinedGroup.contains(BODY_SENSORS_BACKGROUND)) + assertTrue(permissionNamesInSensorsGroup.contains(BODY_SENSORS)) + assertTrue(permissionNamesInSensorsGroup.contains(BODY_SENSORS_BACKGROUND)) + } + + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.TIRAMISU, + maxSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, + ) + @Test + fun getInstalledRuntimePermissionInfosForGroup_preV_bodySensorPermissionsIncluded() { + val permissionNamesInUndefinedGroup = + Utils.getInstalledRuntimePermissionInfosForGroup(context.packageManager, UNDEFINED) + .map { it.name } + val permissionNamesInSensorsGroup = + Utils.getInstalledRuntimePermissionInfosForGroup(context.packageManager, SENSORS) + .map { it.name } + + assertFalse(permissionNamesInUndefinedGroup.contains(BODY_SENSORS)) + assertFalse(permissionNamesInUndefinedGroup.contains(BODY_SENSORS_BACKGROUND)) + assertTrue(permissionNamesInSensorsGroup.contains(BODY_SENSORS)) + assertTrue(permissionNamesInSensorsGroup.contains(BODY_SENSORS_BACKGROUND)) + } + @Test fun getColorResId_validId_returnsNonZero() { assertThat(Utils.getColorResId(context, android.R.attr.colorPrimary)) diff --git a/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/v31/AdminRestrictedPermissionsUtilsTest.kt b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/v31/AdminRestrictedPermissionsUtilsTest.kt new file mode 100644 index 000000000..b1ac6095d --- /dev/null +++ b/PermissionController/tests/inprocess/src/com/android/permissioncontroller/permission/utils/v31/AdminRestrictedPermissionsUtilsTest.kt @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2025 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.permissioncontroller.permission.utils.v31 + +import android.app.admin.DevicePolicyManager +import android.content.Context +import android.health.connect.HealthConnectManager +import android.health.connect.HealthPermissions +import android.os.Build +import android.permission.flags.Flags +import android.platform.test.annotations.RequiresFlagsEnabled +import android.platform.test.flag.junit.CheckFlagsRule +import android.platform.test.flag.junit.DeviceFlagsValueProvider +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SdkSuppress +import org.junit.Assert.assertEquals +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mockito.mock + +@RunWith(AndroidJUnit4::class) +class AdminRestrictedPermissionsUtilsTest { + + @JvmField @Rule val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() + + private val context: Context = ApplicationProvider.getApplicationContext() + private val dpm: DevicePolicyManager = mock(DevicePolicyManager::class.java) + + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA) + @RequiresFlagsEnabled(Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + @Test + fun mayAdminGrantPermission_healthPermissions_restricted() { + val permissions: Set<String> = HealthConnectManager.getHealthPermissions(context) + for (permission in permissions) { + val canGrant = + AdminRestrictedPermissionsUtils.mayAdminGrantPermission( + permission, + HealthPermissions.HEALTH_PERMISSION_GROUP, + /* canAdminGrantSensorsPermissions= */ false, + /* isManagedProfile= */ false, + dpm, + ) + assertEquals(false, canGrant) + } + } +} diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/domain/usecase/GetPermissionGroupUsageDetailsUseCaseTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/domain/usecase/GetPermissionGroupUsageDetailsUseCaseTest.kt index e6a1c15c2..b73113ffc 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/domain/usecase/GetPermissionGroupUsageDetailsUseCaseTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/domain/usecase/GetPermissionGroupUsageDetailsUseCaseTest.kt @@ -21,10 +21,12 @@ import android.content.Context import android.content.pm.ApplicationInfo import android.content.pm.PackageInfo import android.content.pm.PackageManager +import android.os.Build import android.os.UserHandle import android.permission.flags.Flags import android.platform.test.annotations.RequiresFlagsEnabled import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SdkSuppress import com.android.dx.mockito.inline.extended.ExtendedMockito import com.android.modules.utils.build.SdkLevel import com.android.permissioncontroller.PermissionControllerApplication @@ -75,7 +77,7 @@ class GetPermissionGroupUsageDetailsUseCaseTest { private var mockitoSession: MockitoSession? = null private lateinit var packageInfos: MutableMap<String, PackageInfoModel> - private val currentUser = android.os.Process.myUserHandle() + private val currentUser = UserHandle.of(0) private val privateProfile = UserHandle.of(10) private val guestUser = UserHandle.of(20) @@ -846,7 +848,10 @@ class GetPermissionGroupUsageDetailsUseCaseTest { @Test @Ignore("b/365004787") - @RequiresFlagsEnabled(Flags.FLAG_LOCATION_BYPASS_PRIVACY_DASHBOARD_ENABLED) + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, + codeName = "VanillaIceCream", + ) fun emergencyAccessesAreNotClusteredWithRegularAccesses() = runTest { Assume.assumeTrue(SdkLevel.isAtLeastV()) val appOpEvents = @@ -870,7 +875,10 @@ class GetPermissionGroupUsageDetailsUseCaseTest { } @Test - @RequiresFlagsEnabled(Flags.FLAG_LOCATION_BYPASS_PRIVACY_DASHBOARD_ENABLED) + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, + codeName = "VanillaIceCream", + ) fun emergencyAccessesAreClustered() = runTest { Assume.assumeTrue(SdkLevel.isAtLeastV()) val appOpEvents = diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PermissionStorageTimeChangeReceiverTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PermissionStorageTimeChangeReceiverTest.kt index 2ae4b0585..5612b7731 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PermissionStorageTimeChangeReceiverTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PermissionStorageTimeChangeReceiverTest.kt @@ -49,7 +49,7 @@ import org.mockito.Mockito.mock import org.mockito.Mockito.never import org.mockito.Mockito.spy import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -125,7 +125,7 @@ class PermissionStorageTimeChangeReceiverTest { receiver.onReceive(context, Intent(Intent.ACTION_TIME_CHANGED)) verify(receiver, never()).onTimeChanged(anyLong()) - verifyZeroInteractions(editor) + verifyNoMoreInteractions(editor) } @Test @@ -133,7 +133,7 @@ class PermissionStorageTimeChangeReceiverTest { receiver.onReceive(context, Intent(Intent.ACTION_MANAGE_PERMISSIONS)) verify(receiver, never()).onTimeChanged(anyLong()) - verifyZeroInteractions(editor) + verifyNoMoreInteractions(editor) } @Test diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PersistedStoragePackageUninstalledReceiverTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PersistedStoragePackageUninstalledReceiverTest.kt index baa848960..4b89d5141 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PersistedStoragePackageUninstalledReceiverTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PersistedStoragePackageUninstalledReceiverTest.kt @@ -40,7 +40,7 @@ import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.Mockito import org.mockito.Mockito.spy -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -102,7 +102,7 @@ class PersistedStoragePackageUninstalledReceiverTest { receiver.onReceive(context, intent) - verifyZeroInteractions(permissionEventStorage) + verifyNoMoreInteractions(permissionEventStorage) } @Test diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/ui/model/PermissionUsageDetailsViewModelTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/ui/model/PermissionUsageDetailsViewModelTest.kt index edaea9aba..4334026c3 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/ui/model/PermissionUsageDetailsViewModelTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/ui/model/PermissionUsageDetailsViewModelTest.kt @@ -30,8 +30,8 @@ import com.android.permissioncontroller.PermissionControllerApplication import com.android.permissioncontroller.appops.data.model.v31.DiscretePackageOpsModel import com.android.permissioncontroller.appops.data.model.v31.DiscretePackageOpsModel.DiscreteOpModel import com.android.permissioncontroller.permission.domain.usecase.v31.GetPermissionGroupUsageDetailsUseCase +import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModel.PermissionUsageDetailsUiState -import com.android.permissioncontroller.permission.ui.model.v31.PermissionUsageDetailsViewModelV2 import com.android.permissioncontroller.permission.utils.LocationUtils import com.android.permissioncontroller.permission.utils.StringUtils import com.android.permissioncontroller.permission.utils.Utils @@ -67,7 +67,7 @@ import org.mockito.quality.Strictness /** * These unit tests are for new permission timeline implementation, the new view model class is - * [PermissionUsageDetailsViewModelV2] + * [PermissionUsageDetailsViewModel] */ @RunWith(AndroidJUnit4::class) class PermissionUsageDetailsViewModelTest { @@ -107,7 +107,7 @@ class PermissionUsageDetailsViewModelTest { any(), anyInt(), anyInt(), - any(Array<String>::class.java) + any(Array<String>::class.java), ) ) .thenReturn("Duration Summary") @@ -119,7 +119,7 @@ class PermissionUsageDetailsViewModelTest { systemPackageName to getPackageInfoModel( systemPackageName, - applicationFlags = ApplicationInfo.FLAG_SYSTEM + applicationFlags = ApplicationInfo.FLAG_SYSTEM, ), ) .toMutableMap() @@ -127,7 +127,7 @@ class PermissionUsageDetailsViewModelTest { packageRepository = FakePackageRepository( packageInfos, - packagesAndLabels = mapOf(testPackageName to testPackageLabel) + packagesAndLabels = mapOf(testPackageName to testPackageLabel), ) } @@ -140,9 +140,7 @@ class PermissionUsageDetailsViewModelTest { fun verifyOnlyNonSystemAppsAreShown() = runTest { val accessTimeMillis = (getCurrentTime() - TimeUnit.HOURS.toMillis(5)) val appOpEvents = - listOf( - DiscreteOpModel(AppOpsManager.OPSTR_COARSE_LOCATION, accessTimeMillis, -1), - ) + listOf(DiscreteOpModel(AppOpsManager.OPSTR_COARSE_LOCATION, accessTimeMillis, -1)) val discretePackageOps = flow { emit( listOf( @@ -176,8 +174,8 @@ class PermissionUsageDetailsViewModelTest { DiscreteOpModel( AppOpsManager.OPSTR_COARSE_LOCATION, accessTimeMillis, - TimeUnit.MINUTES.toMillis(1) - ), + TimeUnit.MINUTES.toMillis(1), + ) ) val discretePackageOps = flow { emit( @@ -192,7 +190,7 @@ class PermissionUsageDetailsViewModelTest { getViewModel( LOCATION_PERMISSION_GROUP, discretePackageOps, - savedStateMap = mapOf("show7Days" to false, "showSystem" to true) + savedStateMap = mapOf("show7Days" to false, "showSystem" to true), ) val uiState = getPermissionUsageDetailsUiState(underTest) @@ -210,13 +208,13 @@ class PermissionUsageDetailsViewModelTest { DiscreteOpModel( AppOpsManager.OPSTR_COARSE_LOCATION, accessTimeMillis, - TimeUnit.MINUTES.toMillis(1) - ), + TimeUnit.MINUTES.toMillis(1), + ) ) val discretePackageOps = flow { emit( listOf( - DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents), + DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents) ) ) } @@ -225,7 +223,7 @@ class PermissionUsageDetailsViewModelTest { getViewModel( LOCATION_PERMISSION_GROUP, discretePackageOps, - savedStateMap = mapOf("show7Days" to false, "showSystem" to false) + savedStateMap = mapOf("show7Days" to false, "showSystem" to false), ) val uiState = getPermissionUsageDetailsUiState(underTest) @@ -240,13 +238,13 @@ class PermissionUsageDetailsViewModelTest { DiscreteOpModel( AppOpsManager.OPSTR_COARSE_LOCATION, accessTimeMillis, - TimeUnit.MINUTES.toMillis(1) - ), + TimeUnit.MINUTES.toMillis(1), + ) ) val discretePackageOps = flow { emit( listOf( - DiscretePackageOpsModel(systemPackageName, currentUser.identifier, appOpEvents), + DiscretePackageOpsModel(systemPackageName, currentUser.identifier, appOpEvents) ) ) } @@ -255,7 +253,7 @@ class PermissionUsageDetailsViewModelTest { getViewModel( LOCATION_PERMISSION_GROUP, discretePackageOps, - savedStateMap = mapOf("show7Days" to false, "showSystem" to false) + savedStateMap = mapOf("show7Days" to false, "showSystem" to false), ) val uiState = getPermissionUsageDetailsUiState(underTest) @@ -271,18 +269,18 @@ class PermissionUsageDetailsViewModelTest { DiscreteOpModel( AppOpsManager.OPSTR_CAMERA, accessStartWithIn24Hours, - TimeUnit.MINUTES.toMillis(5) + TimeUnit.MINUTES.toMillis(5), ), DiscreteOpModel( AppOpsManager.OPSTR_CAMERA, accessStartBefore24Hours, - TimeUnit.MINUTES.toMillis(7) + TimeUnit.MINUTES.toMillis(7), ), ) val discretePackageOps = flow { emit( listOf( - DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents), + DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents) ) ) } @@ -304,18 +302,18 @@ class PermissionUsageDetailsViewModelTest { DiscreteOpModel( AppOpsManager.OPSTR_CAMERA, accessTimeWithIn24Hours, - TimeUnit.MINUTES.toMillis(5) + TimeUnit.MINUTES.toMillis(5), ), DiscreteOpModel( AppOpsManager.OPSTR_CAMERA, accessTimeBefore24Hours, - TimeUnit.MINUTES.toMillis(7) + TimeUnit.MINUTES.toMillis(7), ), ) val discretePackageOps = flow { emit( listOf( - DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents), + DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents) ) ) } @@ -344,13 +342,13 @@ class PermissionUsageDetailsViewModelTest { DiscreteOpModel( AppOpsManager.OPSTR_CAMERA, accessTimeMillis, - TimeUnit.MINUTES.toMillis(5) - ), + TimeUnit.MINUTES.toMillis(5), + ) ) val discretePackageOps = flow { emit( listOf( - DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents), + DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents) ) ) } @@ -371,13 +369,13 @@ class PermissionUsageDetailsViewModelTest { DiscreteOpModel( AppOpsManager.OPSTR_CAMERA, accessTimeMillis, - TimeUnit.MINUTES.toMillis(1) - ), + TimeUnit.MINUTES.toMillis(1), + ) ) val discretePackageOps = flow { emit( listOf( - DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents), + DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents) ) ) } @@ -397,22 +395,16 @@ class PermissionUsageDetailsViewModelTest { whenever(application.getString(anyInt())).thenReturn("emergency attr label") val accessTimeMillis = (getCurrentTime() - TimeUnit.HOURS.toMillis(5)) val appOpEvents = - listOf( - DiscreteOpModel(AppOpsManager.OPSTR_EMERGENCY_LOCATION, accessTimeMillis, -1), - ) + listOf(DiscreteOpModel(AppOpsManager.OPSTR_EMERGENCY_LOCATION, accessTimeMillis, -1)) val discretePackageOps = flow { emit( listOf( - DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents), + DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents) ) ) } - val underTest = - getViewModel( - LOCATION_PERMISSION_GROUP, - discretePackageOps, - ) + val underTest = getViewModel(LOCATION_PERMISSION_GROUP, discretePackageOps) val uiState = getPermissionUsageDetailsUiState(underTest) assertThat(uiState.appPermissionAccessUiInfoList.size).isEqualTo(1) val timelineRow = uiState.appPermissionAccessUiInfoList.first() @@ -429,21 +421,15 @@ class PermissionUsageDetailsViewModelTest { DiscreteOpModel( AppOpsManager.OPSTR_COARSE_LOCATION, accessTimeMillis, - TimeUnit.MINUTES.toMillis(1) - ), + TimeUnit.MINUTES.toMillis(1), + ) ) val actualData = - listOf( - DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents), - ) + listOf(DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents)) val discretePackageOps = MutableStateFlow(emptyList<DiscretePackageOpsModel>()) discretePackageOps.emit(emptyList()) - val underTest = - getViewModel( - LOCATION_PERMISSION_GROUP, - discretePackageOps, - ) + val underTest = getViewModel(LOCATION_PERMISSION_GROUP, discretePackageOps) val result by collectLastValue(underTest.permissionUsageDetailsUiStateFlow) var uiState = result as PermissionUsageDetailsUiState.Success assertThat(uiState.appPermissionAccessUiInfoList).isEmpty() @@ -463,22 +449,18 @@ class PermissionUsageDetailsViewModelTest { DiscreteOpModel( AppOpsManager.OPSTR_COARSE_LOCATION, accessTimeMillis, - TimeUnit.MINUTES.toMillis(1) - ), + TimeUnit.MINUTES.toMillis(1), + ) ) val discretePackageOps = flow { emit( listOf( - DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents), + DiscretePackageOpsModel(testPackageName, currentUser.identifier, appOpEvents) ) ) } - val underTest = - getViewModel( - LOCATION_PERMISSION_GROUP, - discretePackageOps, - ) + val underTest = getViewModel(LOCATION_PERMISSION_GROUP, discretePackageOps) val uiState = getPermissionUsageDetailsUiState(underTest) assertThat(uiState.show7Days).isFalse() @@ -517,20 +499,20 @@ class PermissionUsageDetailsViewModelTest { permissionGroup: String, discretePackageOps: Flow<List<DiscretePackageOpsModel>>, savedStateMap: Map<String, Boolean> = mapOf("show7Days" to false, "showSystem" to false), - pkgRepository: PackageRepository = packageRepository + pkgRepository: PackageRepository = packageRepository, ) = - PermissionUsageDetailsViewModelV2( + PermissionUsageDetailsViewModel( application, getPermissionGroupUsageDetailsUseCase(permissionGroup, discretePackageOps), SavedStateHandle(savedStateMap), permissionGroup, scope = backgroundScope, StandardTestDispatcher(testScheduler), - packageRepository = pkgRepository + packageRepository = pkgRepository, ) private fun TestScope.getPermissionUsageDetailsUiState( - viewModel: PermissionUsageDetailsViewModelV2 + viewModel: PermissionUsageDetailsViewModel ): PermissionUsageDetailsUiState.Success { val result by collectLastValue(viewModel.permissionUsageDetailsUiStateFlow) return result as PermissionUsageDetailsUiState.Success @@ -542,7 +524,7 @@ class PermissionUsageDetailsViewModelTest { permissionsFlags: List<Int> = listOf( PackageInfo.REQUESTED_PERMISSION_GRANTED, - PackageInfo.REQUESTED_PERMISSION_GRANTED + PackageInfo.REQUESTED_PERMISSION_GRANTED, ), applicationFlags: Int = 0, ) = PackageInfoModel(packageName, requestedPermissions, permissionsFlags, applicationFlags) diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt index 0c864da4a..4d94d8c1c 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/AdminRestrictedPermissionsUtilsTest.kt @@ -17,75 +17,125 @@ package com.android.permissioncontroller.tests.mocking.permission.utils import android.app.admin.DevicePolicyManager +import android.content.Context +import android.health.connect.HealthPermissions +import android.os.Build +import android.permission.flags.Flags import android.platform.test.annotations.AsbSecurityTest +import android.platform.test.annotations.RequiresFlagsEnabled +import android.platform.test.flag.junit.DeviceFlagsValueProvider +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SdkSuppress import com.android.modules.utils.build.SdkLevel import com.android.permissioncontroller.permission.utils.v31.AdminRestrictedPermissionsUtils import org.junit.Assert.assertEquals import org.junit.Assume import org.junit.Before +import org.junit.Rule import org.junit.Test +import org.junit.experimental.runners.Enclosed import org.junit.runner.RunWith import org.junit.runners.Parameterized import org.mockito.Mockito.mock -@RunWith(Parameterized::class) -class AdminRestrictedPermissionsUtilsTest( - private val permission: String, - private val group: String?, - private val canAdminGrantSensorsPermissions: Boolean, - private val expected: Boolean -) { +@RunWith(Enclosed::class) +object AdminRestrictedPermissionsUtilsTest { + + @get:Rule val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() + + private val context: Context = ApplicationProvider.getApplicationContext() private val dpm: DevicePolicyManager = mock(DevicePolicyManager::class.java) - @Before - fun setup() { - Assume.assumeTrue(SdkLevel.isAtLeastS()) - } + @RunWith(Parameterized::class) + class AdminRestrictedPermissionsUtilsParameterizedTest( + private val permission: String, + private val group: String?, + private val canAdminGrantSensorsPermissions: Boolean, + private val expected: Boolean, + ) { - @AsbSecurityTest(cveBugId = [308138085]) - @Test - fun mayAdminGrantPermissionTest() { - val canGrant = - AdminRestrictedPermissionsUtils.mayAdminGrantPermission( - permission, - group, - canAdminGrantSensorsPermissions, - false, - dpm - ) - assertEquals(expected, canGrant) - } + @Before + fun setup() { + Assume.assumeTrue(SdkLevel.isAtLeastS()) + } - companion object { - /** - * Returns a list of arrays containing the following values: - * - * 0. Permission name (String) - * 1. Permission group name (String) - * 2. Can admin grant sensors permissions (Boolean) - * 3. Expected return from mayAdminGrantPermission method (Boolean) - */ - @JvmStatic - @Parameterized.Parameters(name = "{index}: validate({0}, {1}, {3}) = {4}") - fun getParameters(): List<Array<out Any?>> { - return listOf( - arrayOf("abc", "xyz", false, true), - arrayOf("abc", null, false, true), - arrayOf("android.permission.RECORD_AUDIO", "xyz", false, false), - arrayOf("abc", "android.permission-group.MICROPHONE", false, false), - arrayOf( - "android.permission.RECORD_AUDIO", - "android.permission-group.MICROPHONE", + @AsbSecurityTest(cveBugId = [308138085]) + @Test + fun mayAdminGrantPermissionTest() { + val canGrant = + AdminRestrictedPermissionsUtils.mayAdminGrantPermission( + permission, + group, + canAdminGrantSensorsPermissions, false, - false - ), - arrayOf( - "android.permission.RECORD_AUDIO", - "android.permission-group.MICROPHONE", - true, - true - ), - ) + dpm, + ) + assertEquals(expected, canGrant) + } + + companion object { + /** + * Returns a list of arrays containing the following values: + * 0. Permission name (String) + * 1. Permission group name (String) + * 2. Can admin grant sensors permissions (Boolean) + * 3. Expected return from mayAdminGrantPermission method (Boolean) + */ + @JvmStatic + @Parameterized.Parameters(name = "{index}: validate({0}, {1}, {3}) = {4}") + fun getParameters(): List<Array<out Any?>> { + return listOf( + arrayOf("abc", "xyz", false, true), + arrayOf("abc", null, false, true), + arrayOf("android.permission.RECORD_AUDIO", "xyz", false, false), + arrayOf("abc", "android.permission-group.MICROPHONE", false, false), + arrayOf( + "android.permission.RECORD_AUDIO", + "android.permission-group.MICROPHONE", + false, + false, + ), + arrayOf( + "android.permission.RECORD_AUDIO", + "android.permission-group.MICROPHONE", + true, + true, + ), + ) + } + } + } + + @RunWith(AndroidJUnit4::class) + class AdminRestrictedPermissionsUtilsSingleTest { + + @Test + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA) + @RequiresFlagsEnabled(Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + fun addAdminRestrictedPermission_addsPermissionToRestrictedList() { + val exampleHealthPermission = "test.permission.health" + var canGrant = + AdminRestrictedPermissionsUtils.mayAdminGrantPermission( + exampleHealthPermission, + /* group= */ null, + /* canAdminGrantSensorsPermissions= */ false, + /* isManagedProfile= */ false, + dpm, + ) + assertEquals(true, canGrant) + + AdminRestrictedPermissionsUtils.addAdminRestrictedPermission(exampleHealthPermission) + + canGrant = + AdminRestrictedPermissionsUtils.mayAdminGrantPermission( + exampleHealthPermission, + /* group= */ null, + /* canAdminGrantSensorsPermissions= */ false, + /* isManagedProfile= */ false, + dpm, + ) + assertEquals(false, canGrant) } } } diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/GrantRevokeTests.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/GrantRevokeTests.kt index 28f69b136..593061a83 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/GrantRevokeTests.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/utils/GrantRevokeTests.kt @@ -241,7 +241,7 @@ class GrantRevokeTests { perms: Map<String, LightPermission> = emptyMap() ): LightAppPermGroup { val pGi = LightPermGroupInfo(PERM_GROUP_NAME, TEST_PACKAGE_NAME, 0, 0, 0, false) - return LightAppPermGroup(pkgInfo, pGi, perms, false, false) + return LightAppPermGroup(pkgInfo, pGi, perms, false, false, false) } /** diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/AppDataSharingUpdatesPrivacySourceTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/AppDataSharingUpdatesPrivacySourceTest.kt index d09b5093f..731022cb5 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/AppDataSharingUpdatesPrivacySourceTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/AppDataSharingUpdatesPrivacySourceTest.kt @@ -55,7 +55,7 @@ import org.mockito.ArgumentMatchers.anyBoolean import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -102,14 +102,14 @@ class AppDataSharingUpdatesPrivacySourceTest { fun safetyCenterEnabledChanged_enabled_doesNothing() { appDataSharingUpdatesPrivacySource.safetyCenterEnabledChanged(context, true) - verifyZeroInteractions(mockSafetyCenterManager) + verifyNoMoreInteractions(mockSafetyCenterManager) } @Test fun safetyCenterEnabledChanged_disabled_doesNothing() { appDataSharingUpdatesPrivacySource.safetyCenterEnabledChanged(context, false) - verifyZeroInteractions(mockSafetyCenterManager) + verifyNoMoreInteractions(mockSafetyCenterManager) } @Test diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/NotificationListenerPrivacySourceTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/NotificationListenerPrivacySourceTest.kt index cc3b096a8..cac60e1a2 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/NotificationListenerPrivacySourceTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/NotificationListenerPrivacySourceTest.kt @@ -55,7 +55,7 @@ import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.Mockito.never import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -209,7 +209,7 @@ class NotificationListenerPrivacySourceTest { privacySource.safetyCenterEnabledChanged(context, false) - verifyZeroInteractions(mockSafetyCenterManager) + verifyNoMoreInteractions(mockSafetyCenterManager) } @Test @@ -281,7 +281,7 @@ class NotificationListenerPrivacySourceTest { SafetyCenterReceiver.RefreshEvent.UNKNOWN ) - verifyZeroInteractions(mockSafetyCenterManager) + verifyNoMoreInteractions(mockSafetyCenterManager) } private fun setNotificationListenerCheckEnabled(enabled: Boolean) { diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/SafetyCenterReceiverTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/SafetyCenterReceiverTest.kt index a0199979d..2c166f24b 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/SafetyCenterReceiverTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/SafetyCenterReceiverTest.kt @@ -55,7 +55,7 @@ import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.Mockito import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -199,8 +199,8 @@ class SafetyCenterReceiverTest { safetyCenterReceiver.onReceive(application, intent) advanceUntilIdle() - verifyZeroInteractions(mockPrivacySource) - verifyZeroInteractions(mockPrivacySource2) + verifyNoMoreInteractions(mockPrivacySource) + verifyNoMoreInteractions(mockPrivacySource2) } @Test @@ -214,7 +214,7 @@ class SafetyCenterReceiverTest { verify(mockPrivacySource) .rescanAndPushSafetyCenterData(application, intent, EVENT_REFRESH_REQUESTED) - verifyZeroInteractions(mockPrivacySource2) + verifyNoMoreInteractions(mockPrivacySource2) } @Test @@ -225,8 +225,8 @@ class SafetyCenterReceiverTest { safetyCenterReceiver.onReceive(application, intent) advanceUntilIdle() - verifyZeroInteractions(mockPrivacySource) - verifyZeroInteractions(mockPrivacySource2) + verifyNoMoreInteractions(mockPrivacySource) + verifyNoMoreInteractions(mockPrivacySource2) } @Test @@ -238,7 +238,7 @@ class SafetyCenterReceiverTest { safetyCenterReceiver.onReceive(application, intent) advanceUntilIdle() - verifyZeroInteractions(mockPrivacySource) - verifyZeroInteractions(mockPrivacySource2) + verifyNoMoreInteractions(mockPrivacySource) + verifyNoMoreInteractions(mockPrivacySource2) } } diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/WorkPolicyInfoTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/WorkPolicyInfoTest.kt index bbbf0e86a..e2f1443e3 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/WorkPolicyInfoTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/WorkPolicyInfoTest.kt @@ -21,6 +21,7 @@ import android.content.Context import android.content.ContextWrapper import android.content.Intent import android.os.Build +import android.os.Process import android.os.UserManager import android.safetycenter.SafetyCenterManager import android.safetycenter.SafetyEvent @@ -46,7 +47,7 @@ import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.Mockito import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -118,6 +119,8 @@ class WorkPolicyInfoTest { whenever(PermissionControllerApplication.get()).thenReturn(application) whenever(application.applicationContext).thenReturn(application) workPolicyInfo = WorkPolicyInfo(mockWorkPolicyUtils) + val userId = Process.myUserHandle().identifier + whenever(mockWorkPolicyUtils.managedProfileUserId).thenReturn(userId) } @After @@ -166,7 +169,7 @@ class WorkPolicyInfoTest { fun safetyCenterEnabledChanged_safetyCenterDisabled() { workPolicyInfo.safetyCenterEnabledChanged(context, false) - verifyZeroInteractions(mockSafetyCenterManager) + verifyNoMoreInteractions(mockSafetyCenterManager) } @Test @@ -193,7 +196,7 @@ class WorkPolicyInfoTest { workPolicyInfo.safetyCenterEnabledChanged(context, false) - verifyZeroInteractions(mockSafetyCenterManager) + verifyNoMoreInteractions(mockSafetyCenterManager) } @Test diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/safetycenter/ui/model/SafetyCenterUiDataTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/safetycenter/ui/model/SafetyCenterUiDataTest.kt index ca0392716..e53fabc90 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/safetycenter/ui/model/SafetyCenterUiDataTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/safetycenter/ui/model/SafetyCenterUiDataTest.kt @@ -18,6 +18,7 @@ package com.android.permissioncontroller.tests.mocking.safetycenter.ui.model import android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE import android.os.Bundle +import android.os.UserHandle import android.safetycenter.SafetyCenterData import android.safetycenter.SafetyCenterEntryGroup import android.safetycenter.SafetyCenterEntryOrGroup @@ -28,8 +29,14 @@ import android.safetycenter.SafetyCenterIssue.ISSUE_SEVERITY_LEVEL_RECOMMENDATIO import android.safetycenter.SafetyCenterStatus import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SdkSuppress +import com.android.permissioncontroller.safetycenter.ui.model.ActionId +import com.android.permissioncontroller.safetycenter.ui.model.IssueId +import com.android.permissioncontroller.safetycenter.ui.model.IssueUiData import com.android.permissioncontroller.safetycenter.ui.model.SafetyCenterUiData import com.android.safetycenter.internaldata.SafetyCenterBundles.ISSUES_TO_GROUPS_BUNDLE_KEY +import com.android.safetycenter.internaldata.SafetyCenterIds +import com.android.safetycenter.internaldata.SafetyCenterIssueId +import com.android.safetycenter.internaldata.SafetyCenterIssueKey import com.google.common.truth.Truth.assertThat import org.junit.Test import org.junit.runner.RunWith @@ -40,42 +47,42 @@ class SafetyCenterUiDataTest { @Test fun getMatchingGroup_validMatchingGroup_returnsExpectedEntryGroup() { - val matchingGroup = createSafetyCenterEntryGroup(MATCHING_GROUP_ID) - val nonMatchingGroup = createSafetyCenterEntryGroup(NON_MATCHING_GROUP_ID) + val matchingGroup = entryGroup(MATCHING_GROUP_ID) + val nonMatchingGroup = entryGroup(NON_MATCHING_GROUP_ID) val safetyCenterData = createSafetyCenterData(entryGroups = listOf(matchingGroup, nonMatchingGroup)) - val result = SafetyCenterUiData(safetyCenterData).getMatchingGroup(MATCHING_GROUP_ID) + val result = uiData(safetyCenterData).getMatchingGroup(MATCHING_GROUP_ID) assertThat(result).isEqualTo(matchingGroup) } @Test fun getMatchingGroup_noMatchingGroup_returnsNull() { - val nonMatchingGroup = createSafetyCenterEntryGroup(NON_MATCHING_GROUP_ID) + val nonMatchingGroup = entryGroup(NON_MATCHING_GROUP_ID) val safetyCenterData = createSafetyCenterData(entryGroups = listOf(nonMatchingGroup)) - val result = SafetyCenterUiData(safetyCenterData).getMatchingGroup(MATCHING_GROUP_ID) + val result = uiData(safetyCenterData).getMatchingGroup(MATCHING_GROUP_ID) assertThat(result).isNull() } @Test fun getMatchingIssues_defaultMatchingIssue_noExtras_returnsListOfIssues() { - val defaultMatchingIssue = createSafetyCenterIssue("id1", MATCHING_GROUP_ID) - val nonMatchingIssue = createSafetyCenterIssue("id2", NON_MATCHING_GROUP_ID) + val defaultMatchingIssue = issue("id1", MATCHING_GROUP_ID) + val nonMatchingIssue = issue("id2", NON_MATCHING_GROUP_ID) val safetyCenterData = createSafetyCenterData(issues = listOf(defaultMatchingIssue, nonMatchingIssue)) - val result = SafetyCenterUiData(safetyCenterData).getMatchingIssues(MATCHING_GROUP_ID) + val result = uiData(safetyCenterData).getMatchingIssues(MATCHING_GROUP_ID) assertThat(result).containsExactly(defaultMatchingIssue) } @Test fun getMatchingIssues_defaultMatchingIssue_unrelatedExtras_returnsListOfIssues() { - val defaultMatchingIssue = createSafetyCenterIssue("id1", MATCHING_GROUP_ID) - val nonMatchingIssue = createSafetyCenterIssue("id2", NON_MATCHING_GROUP_ID) + val defaultMatchingIssue = issue("id1", MATCHING_GROUP_ID) + val nonMatchingIssue = issue("id2", NON_MATCHING_GROUP_ID) val safetyCenterData = createSafetyCenterData( issues = listOf(defaultMatchingIssue, nonMatchingIssue), @@ -84,21 +91,21 @@ class SafetyCenterUiDataTest { Bundle().apply { putStringArrayList( nonMatchingIssue.id, - arrayListOf(NON_MATCHING_GROUP_ID) + arrayListOf(NON_MATCHING_GROUP_ID), ) } - ) + ), ) - val result = SafetyCenterUiData(safetyCenterData).getMatchingIssues(MATCHING_GROUP_ID) + val result = uiData(safetyCenterData).getMatchingIssues(MATCHING_GROUP_ID) assertThat(result).containsExactly(defaultMatchingIssue) } @Test fun getMatchingIssues_mappingMatchingIssue_returnsListOfIssues() { - val mappingMatchingIssue = createSafetyCenterIssue("id1", NON_MATCHING_GROUP_ID) - val nonMatchingIssue = createSafetyCenterIssue("id2", NON_MATCHING_GROUP_ID) + val mappingMatchingIssue = issue("id1", NON_MATCHING_GROUP_ID) + val nonMatchingIssue = issue("id2", NON_MATCHING_GROUP_ID) val safetyCenterData = createSafetyCenterData( issues = listOf(mappingMatchingIssue, nonMatchingIssue), @@ -107,51 +114,50 @@ class SafetyCenterUiDataTest { Bundle().apply { putStringArrayList( mappingMatchingIssue.id, - arrayListOf(MATCHING_GROUP_ID) + arrayListOf(MATCHING_GROUP_ID), ) } - ) + ), ) - val result = SafetyCenterUiData(safetyCenterData).getMatchingIssues(MATCHING_GROUP_ID) + val result = uiData(safetyCenterData).getMatchingIssues(MATCHING_GROUP_ID) assertThat(result).containsExactly(mappingMatchingIssue) } @Test fun getMatchingIssues_noDefaultMatchingIssue_returnsEmptyList() { - val nonMatchingIssue = createSafetyCenterIssue("id1", NON_MATCHING_GROUP_ID) - val dismissedIssue = createSafetyCenterIssue("id2", MATCHING_GROUP_ID) + val nonMatchingIssue = issue("id1", NON_MATCHING_GROUP_ID) + val dismissedIssue = issue("id2", MATCHING_GROUP_ID) val safetyCenterData = createSafetyCenterData( issues = listOf(nonMatchingIssue), - dismissedIssues = listOf(dismissedIssue) + dismissedIssues = listOf(dismissedIssue), ) - val result = SafetyCenterUiData(safetyCenterData).getMatchingIssues(MATCHING_GROUP_ID) + val result = uiData(safetyCenterData).getMatchingIssues(MATCHING_GROUP_ID) assertThat(result).isEmpty() } @Test fun getMatchingDismissedIssues_defaultMatchingDismissedIssue_returnsListOfDismissedIssues() { - val defaultMatchingDismissedIssue = createSafetyCenterIssue("id1", MATCHING_GROUP_ID) - val nonMatchingDismissedIssue = createSafetyCenterIssue("id2", NON_MATCHING_GROUP_ID) + val defaultMatchingDismissedIssue = issue("id1", MATCHING_GROUP_ID) + val nonMatchingDismissedIssue = issue("id2", NON_MATCHING_GROUP_ID) val safetyCenterData = createSafetyCenterData( dismissedIssues = listOf(defaultMatchingDismissedIssue, nonMatchingDismissedIssue) ) - val result = - SafetyCenterUiData(safetyCenterData).getMatchingDismissedIssues(MATCHING_GROUP_ID) + val result = uiData(safetyCenterData).getMatchingDismissedIssues(MATCHING_GROUP_ID) assertThat(result).containsExactly(defaultMatchingDismissedIssue) } @Test fun getMatchingDismissedIssues_defaultMatchingDismissedIssue2_returnsListOfDismissedIssues() { - val defaultMatchingDismissedIssue = createSafetyCenterIssue("id1", MATCHING_GROUP_ID) - val nonMatchingDismissedIssue = createSafetyCenterIssue("id2", NON_MATCHING_GROUP_ID) + val defaultMatchingDismissedIssue = issue("id1", MATCHING_GROUP_ID) + val nonMatchingDismissedIssue = issue("id2", NON_MATCHING_GROUP_ID) val safetyCenterData = createSafetyCenterData( dismissedIssues = listOf(defaultMatchingDismissedIssue, nonMatchingDismissedIssue), @@ -160,22 +166,21 @@ class SafetyCenterUiDataTest { Bundle().apply { putStringArrayList( nonMatchingDismissedIssue.id, - arrayListOf(NON_MATCHING_GROUP_ID) + arrayListOf(NON_MATCHING_GROUP_ID), ) } - ) + ), ) - val result = - SafetyCenterUiData(safetyCenterData).getMatchingDismissedIssues(MATCHING_GROUP_ID) + val result = uiData(safetyCenterData).getMatchingDismissedIssues(MATCHING_GROUP_ID) assertThat(result).containsExactly(defaultMatchingDismissedIssue) } @Test fun getMatchingDismissedIssues_mappingMatchingDismissedIssue_returnsListOfDismissedIssues() { - val mappingMatchingDismissedIssue = createSafetyCenterIssue("id1", NON_MATCHING_GROUP_ID) - val nonMatchingDismissedIssue = createSafetyCenterIssue("id2", NON_MATCHING_GROUP_ID) + val mappingMatchingDismissedIssue = issue("id1", NON_MATCHING_GROUP_ID) + val nonMatchingDismissedIssue = issue("id2", NON_MATCHING_GROUP_ID) val safetyCenterData = createSafetyCenterData( dismissedIssues = listOf(mappingMatchingDismissedIssue, nonMatchingDismissedIssue), @@ -184,30 +189,28 @@ class SafetyCenterUiDataTest { Bundle().apply { putStringArrayList( mappingMatchingDismissedIssue.id, - arrayListOf(MATCHING_GROUP_ID) + arrayListOf(MATCHING_GROUP_ID), ) } - ) + ), ) - val result = - SafetyCenterUiData(safetyCenterData).getMatchingDismissedIssues(MATCHING_GROUP_ID) + val result = uiData(safetyCenterData).getMatchingDismissedIssues(MATCHING_GROUP_ID) assertThat(result).containsExactly(mappingMatchingDismissedIssue) } @Test fun getMatchingDismissedIssues_noDefaultMatchingDismissedIssue_returnsEmptyList() { - val nonMatchingDismissedIssue = createSafetyCenterIssue("id1", NON_MATCHING_GROUP_ID) - val nonDismissedIssue = createSafetyCenterIssue("id2", MATCHING_GROUP_ID) + val nonMatchingDismissedIssue = issue("id1", NON_MATCHING_GROUP_ID) + val nonDismissedIssue = issue("id2", MATCHING_GROUP_ID) val safetyCenterData = createSafetyCenterData( issues = listOf(nonDismissedIssue), - dismissedIssues = listOf(nonMatchingDismissedIssue) + dismissedIssues = listOf(nonMatchingDismissedIssue), ) - val result = - SafetyCenterUiData(safetyCenterData).getMatchingDismissedIssues(MATCHING_GROUP_ID) + val result = uiData(safetyCenterData).getMatchingDismissedIssues(MATCHING_GROUP_ID) assertThat(result).isEmpty() } @@ -215,24 +218,12 @@ class SafetyCenterUiDataTest { @Test fun getMatchingDismissedIssues_doesntReturnGreenIssues() { val greenDismissedIssue = - createSafetyCenterIssue( - "id1", - MATCHING_GROUP_ID, - severityLevel = ISSUE_SEVERITY_LEVEL_OK - ) + issue("id1", MATCHING_GROUP_ID, severityLevel = ISSUE_SEVERITY_LEVEL_OK) val yellowDismissedIssue = - createSafetyCenterIssue( - "id2", - MATCHING_GROUP_ID, - severityLevel = ISSUE_SEVERITY_LEVEL_RECOMMENDATION - ) + issue("id2", MATCHING_GROUP_ID, severityLevel = ISSUE_SEVERITY_LEVEL_RECOMMENDATION) val redDismissedIssue = - createSafetyCenterIssue( - "id3", - MATCHING_GROUP_ID, - severityLevel = ISSUE_SEVERITY_LEVEL_CRITICAL_WARNING - ) - val nonMatchingDismissedIssue = createSafetyCenterIssue("id4", NON_MATCHING_GROUP_ID) + issue("id3", MATCHING_GROUP_ID, severityLevel = ISSUE_SEVERITY_LEVEL_CRITICAL_WARNING) + val nonMatchingDismissedIssue = issue("id4", NON_MATCHING_GROUP_ID) val safetyCenterData = createSafetyCenterData( dismissedIssues = @@ -240,25 +231,82 @@ class SafetyCenterUiDataTest { redDismissedIssue, yellowDismissedIssue, greenDismissedIssue, - nonMatchingDismissedIssue - ), + nonMatchingDismissedIssue, + ) ) - val result = - SafetyCenterUiData(safetyCenterData).getMatchingDismissedIssues(MATCHING_GROUP_ID) + val result = uiData(safetyCenterData).getMatchingDismissedIssues(MATCHING_GROUP_ID) assertThat(result).containsExactly(redDismissedIssue, yellowDismissedIssue).inOrder() } + @Test + fun issueUiDatas_returnsIssueUiData() { + val issue1 = issue("id1", "group1") + val issue2 = issue("id2", "group2") + val safetyCenterData = createSafetyCenterData(listOf(issue1, issue2)) + + val result = uiData(safetyCenterData).issueUiDatas + + assertThat(result) + .containsExactly( + IssueUiData(issue1, isDismissed = false), + IssueUiData(issue2, isDismissed = false), + ) + .inOrder() + } + + @Test + fun issueUiDatas_withResolvedIssues_returnsExpectedIssueUiData() { + val resolvedActionId = "actionId" + val resolvedIssue = issue("resolvedId", "group1") + val unresolvedIssue = issue("unresolvedId", "group2") + val safetyCenterData = createSafetyCenterData(listOf(resolvedIssue, unresolvedIssue)) + + val result = + uiData(safetyCenterData, resolvedIssues = mapOf(resolvedIssue.id to resolvedActionId)) + .issueUiDatas + + assertThat(result[0].resolvedIssueActionId).isEqualTo(resolvedActionId) + assertThat(result[1].resolvedIssueActionId).isNull() + } + + @Test + fun issueUiDatas_withSameTaskSourceId_returnsExpectedIssueUiData() { + val taskId = 42 + val sameTaskSourceId = "sameTaskSourceId" + val sameTaskIssue = + issueWithEncodedId( + encodeIssueId("sameTaskIssue", sourceId = sameTaskSourceId), + "group1", + ) + val differentTaskIssue = issue("differentTaskIssue", "group2") + val safetyCenterData = createSafetyCenterData(listOf(sameTaskIssue, differentTaskIssue)) + + val result = + uiData(safetyCenterData, taskId, sameTaskSourceIds = listOf(sameTaskSourceId)) + .issueUiDatas + + assertThat(result[0].launchTaskId).isEqualTo(taskId) + assertThat(result[1].launchTaskId).isNull() + } + private companion object { const val MATCHING_GROUP_ID = "matching_group_id" const val NON_MATCHING_GROUP_ID = "non_matching_group_id" + private fun uiData( + safetyCenterData: SafetyCenterData, + taskId: Int = 0, + sameTaskSourceIds: List<String> = emptyList(), + resolvedIssues: Map<IssueId, ActionId> = emptyMap(), + ) = SafetyCenterUiData(safetyCenterData, taskId, sameTaskSourceIds, resolvedIssues) + fun createSafetyCenterData( issues: List<SafetyCenterIssue> = listOf(), entryGroups: List<SafetyCenterEntryGroup> = listOf(), dismissedIssues: List<SafetyCenterIssue> = listOf(), - extras: Bundle = Bundle() + extras: Bundle = Bundle(), ): SafetyCenterData { val safetyCenterStatus = SafetyCenterStatus.Builder("status title", "status summary").build() @@ -276,20 +324,44 @@ class SafetyCenterUiDataTest { return builder.build() } - fun createSafetyCenterEntryGroup(groupId: String) = + fun createSafetyCenterExtras(issuesToGroupsMapping: Bundle) = + Bundle().apply { putBundle(ISSUES_TO_GROUPS_BUNDLE_KEY, issuesToGroupsMapping) } + + fun entryGroup(groupId: String) = SafetyCenterEntryGroup.Builder(groupId, "group title").build() - fun createSafetyCenterIssue( + fun issue( issueId: String, groupId: String, - severityLevel: Int = ISSUE_SEVERITY_LEVEL_RECOMMENDATION + severityLevel: Int = ISSUE_SEVERITY_LEVEL_RECOMMENDATION, + ): SafetyCenterIssue = issueWithEncodedId(encodeIssueId(issueId), groupId, severityLevel) + + private fun issueWithEncodedId( + encodedIssueId: String, + groupId: String, + severityLevel: Int = ISSUE_SEVERITY_LEVEL_RECOMMENDATION, ) = - SafetyCenterIssue.Builder(issueId, "issue title", "issue summary") + SafetyCenterIssue.Builder(encodedIssueId, "issue title", "issue summary") .setSeverityLevel(severityLevel) .setGroupId(groupId) .build() - fun createSafetyCenterExtras(issuesToGroupsMapping: Bundle) = - Bundle().apply { putBundle(ISSUES_TO_GROUPS_BUNDLE_KEY, issuesToGroupsMapping) } + fun encodeIssueId( + sourceIssueId: String, + sourceId: String = "defaultSource", + issueTypeId: String = "defaultIssueTypeId", + ): String = + SafetyCenterIds.encodeToString( + SafetyCenterIssueId.newBuilder() + .setSafetyCenterIssueKey( + SafetyCenterIssueKey.newBuilder() + .setSafetySourceId(sourceId) + .setSafetySourceIssueId(sourceIssueId) + .setUserId(UserHandle.myUserId()) + .build() + ) + .setIssueTypeId(issueTypeId) + .build() + ) } } diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/safetylabel/SafetyLabelChangesJobServiceTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/safetylabel/SafetyLabelChangesJobServiceTest.kt index 4d206a2f4..396ad41df 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/safetylabel/SafetyLabelChangesJobServiceTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/safetylabel/SafetyLabelChangesJobServiceTest.kt @@ -46,7 +46,7 @@ import org.mockito.Mockito.doNothing import org.mockito.Mockito.mock import org.mockito.Mockito.times import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -121,14 +121,14 @@ class SafetyLabelChangesJobServiceTest { receiver.onReceive(application, Intent(Intent.ACTION_BOOT_COMPLETED)) - verifyZeroInteractions(mockJobScheduler) + verifyNoMoreInteractions(mockJobScheduler) } @Test fun onReceiveInvalidIntentAction_jobNotScheduled() { receiver.onReceive(application, Intent(Intent.ACTION_DEFAULT)) - verifyZeroInteractions(mockJobScheduler) + verifyNoMoreInteractions(mockJobScheduler) } @Test diff --git a/PermissionController/tests/permissionui/Android.bp b/PermissionController/tests/permissionui/Android.bp index 6e1839d1d..e289e2c58 100644 --- a/PermissionController/tests/permissionui/Android.bp +++ b/PermissionController/tests/permissionui/Android.bp @@ -47,7 +47,8 @@ android_test { "androidx.test.ext.truth", "androidx.test.rules", "androidx.test.uiautomator_uiautomator", - "com.android.permission.flags-aconfig-java", + "android.permission.flags-aconfig-java-export", + "com.android.permission.flags-aconfig-java-export", "compatibility-device-util-axt", "flag-junit", "permission-test-util-lib", @@ -71,6 +72,9 @@ android_test { ":PermissionUiUseAdditionalPermissionApp", ":PermissionUiUseTwoAdditionalPermissionsApp", ":PermissionUiReadCalendarPermissionApp", + ":PermissionUiUseLegacyBodySensorsPermissionApp", + ":PermissionUiUseReadHeartRatePermissionApp", + ":PermissionUiUseLegacyBodySensorsPermissionTargetSdk22App", ], per_testcase_directory: true, } diff --git a/PermissionController/tests/permissionui/AndroidTest.xml b/PermissionController/tests/permissionui/AndroidTest.xml index a4aa03abe..85dc4925a 100644 --- a/PermissionController/tests/permissionui/AndroidTest.xml +++ b/PermissionController/tests/permissionui/AndroidTest.xml @@ -57,6 +57,18 @@ value="/data/local/tmp/pc-permissionui/PermissionUiUseTwoAdditionalPermissionsApp.apk" /> <option name="push-file" key="PermissionUiReadCalendarPermissionApp.apk" value="/data/local/tmp/pc-permissionui/PermissionUiReadCalendarPermissionApp.apk" /> + <option name="push-file" key="PermissionUiUseLegacyBodySensorsPermissionApp.apk" + value="/data/local/tmp/pc-permissionui/PermissionUiUseLegacyBodySensorsPermissionApp.apk" /> + <option name="push-file" key="PermissionUiUseReadHeartRatePermissionApp.apk" + value="/data/local/tmp/pc-permissionui/PermissionUiUseReadHeartRatePermissionApp.apk" /> + <option name="push-file" key="PermissionUiUseLegacyBodySensorsPermissionTargetSdk22App.apk" + value="/data/local/tmp/pc-permissionui/PermissionUiUseLegacyBodySensorsPermissionTargetSdk22App.apk" /> + </target_preparer> + + <!-- Wake the screen, and dismiss keyguard --> + <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> + <option name="run-command" value="input keyevent KEYCODE_WAKEUP" /> + <option name="run-command" value="wm dismiss-keyguard" /> </target_preparer> <!-- Uninstall test-apps --> diff --git a/PermissionController/tests/permissionui/PermissionUiUseLegacyBodySensorsPermissionApp/Android.bp b/PermissionController/tests/permissionui/PermissionUiUseLegacyBodySensorsPermissionApp/Android.bp new file mode 100644 index 000000000..eb0e2d0fc --- /dev/null +++ b/PermissionController/tests/permissionui/PermissionUiUseLegacyBodySensorsPermissionApp/Android.bp @@ -0,0 +1,34 @@ +// +// Copyright (C) 2025 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 { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_modules_Permission_PermissionController_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: [ + "packages_modules_Permission_PermissionController_license", + ], +} + +android_test_helper_app { + name: "PermissionUiUseLegacyBodySensorsPermissionApp", + + srcs: ["src/**/*.kt"], + + sdk_version: "34", +} diff --git a/PermissionController/tests/permissionui/PermissionUiUseLegacyBodySensorsPermissionApp/AndroidManifest.xml b/PermissionController/tests/permissionui/PermissionUiUseLegacyBodySensorsPermissionApp/AndroidManifest.xml new file mode 100644 index 000000000..fac299b3e --- /dev/null +++ b/PermissionController/tests/permissionui/PermissionUiUseLegacyBodySensorsPermissionApp/AndroidManifest.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2020 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.permissioncontroller.tests.appthatrequestpermission"> + + <uses-permission android:name="android.permission.BODY_SENSORS" /> + <uses-permission android:name="android.permission.BODY_SENSORS_BACKGROUND" /> + + <application /> +</manifest> diff --git a/PermissionController/tests/permissionui/PermissionUiUseLegacyBodySensorsPermissionTargetSdk22App/Android.bp b/PermissionController/tests/permissionui/PermissionUiUseLegacyBodySensorsPermissionTargetSdk22App/Android.bp new file mode 100644 index 000000000..539fb2686 --- /dev/null +++ b/PermissionController/tests/permissionui/PermissionUiUseLegacyBodySensorsPermissionTargetSdk22App/Android.bp @@ -0,0 +1,34 @@ +// +// Copyright (C) 2025 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 { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_modules_Permission_PermissionController_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: [ + "packages_modules_Permission_PermissionController_license", + ], +} + +android_test_helper_app { + name: "PermissionUiUseLegacyBodySensorsPermissionTargetSdk22App", + + srcs: ["src/**/*.kt"], + + sdk_version: "22", +} diff --git a/PermissionController/tests/permissionui/PermissionUiUseLegacyBodySensorsPermissionTargetSdk22App/AndroidManifest.xml b/PermissionController/tests/permissionui/PermissionUiUseLegacyBodySensorsPermissionTargetSdk22App/AndroidManifest.xml new file mode 100644 index 000000000..2a08d47ae --- /dev/null +++ b/PermissionController/tests/permissionui/PermissionUiUseLegacyBodySensorsPermissionTargetSdk22App/AndroidManifest.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.permissioncontroller.tests.appthatrequestpermission"> + + <uses-permission android:name="android.permission.BODY_SENSORS" /> + <uses-permission android:name="android.permission.BODY_SENSORS_BACKGROUND" /> + + <application /> +</manifest> diff --git a/PermissionController/tests/permissionui/PermissionUiUseReadHeartRatePermissionApp/Android.bp b/PermissionController/tests/permissionui/PermissionUiUseReadHeartRatePermissionApp/Android.bp new file mode 100644 index 000000000..ccc9c9636 --- /dev/null +++ b/PermissionController/tests/permissionui/PermissionUiUseReadHeartRatePermissionApp/Android.bp @@ -0,0 +1,34 @@ +// +// Copyright (C) 2025 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 { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_modules_Permission_PermissionController_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: [ + "packages_modules_Permission_PermissionController_license", + ], +} + +android_test_helper_app { + name: "PermissionUiUseReadHeartRatePermissionApp", + + srcs: ["src/**/*.kt"], + + sdk_version: "34", +} diff --git a/PermissionController/tests/permissionui/PermissionUiUseReadHeartRatePermissionApp/AndroidManifest.xml b/PermissionController/tests/permissionui/PermissionUiUseReadHeartRatePermissionApp/AndroidManifest.xml new file mode 100644 index 000000000..278af1987 --- /dev/null +++ b/PermissionController/tests/permissionui/PermissionUiUseReadHeartRatePermissionApp/AndroidManifest.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2020 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.permissioncontroller.tests.appthatrequestpermission"> + + <uses-permission android:name="android.permission.health.READ_HEART_RATE" /> + <uses-permission android:name="android.permission.health.READ_HEALTH_DATA_IN_BACKGROUND" /> + + <application /> +</manifest> diff --git a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAllAppPermissionFragmentTest.kt b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAllAppPermissionFragmentTest.kt index ecc7e161f..1c6705d3e 100644 --- a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAllAppPermissionFragmentTest.kt +++ b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAllAppPermissionFragmentTest.kt @@ -31,6 +31,7 @@ import org.junit.After import org.junit.Assert.assertNull import org.junit.Assume.assumeFalse import org.junit.Before +import org.junit.Ignore import org.junit.Test import org.junit.runner.RunWith @@ -54,6 +55,11 @@ class HealthConnectAllAppPermissionFragmentTest : BasePermissionUiTest() { fun uninstallTestApp() { uninstallTestApps() } + + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, + maxSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, + ) @Test fun usedHealthConnectPermissionsAreListed() { installTestAppThatUsesHealthConnectPermission() @@ -67,6 +73,25 @@ class HealthConnectAllAppPermissionFragmentTest : BasePermissionUiTest() { } } + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") + @Test + @Ignore("b/405152547") + fun usedHealthConnectPermissionsAreListed_healthFitnessBrand() { + installTestAppThatUsesHealthConnectPermission() + + startManageAppPermissionsActivity() + + eventually { + waitFindObject(By.text(HEALTH_FITNESS_LABEL)) + waitFindObject(By.text(HEALTH_CONNECT_PERMISSION_READ_FLOORS_CLIMBED_LABEL)) + waitFindObject(By.text(HEALTH_CONNECT_PERMISSION_READ_STEPS_LABEL)) + } + } + + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, + maxSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, + ) @Test fun invalidUngrantedUsedHealthConnectPermissionsAreNotListed() { installInvalidTestAppThatUsesHealthConnectPermission() @@ -78,13 +103,38 @@ class HealthConnectAllAppPermissionFragmentTest : BasePermissionUiTest() { assertNull( waitFindObjectOrNull( By.text(HEALTH_CONNECT_PERMISSION_READ_FLOORS_CLIMBED_LABEL), - TIMEOUT_SHORT + TIMEOUT_SHORT, + ) + ) + assertNull( + waitFindObjectOrNull( + By.text(HEALTH_CONNECT_PERMISSION_READ_STEPS_LABEL), + TIMEOUT_SHORT, + ) + ) + } + } + + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") + @Test + @Ignore("b/405152547") + fun invalidUngrantedUsedHealthConnectPermissionsAreNotListed_healthFitnessBrand() { + installInvalidTestAppThatUsesHealthConnectPermission() + + startManageAppPermissionsActivity() + + eventually { + assertNull(waitFindObjectOrNull(By.text(HEALTH_FITNESS_LABEL), TIMEOUT_SHORT)) + assertNull( + waitFindObjectOrNull( + By.text(HEALTH_CONNECT_PERMISSION_READ_FLOORS_CLIMBED_LABEL), + TIMEOUT_SHORT, ) ) assertNull( waitFindObjectOrNull( By.text(HEALTH_CONNECT_PERMISSION_READ_STEPS_LABEL), - TIMEOUT_SHORT + TIMEOUT_SHORT, ) ) } @@ -104,7 +154,7 @@ class HealthConnectAllAppPermissionFragmentTest : BasePermissionUiTest() { } }, Until.newWindow(), - TIMEOUT_SHORT + TIMEOUT_SHORT, ) waitFindObject(By.descContains(MORE_OPTIONS)).click() @@ -114,6 +164,7 @@ class HealthConnectAllAppPermissionFragmentTest : BasePermissionUiTest() { companion object { // Health connect label uses a non breaking space private const val HEALTH_CONNECT_LABEL = "Health\u00A0Connect" + private const val HEALTH_FITNESS_LABEL = "Health, fitness and wellness" private const val HEALTH_CONNECT_PERMISSION_READ_FLOORS_CLIMBED = "android.permission.health.READ_FLOORS_CLIMBED" private const val HEALTH_CONNECT_PERMISSION_READ_FLOORS_CLIMBED_LABEL = diff --git a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAppPermissionFragmentTest.kt b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAppPermissionFragmentTest.kt index b2d47a7d7..48d14a967 100644 --- a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAppPermissionFragmentTest.kt +++ b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAppPermissionFragmentTest.kt @@ -16,10 +16,16 @@ package com.android.permissioncontroller.permissionui.ui +import android.content.Context import android.content.Intent +import android.content.pm.PackageManager import android.os.Build +import android.permission.flags.Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED +import android.platform.test.annotations.RequiresFlagsEnabled +import android.platform.test.flag.junit.DeviceFlagsValueProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SdkSuppress +import androidx.test.platform.app.InstrumentationRegistry import androidx.test.uiautomator.By import com.android.compatibility.common.util.SystemUtil.eventually import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity @@ -28,7 +34,10 @@ import com.android.compatibility.common.util.UiAutomatorUtils2.waitUntilObjectGo import com.android.permissioncontroller.permissionui.wakeUpScreen import org.junit.After import org.junit.Assume.assumeFalse +import org.junit.Assume.assumeTrue import org.junit.Before +import org.junit.Ignore +import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -41,10 +50,17 @@ import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) @SdkSuppress(minSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, codeName = "UpsideDownCake") class HealthConnectAppPermissionFragmentTest : BasePermissionUiTest() { + + @Rule @JvmField val mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() + + private lateinit var context: Context + @Before fun assumeNotTelevision() = assumeFalse(isTelevision) @Before - fun wakeScreenUp() { + fun setUp() { + context = InstrumentationRegistry.getInstrumentation().context + wakeUpScreen() } @@ -52,8 +68,14 @@ class HealthConnectAppPermissionFragmentTest : BasePermissionUiTest() { fun uninstallTestApp() { uninstallTestApps() } + + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, + maxSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, + ) @Test - fun usedHealthConnectPermissionsAreListed() { + fun usedHealthConnectPermissionsAreListed_handHeldDevices() { + assumeFalse(context.packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) installTestAppThatUsesHealthConnectPermission() startManageAppPermissionsActivity() @@ -61,13 +83,90 @@ class HealthConnectAppPermissionFragmentTest : BasePermissionUiTest() { eventually { waitFindObject(By.text(HEALTH_CONNECT_LABEL)) } } + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") + @Test + @Ignore("b/405152547") + fun usedHealthConnectPermissionsAreListed_handHeldDevices_healthFitnessBrand() { + assumeFalse(context.packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) + installTestAppThatUsesHealthConnectPermission() + + startManageAppPermissionsActivity() + + eventually { waitFindObject(By.text(HEALTH_FITNESS_LABEL)) } + } + @Test - fun invalidUngrantedUsedHealthConnectPermissionsAreNotListed() { + fun invalidUngrantedUsedHealthConnectPermissionsAreNotListed_handHeldDevices() { + assumeFalse(context.packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) installInvalidTestAppThatUsesHealthConnectPermission() startManageAppPermissionsActivity() waitUntilObjectGone(By.text(HEALTH_CONNECT_LABEL), TIMEOUT_SHORT) + waitUntilObjectGone(By.text(HEALTH_FITNESS_LABEL), TIMEOUT_SHORT) + } + + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") + @RequiresFlagsEnabled(FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + @Test + fun startManageAppPermissionsActivity_wearDevices_requestLegacyBodySensorsUngranted_fitnessAndWellnessShowsUp() { + assumeTrue(context.packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) + installTestAppThatUsesLegacyBodySensorsPermissions() + + startManageAppPermissionsActivity() + + eventually { waitFindObject(By.text(FITNESS_AND_WELLNESS_LABEL)) } + } + + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") + @RequiresFlagsEnabled(FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + @Test + fun startManageAppPermissionsActivity_wearDevices_requestReadHeartRateUngranted_fitnessAndWellnessShowsUp() { + assumeTrue(context.packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) + installTestAppThatUsesReadHeartRatePermissions() + + startManageAppPermissionsActivity() + + eventually { waitFindObject(By.text(FITNESS_AND_WELLNESS_LABEL)) } + } + + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") + @RequiresFlagsEnabled(FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + @Test + @Ignore("b/405152547") + fun startManageAppPermissionsActivity_handHeldDevices_requestLegacyBodySensorsUngranted_healthConnectShowsUp() { + assumeFalse(context.packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) + installTestAppThatUsesLegacyBodySensorsPermissions() + + startManageAppPermissionsActivity() + + eventually { waitFindObject(By.text(HEALTH_FITNESS_LABEL)) } + } + + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") + @RequiresFlagsEnabled(FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + @Test + @Ignore("b/405152547") + fun startManageAppPermissionsActivity_handHeldDevices_requestLegacyBodySensorsTargetSdk22Ungranted_healthConnectShowsUp() { + assumeFalse(context.packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) + installTestAppThatUsesLegacyBodySensorsPermissionsTargetSdk22() + + startManageAppPermissionsActivity() + + eventually { waitFindObject(By.text(HEALTH_FITNESS_LABEL)) } + } + + + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") + @RequiresFlagsEnabled(FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + @Test + fun startManageAppPermissionsActivity_handHeldDevices_requestReadHeartRateUngranted_healthConnectNotShowsUp() { + assumeFalse(context.packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) + installTestAppThatUsesReadHeartRatePermissions() + + startManageAppPermissionsActivity() + + waitUntilObjectGone(By.text(HEALTH_FITNESS_LABEL), TIMEOUT_SHORT) } private fun startManageAppPermissionsActivity() { @@ -83,8 +182,10 @@ class HealthConnectAppPermissionFragmentTest : BasePermissionUiTest() { } companion object { + private const val FITNESS_AND_WELLNESS_LABEL = "Fitness and wellness" // Health connect label uses a non breaking space private const val HEALTH_CONNECT_LABEL = "Health\u00A0Connect" + private const val HEALTH_FITNESS_LABEL = "Health, fitness and wellness" private const val HEALTH_CONNECT_PERMISSION_READ_FLOORS_CLIMBED = "android.permission.health.READ_FLOORS_CLIMBED" diff --git a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/TestAppUtils.kt b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/TestAppUtils.kt index 7227ea3d8..c3799c4c1 100644 --- a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/TestAppUtils.kt +++ b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/TestAppUtils.kt @@ -36,6 +36,12 @@ private const val TWO_ADDITIONAL_PERM_USER_APK = "$APK_DIRECTORY/PermissionUiUseTwoAdditionalPermissionsApp.apk" private const val ADDITIONAL_PERM_DEFINER_APK = "$APK_DIRECTORY/PermissionUiDefineAdditionalPermissionApp.apk" +private const val LEGACY_BODY_SENSORS_APK = + "$APK_DIRECTORY/PermissionUiUseLegacyBodySensorsPermissionApp.apk" +private const val READ_HEART_RATE_APK = + "$APK_DIRECTORY/PermissionUiUseReadHeartRatePermissionApp.apk" +private const val LEGACY_BODY_SENSORS_TARGET_SDK_22_APK = + "$APK_DIRECTORY/PermissionUiUseLegacyBodySensorsPermissionTargetSdk22App.apk" // All 4 of the AppThatUses_X_Permission(s) applications share the same package name. private const val PERM_DEFINER_PACKAGE = @@ -69,6 +75,12 @@ fun installTestAppThatUsesTwoAdditionalPermissions() = install(TWO_ADDITIONAL_PE fun installTestAppThatDefinesAdditionalPermissions() = install(ADDITIONAL_PERM_DEFINER_APK) +fun installTestAppThatUsesLegacyBodySensorsPermissions() = install(LEGACY_BODY_SENSORS_APK) + +fun installTestAppThatUsesReadHeartRatePermissions() = install(READ_HEART_RATE_APK) + +fun installTestAppThatUsesLegacyBodySensorsPermissionsTargetSdk22() = install(LEGACY_BODY_SENSORS_TARGET_SDK_22_APK) + fun uninstallTestApps() { uninstallApp(PERM_USER_PACKAGE) uninstallApp(PERM_DEFINER_PACKAGE) diff --git a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/handheld/ManageCustomPermissionsFragmentTest.kt b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/handheld/ManageCustomPermissionsFragmentTest.kt index b38f5f40a..2ad4d4925 100644 --- a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/handheld/ManageCustomPermissionsFragmentTest.kt +++ b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/handheld/ManageCustomPermissionsFragmentTest.kt @@ -17,11 +17,18 @@ package com.android.permissioncontroller.permissionui.ui.handheld import android.content.Intent +import android.os.Build +import android.permission.flags.Flags import android.permission.cts.PermissionUtils.grantPermission import android.permission.cts.PermissionUtils.install import android.permission.cts.PermissionUtils.revokePermission import android.permission.cts.PermissionUtils.uninstallApp +import android.platform.test.annotations.RequiresFlagsDisabled +import android.platform.test.annotations.RequiresFlagsEnabled +import android.platform.test.flag.junit.CheckFlagsRule +import android.platform.test.flag.junit.DeviceFlagsValueProvider import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SdkSuppress import androidx.test.uiautomator.By import com.android.compatibility.common.util.SystemUtil.eventually import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity @@ -32,13 +39,18 @@ import com.android.permissioncontroller.permissionui.wakeUpScreen import com.google.common.truth.Truth.assertThat import org.junit.After import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull import org.junit.Before +import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith /** Simple tests for {@link ManageCustomPermissionsFragment} */ @RunWith(AndroidJUnit4::class) class ManageCustomPermissionsFragmentTest : BaseHandheldPermissionUiTest() { + + @JvmField @Rule val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() + private val ONE_PERMISSION_DEFINER_APK = "/data/local/tmp/pc-permissionui/" + "PermissionUiDefineAdditionalPermissionApp.apk" private val PERMISSION_USER_APK = @@ -95,14 +107,40 @@ class ManageCustomPermissionsFragmentTest : BaseHandheldPermissionUiTest() { eventually { assertThat(getUsageCountsFromUi(PERM_LABEL)).isEqualTo(original) } } + + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.TIRAMISU, + maxSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, + ) + @Test + fun testFindBodySensor_preV_labelDisplayed() { + if (waitFindObjectOrNull(By.textContains(BODY_SENSORS_LABEL)) == null) { + waitFindObject(By.textContains(ADDITIONAL_PERMISSIONS_LABEL)).click() + assertNotNull(waitFindObjectOrNull(By.textContains(BODY_SENSORS_LABEL))) + } + } + + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA) + @RequiresFlagsDisabled(Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) @Test - fun bodySensorsEitherDisplayedInMainPageOrInAdditional() { + fun testFindBodySensor_replaceBodySensorFlagDisabled_labelDisplayed() { if (waitFindObjectOrNull(By.textContains(BODY_SENSORS_LABEL)) == null) { waitFindObject(By.textContains(ADDITIONAL_PERMISSIONS_LABEL)).click() assertNotNull(waitFindObjectOrNull(By.textContains(BODY_SENSORS_LABEL))) } } + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA) + @RequiresFlagsEnabled(Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + @Test + fun testFindBodySensor_replaceBodySensorFlagEnabled_labelNotDisplayed() { + install(ONE_PERMISSION_DEFINER_APK) + + assertNull(waitFindObjectOrNull(By.textContains(BODY_SENSORS_LABEL))) + waitFindObject(By.textContains(ADDITIONAL_PERMISSIONS_LABEL)).click() + assertNull(waitFindObjectOrNull(By.textContains(BODY_SENSORS_LABEL))) + } + @After fun tearDown() { uninstallApp(DEFINER_PKG) diff --git a/PermissionController/wear-permission-components/Android.bp b/PermissionController/wear-permission-components/Android.bp new file mode 100644 index 000000000..bdd783b60 --- /dev/null +++ b/PermissionController/wear-permission-components/Android.bp @@ -0,0 +1,67 @@ +// Copyright (C) 2022 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 { + default_team: "trendy_team_android_permissions", + default_applicable_licenses: ["Android-Apache-2.0"], +} + +filegroup { + name: "wear-permission-components-sources", + srcs: [ + "src/**/*.kt", + ], + visibility: ["//visibility:private"], +} + +android_library { + name: "wear-permission-components", + manifest: "AndroidManifest.xml", + sdk_version: "system_current", + min_sdk_version: "30", + target_sdk_version: "33", + srcs: [ + ":wear-permission-components-sources", + ], + resource_dirs: ["res"], + libs: [ + "androidx.annotation_annotation", + "framework-annotations-lib", + ], + static_libs: [ + "androidx.fragment_fragment", + "androidx.appcompat_appcompat", + "androidx.compose.foundation_foundation", + "androidx.compose.runtime_runtime", + "androidx.compose.runtime_runtime-livedata", + "androidx.compose.ui_ui", + "androidx.wear.compose_compose-material", + "androidx.wear.compose_compose-material3", + ], + kotlin_lang_version: "1.9", + kotlincflags: [ + "-Werror", + "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi", + "-Xjvm-default=all", + ], + installable: false, + visibility: [ + "//packages/modules:__subpackages__", + ], + apex_available: [ + "//apex_available:platform", + "com.android.permission", + "com.android.healthfitness", + ], +} diff --git a/PermissionController/wear-permission-components/AndroidManifest.xml b/PermissionController/wear-permission-components/AndroidManifest.xml new file mode 100644 index 000000000..57eca6176 --- /dev/null +++ b/PermissionController/wear-permission-components/AndroidManifest.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2022 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. + --> +<manifest package="com.android.permissioncontroller.wear.permission.components"> +</manifest> diff --git a/PermissionController/res/drawable/ic_security_update_good.xml b/PermissionController/wear-permission-components/res/drawable/ic_security_update_good.xml index 59e7a67fa..59e7a67fa 100644 --- a/PermissionController/res/drawable/ic_security_update_good.xml +++ b/PermissionController/wear-permission-components/res/drawable/ic_security_update_good.xml diff --git a/PermissionController/res/values-watch/donottranslate.xml b/PermissionController/wear-permission-components/res/values/donottranslate.xml index 43830a93c..03038ddd1 100644 --- a/PermissionController/res/values-watch/donottranslate.xml +++ b/PermissionController/wear-permission-components/res/values/donottranslate.xml @@ -71,7 +71,7 @@ <dimen name="wear_compose_material3_numeral_extra_large_font_size">60sp</dimen> <dimen name="wear_compose_material3_title_small_font_size">14sp</dimen> <dimen name="wear_compose_material3_title_medium_font_size">16sp</dimen> - <dimen name="wear_compose_material3_title_large_font_size">20sp</dimen> + <dimen name="wear_compose_material3_title_large_font_size">18sp</dimen> <dimen name="wear_compose_material3_shape_corner_extra_small_size">4dp</dimen> <dimen name="wear_compose_material3_shape_corner_small_size">8dp</dimen> diff --git a/PermissionController/wear-permission-components/res/values/overlayable.xml b/PermissionController/wear-permission-components/res/values/overlayable.xml new file mode 100644 index 000000000..94c5972f4 --- /dev/null +++ b/PermissionController/wear-permission-components/res/values/overlayable.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2019 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. +--> +<resources> + <overlayable name="WearPermissionControllerStyles"> + <policy type="product|system|vendor|odm|oem"> + <!--START WEAR SPECIFIC MATERIAL3 FONT FACE TOKENS--> + <item type="string" name="wear_compose_material3_arc_small_font_family" /> + <item type="string" name="wear_compose_material3_arc_medium_font_family" /> + <item type="string" name="wear_compose_material3_arc_large_font_family" /> + + <item type="string" name="wear_compose_material3_body_extra_small_font_family" /> + <item type="string" name="wear_compose_material3_body_small_font_family" /> + <item type="string" name="wear_compose_material3_body_medium_font_family" /> + <item type="string" name="wear_compose_material3_body_large_font_family" /> + + <item type="string" name="wear_compose_material3_display_small_font_family" /> + <item type="string" name="wear_compose_material3_display_medium_font_family" /> + <item type="string" name="wear_compose_material3_display_large_font_family" /> + + <item type="string" name="wear_compose_material3_label_small_font_family" /> + <item type="string" name="wear_compose_material3_label_medium_font_family" /> + <item type="string" name="wear_compose_material3_label_large_font_family" /> + + <item type="string" name="wear_compose_material3_numeral_extra_small_font_family" /> + <item type="string" name="wear_compose_material3_numeral_small_font_family" /> + <item type="string" name="wear_compose_material3_numeral_medium_font_family" /> + <item type="string" name="wear_compose_material3_numeral_large_font_family" /> + <item type="string" name="wear_compose_material3_numeral_extra_large_font_family" /> + + <item type="string" name="wear_compose_material3_title_small_font_family" /> + <item type="string" name="wear_compose_material3_title_medium_font_family" /> + <item type="string" name="wear_compose_material3_title_large_font_family" /> + <!--END WEAR SPECIFIC MATERIAL3 FONT FACE TOKENS--> + + + <!--START WEAR SPECIFIC MATERIAL3 FONT SIZE TOKENS--> + <item type="dimen" name="wear_compose_material3_arc_small_font_size" /> + <item type="dimen" name="wear_compose_material3_arc_medium_font_size" /> + <item type="dimen" name="wear_compose_material3_arc_large_font_size" /> + + <item type="dimen" name="wear_compose_material3_body_extra_small_font_size" /> + <item type="dimen" name="wear_compose_material3_body_small_font_size" /> + <item type="dimen" name="wear_compose_material3_body_medium_font_size" /> + <item type="dimen" name="wear_compose_material3_body_large_font_size" /> + + <item type="dimen" name="wear_compose_material3_display_small_font_size" /> + <item type="dimen" name="wear_compose_material3_display_medium_font_size" /> + <item type="dimen" name="wear_compose_material3_display_large_font_size" /> + + <item type="dimen" name="wear_compose_material3_label_small_font_size" /> + <item type="dimen" name="wear_compose_material3_label_medium_font_size" /> + <item type="dimen" name="wear_compose_material3_label_large_font_size" /> + + <item type="dimen" name="wear_compose_material3_numeral_extra_small_font_size" /> + <item type="dimen" name="wear_compose_material3_numeral_small_font_size" /> + <item type="dimen" name="wear_compose_material3_numeral_medium_font_size" /> + <item type="dimen" name="wear_compose_material3_numeral_large_font_size" /> + <item type="dimen" name="wear_compose_material3_numeral_extra_large_font_size" /> + + <item type="dimen" name="wear_compose_material3_title_small_font_size" /> + <item type="dimen" name="wear_compose_material3_title_medium_font_size" /> + <item type="dimen" name="wear_compose_material3_title_large_font_size" /> + <!--END WEAR SPECIFIC MATERIAL3 FONT SIZE TOKENS--> + + <!--START WEAR SPECIFIC MATERIAL3 SHAPE TOKENS--> + <item type="dimen" name="wear_compose_material3_shape_corner_extra_small_size" /> + <item type="dimen" name="wear_compose_material3_shape_corner_small_size" /> + <item type="dimen" name="wear_compose_material3_shape_corner_medium_size" /> + <item type="dimen" name="wear_compose_material3_shape_corner_large_size" /> + <item type="dimen" name="wear_compose_material3_shape_corner_extra_large_size" /> + <!--END WEAR SPECIFIC MATERIAL3 SHAPE TOKENS--> + </policy> + </overlayable> +</resources>
\ No newline at end of file diff --git a/PermissionController/wear-permission-components/res/values/strings.xml b/PermissionController/wear-permission-components/res/values/strings.xml new file mode 100644 index 000000000..a9956ddb5 --- /dev/null +++ b/PermissionController/wear-permission-components/res/values/strings.xml @@ -0,0 +1,7 @@ +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Accessibility description indicating that a toggle control status is on. [CHAR LIMIT=NONE] --> + <string name="on">On</string> + + <!-- Accessibility description indicating that a status is off. [CHAR LIMIT=NONE] --> + <string name="off">Off</string> +</resources>
\ No newline at end of file diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/AnnotatedText.kt b/PermissionController/wear-permission-components/src/wear.permission.components/AnnotatedText.kt index 07bb88e80..4d7954c5a 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/AnnotatedText.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/AnnotatedText.kt @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.android.permissioncontroller.permission.ui.wear.elements +package com.android.permissioncontroller.wear.permission.components import android.text.Spanned import android.text.style.ClickableSpan @@ -32,10 +31,14 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.style.TextDecoration import androidx.wear.compose.material.MaterialTheme -import com.android.permissioncontroller.permission.ui.wear.WearUtils.capitalize +import java.util.Locale const val CLICKABLE_SPAN_TAG = "CLICKABLE_SPAN_TAG" +fun String.capitalize(): String = replaceFirstChar { + if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() +} + @Composable fun AnnotatedText( text: CharSequence, diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/CheckYourPhone.kt b/PermissionController/wear-permission-components/src/wear.permission.components/CheckYourPhone.kt index 59376b8fa..467aae4e1 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/CheckYourPhone.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/CheckYourPhone.kt @@ -13,26 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.android.permissioncontroller.permission.ui.wear.elements +package com.android.permissioncontroller.wear.permission.components import android.content.res.Configuration +import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp +import androidx.wear.compose.material.CircularProgressIndicator +import androidx.wear.compose.material.Icon import androidx.wear.compose.material.MaterialTheme import androidx.wear.compose.material.Scaffold import androidx.wear.compose.material.Text -import com.android.permissioncontroller.R private const val TOP_PADDING_SCREEN_PERCENTAGE = 0.1248f private const val BOTTOM_PADDING_SCREEN_PERCENTAGE = 0.0624f @@ -41,16 +47,12 @@ private const val TEXT_PADDING_SCREEN_PERCENTAGE = 0.0416f enum class CheckYourPhoneState { InProgress, - Success + Success, } /** * A screen to request the user to check their paired phone to proceed. It also allows a [message] * to be displayed. - * - * <img - * src="https://media.githubusercontent.com/media/google/horologist/main/docs/auth-composables/check_your_phone_screen_code.png" - * height="120" width="120"/> */ @Composable fun CheckYourPhoneScreen( @@ -60,9 +62,7 @@ fun CheckYourPhoneScreen( message: String? = null, ) { val configuration = LocalConfiguration.current - val isLarge = configuration.isLargeScreen - val topPadding = (configuration.screenHeightDp * TOP_PADDING_SCREEN_PERCENTAGE).dp val bottomPadding = (configuration.screenHeightDp * BOTTOM_PADDING_SCREEN_PERCENTAGE).dp val sidePadding = (configuration.screenHeightDp * SIDE_PADDING_SCREEN_PERCENTAGE).dp @@ -79,7 +79,7 @@ fun CheckYourPhoneScreen( bottom = bottomPadding, start = sidePadding, end = sidePadding, - ), + ) ) { Column( modifier = Modifier.fillMaxWidth().weight(1f).padding(horizontal = textPadding), @@ -104,21 +104,53 @@ fun CheckYourPhoneScreen( } } when (state) { - CheckYourPhoneState.InProgress -> - RemoteConnectionProgressIndicator( - iconRes = R.drawable.ic_security_update_good, - Modifier.align(Alignment.CenterHorizontally) - ) - CheckYourPhoneState.Success -> - RemoteConnectionSuccess( - iconRes = R.drawable.ic_security_update_good, - Modifier.align(Alignment.CenterHorizontally) - ) + CheckYourPhoneState.InProgress -> RemoteConnectionProgressIndicator() + CheckYourPhoneState.Success -> RemoteConnectionSuccess() } } } } +@Composable +private fun RemoteConnectionProgressIndicator() { + val indicatorPadding = 8.dp + val iconSize = 48.dp + val progressBarStrokeWidth = 4.dp + Box(modifier = Modifier.size(iconSize).clip(CircleShape)) { + CircularProgressIndicator( + modifier = Modifier.size(iconSize - progressBarStrokeWidth + indicatorPadding), + strokeWidth = progressBarStrokeWidth, + ) + Icon( + painter = painterResource(R.drawable.ic_security_update_good), + contentDescription = null, + modifier = + Modifier.align(Alignment.Center) + .size(iconSize - indicatorPadding - 8.dp) + .clip(CircleShape), + ) + } +} + +@Composable +private fun RemoteConnectionSuccess() { + val indicatorPadding = 8.dp + val iconSize = 48.dp + val backgroundColor = MaterialTheme.colors.onSurface + val contentColor = MaterialTheme.colors.surface + Box(modifier = Modifier.size(iconSize).clip(CircleShape).background(backgroundColor)) { + Icon( + painter = painterResource(R.drawable.ic_security_update_good), + contentDescription = null, + tint = contentColor, + modifier = + Modifier.align(Alignment.Center) + .size(iconSize - indicatorPadding - 8.dp) + .clip(CircleShape), + ) + } +} + /** Whether the device is considered large screen for layout adjustment purposes. */ internal val Configuration.isLargeScreen: Boolean get() = screenHeightDp > 224 diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/DrawablePainter.kt b/PermissionController/wear-permission-components/src/wear.permission.components/DrawablePainter.kt index d505a0ea4..a22fb2b96 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/DrawablePainter.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/DrawablePainter.kt @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.android.permissioncontroller.permission.ui.wear.elements +package com.android.permissioncontroller.wear.permission.components import android.graphics.drawable.Animatable import android.graphics.drawable.ColorDrawable @@ -166,5 +165,6 @@ private val Drawable.intrinsicSize: Size internal object EmptyPainter : Painter() { override val intrinsicSize: Size get() = Size.Unspecified + override fun DrawScope.onDraw() {} } diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/ScrollableScreen.kt b/PermissionController/wear-permission-components/src/wear.permission.components/ScrollableScreen.kt new file mode 100644 index 000000000..6e7be01ec --- /dev/null +++ b/PermissionController/wear-permission-components/src/wear.permission.components/ScrollableScreen.kt @@ -0,0 +1,153 @@ +/* + * 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.permissioncontroller.wear.permission.components + +import android.app.Activity +import android.content.Context +import android.content.ContextWrapper +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalContext +import androidx.fragment.app.FragmentActivity +import androidx.wear.compose.foundation.ExpandableState +import androidx.wear.compose.foundation.SwipeToDismissValue +import androidx.wear.compose.foundation.rememberSwipeToDismissBoxState +import androidx.wear.compose.material.SwipeToDismissBox +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionScaffold +import com.android.permissioncontroller.wear.permission.components.theme.ResourceHelper +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionMaterialUIVersion + +/** + * Screen that contains a list of items defined using the [content] parameter, adds the time text + * (if [showTimeText] is true), the tile (if [title] is not null), the vignette and the position + * indicator. It also manages the scaling animation and allows the user to scroll the content using + * the crown. + */ +@Composable +fun ScrollableScreen( + materialUIVersion: WearPermissionMaterialUIVersion = ResourceHelper.materialUIVersionInSettings, + asScalingList: Boolean = false, + showTimeText: Boolean = true, + title: String? = null, + subtitle: CharSequence? = null, + image: Any? = null, + isLoading: Boolean = false, + titleTestTag: String? = null, + subtitleTestTag: String? = null, + content: ListScopeWrapper.() -> Unit, +) { + var dismissed by remember { mutableStateOf(false) } + val activity = LocalContext.current.findActivity() + val state = rememberSwipeToDismissBoxState() + + LaunchedEffect(state.currentValue) { + // If the swipe is complete + if (state.currentValue == SwipeToDismissValue.Dismissed) { + // pop the top fragment immediately or dismiss activity. + dismiss(activity) + // Set dismissed state as true + dismissed = true + // Set swipe box back to starting position(that is cancelled swipe effect) to + // show loading indicator while fragment dismisses. + // For some reason fragment `popBackImmediate` takes few secs at times. + state.snapTo(SwipeToDismissValue.Default) + } + } + + if (getBackStackEntryCount(activity) > 0) { + SwipeToDismissBox(state = state) { isBackground -> + WearPermissionScaffold( + materialUIVersion, + asScalingList, + showTimeText, + title, + subtitle, + image, + isLoading = isLoading || isBackground || dismissed, + content, + titleTestTag, + subtitleTestTag, + ) + } + } else { + WearPermissionScaffold( + materialUIVersion, + asScalingList, + showTimeText, + title, + subtitle, + image, + isLoading, + content, + titleTestTag, + subtitleTestTag, + ) + } +} + +fun dismiss(activity: Activity) { + if (activity is FragmentActivity) { + if (!activity.supportFragmentManager.popBackStackImmediate()) { + activity.finish() + } + } else { + activity.finish() + } +} + +internal fun getBackStackEntryCount(activity: Activity): Int { + return if (activity is FragmentActivity) { + activity.supportFragmentManager.primaryNavigationFragment + ?.childFragmentManager + ?.backStackEntryCount ?: 0 + } else { + 0 + } +} + +fun Context.findActivity(): Activity { + var context = this + while (context is ContextWrapper) { + if (context is Activity) return context + context = context.baseContext + } + throw IllegalStateException("The screen should be called in the context of an Activity") +} + +interface ListScopeWrapper { + fun item(key: Any? = null, contentType: Any? = null, content: @Composable () -> Unit) + + fun items( + count: Int, + key: ((index: Int) -> Any)? = null, + contentType: (index: Int) -> Any? = { null }, + content: @Composable (index: Int) -> Unit, + ) + + fun expandableItems( + state: ExpandableState, + count: Int, + key: ((index: Int) -> Any)? = null, + itemContent: @Composable BoxScope.(index: Int) -> Unit, + ) + + fun expandableButton(state: ExpandableState, key: Any? = null, content: @Composable () -> Unit) +} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/AlertDialog.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material2/AlertDialog.kt index c07d2ba9e..4abe5c8ca 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/AlertDialog.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material2/AlertDialog.kt @@ -14,20 +14,16 @@ * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.elements +package com.android.permissioncontroller.wear.permission.components.material2 import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Check -import androidx.compose.material.icons.filled.Close import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.platform.LocalFocusManager -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.heading +import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.rememberTextMeasurer import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow @@ -35,15 +31,15 @@ import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.dp import androidx.wear.compose.foundation.lazy.ScalingLazyListScope import androidx.wear.compose.foundation.lazy.ScalingLazyListState -import androidx.wear.compose.material.Icon import androidx.wear.compose.material.LocalTextStyle import androidx.wear.compose.material.MaterialTheme import androidx.wear.compose.material.Text -import androidx.wear.compose.material.dialog.Alert import androidx.wear.compose.material.dialog.Dialog -import com.android.permissioncontroller.permission.ui.wear.elements.layout.ScalingLazyColumnDefaults -import com.android.permissioncontroller.permission.ui.wear.elements.layout.ScalingLazyColumnState -import com.android.permissioncontroller.permission.ui.wear.elements.layout.rememberColumnState +import com.android.permissioncontroller.wear.permission.components.material2.layout.ScalingLazyColumnDefaults +import com.android.permissioncontroller.wear.permission.components.material2.layout.ScalingLazyColumnState +import com.android.permissioncontroller.wear.permission.components.material2.layout.rememberColumnState +import com.android.permissioncontroller.wear.permission.components.material3.DialogButtonContent +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionIconBuilder /** * This component is an alternative to [AlertContent], providing the following: @@ -54,95 +50,40 @@ import com.android.permissioncontroller.permission.ui.wear.elements.layout.remem */ @Composable fun AlertDialog( - message: String, - iconRes: Int? = null, - okButtonIcon: Any = Icons.Default.Check, - cancelButtonIcon: Any = Icons.Default.Close, - onCancelButtonClick: () -> Unit, - onOKButtonClick: () -> Unit, - showDialog: Boolean, - scalingLazyListState: ScalingLazyListState, - modifier: Modifier = Modifier, title: String? = null, - okButtonContentDescription: String = stringResource(android.R.string.ok), - cancelButtonContentDescription: String = stringResource(android.R.string.cancel) -) { - val focusManager = LocalFocusManager.current - Dialog( - showDialog = showDialog, - onDismissRequest = { - focusManager.clearFocus() - onCancelButtonClick() - }, - scrollState = scalingLazyListState, - modifier = modifier - ) { - AlertContent( - title = title, - icon = { AlertIcon(iconRes) }, - message = message, - okButtonIcon = okButtonIcon, - cancelButtonIcon = cancelButtonIcon, - onCancel = onCancelButtonClick, - onOk = onOKButtonClick, - okButtonContentDescription = okButtonContentDescription, - cancelButtonContentDescription = cancelButtonContentDescription - ) - } -} - -/** - * This component is an alternative to [Alert], providing the following: - * - a convenient way of passing a title and a message; - * - default one button; - * - wrapped in a [Dialog]; - */ -@Composable -fun SingleButtonAlertDialog( message: String, - iconRes: Int? = null, - okButtonIcon: Any = Icons.Default.Check, - onButtonClick: () -> Unit, + positiveButtonContent: DialogButtonContent?, + negativeButtonContent: DialogButtonContent?, showDialog: Boolean, - scalingLazyListState: ScalingLazyListState, modifier: Modifier = Modifier, - title: String? = null, - buttonContentDescription: String = stringResource(android.R.string.ok) + iconRes: WearPermissionIconBuilder? = null, + scalingLazyListState: ScalingLazyListState, ) { Dialog( showDialog = showDialog, - onDismissRequest = {}, + onDismissRequest = { negativeButtonContent?.onClick?.invoke() }, scrollState = scalingLazyListState, - modifier = modifier + modifier = modifier, ) { AlertContent( title = title, - icon = { AlertIcon(iconRes) }, + icon = { iconRes?.build() }, message = message, - okButtonIcon = okButtonIcon, - onOk = onButtonClick, - okButtonContentDescription = buttonContentDescription + positiveButtonContent = positiveButtonContent, + negativeButtonContent = negativeButtonContent, ) } } @Composable fun AlertContent( - onCancel: (() -> Unit)? = null, - onOk: (() -> Unit)? = null, icon: @Composable (() -> Unit)? = null, title: String? = null, message: String? = null, - okButtonIcon: Any = Icons.Default.Check, - cancelButtonIcon: Any = Icons.Default.Close, - okButtonContentDescription: String = stringResource(android.R.string.ok), - cancelButtonContentDescription: String = stringResource(android.R.string.cancel), + positiveButtonContent: DialogButtonContent?, + negativeButtonContent: DialogButtonContent?, state: ScalingLazyColumnState = - rememberColumnState( - ScalingLazyColumnDefaults.responsive( - additionalPaddingAtBottom = 0.dp, - ), - ), + rememberColumnState(ScalingLazyColumnDefaults.responsive(additionalPaddingAtBottom = 0.dp)), showPositionIndicator: Boolean = true, content: (ScalingLazyListScope.() -> Unit)? = null, ) { @@ -155,7 +96,7 @@ fun AlertContent( title?.let { { Text( - modifier = Modifier.fillMaxWidth(), + modifier = Modifier.fillMaxWidth().semantics() { heading() }, text = it, color = MaterialTheme.colors.onBackground, textAlign = TextAlign.Center, @@ -185,7 +126,7 @@ fun AlertContent( maxWidth = (maxScreenWidthPx * (1f - totalPaddingPercentage * 2f / 100f)) - .toInt(), + .toInt() ), ) .lineCount @@ -200,21 +141,9 @@ fun AlertContent( } }, content = content, - onOk = onOk, - onCancel = onCancel, - okButtonIcon = okButtonIcon, - cancelButtonIcon = cancelButtonIcon, - okButtonContentDescription = okButtonContentDescription, - cancelButtonContentDescription = cancelButtonContentDescription, + positiveButtonContent = positiveButtonContent, + negativeButtonContent = negativeButtonContent, state = state, showPositionIndicator = showPositionIndicator, ) } - -@Composable -private fun AlertIcon(iconRes: Int?) = - if (iconRes != null && iconRes != 0) { - Icon(painter = painterResource(iconRes), contentDescription = null) - } else { - null - } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/Chip.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material2/Chip.kt index 40f097c67..57fdbca03 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/Chip.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material2/Chip.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.elements +package com.android.permissioncontroller.wear.permission.components.material2 import android.graphics.drawable.Drawable import androidx.annotation.StringRes @@ -33,7 +33,6 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.Hyphens import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow @@ -46,6 +45,7 @@ import androidx.wear.compose.material.Icon import androidx.wear.compose.material.MaterialTheme import androidx.wear.compose.material.Text import androidx.wear.compose.material.contentColorFor +import com.android.permissioncontroller.wear.permission.components.rememberDrawablePainter /** * This component is an alternative to [Chip], providing the following: @@ -67,7 +67,7 @@ fun Chip( textColor: Color = MaterialTheme.colors.onSurface, iconColor: Color = Color.Unspecified, colors: ChipColors = chipDefaultColors(), - enabled: Boolean = true + enabled: Boolean = true, ) { val iconParam: (@Composable BoxScope.() -> Unit)? = icon?.let { @@ -87,21 +87,21 @@ fun Chip( imageVector = icon, tint = iconColor, contentDescription = iconContentDescription, - modifier = iconModifier + modifier = iconModifier, ) is Int -> Icon( painter = painterResource(id = icon), tint = iconColor, contentDescription = iconContentDescription, - modifier = iconModifier + modifier = iconModifier, ) is Drawable -> Icon( painter = rememberDrawablePainter(icon), tint = iconColor, contentDescription = iconContentDescription, - modifier = iconModifier + modifier = iconModifier, ) else -> {} } @@ -120,7 +120,7 @@ fun Chip( largeIcon = largeIcon, textColor = textColor, colors = colors, - enabled = enabled + enabled = enabled, ) } @@ -143,7 +143,7 @@ fun Chip( textColor: Color = MaterialTheme.colors.onSurface, iconColor: Color = Color.Unspecified, colors: ChipColors = chipDefaultColors(), - enabled: Boolean = true + enabled: Boolean = true, ) { Chip( label = stringResource(id = labelId), @@ -157,7 +157,7 @@ fun Chip( textColor = textColor, iconColor = iconColor, colors = colors, - enabled = enabled + enabled = enabled, ) } @@ -180,7 +180,7 @@ fun Chip( textColor: Color = MaterialTheme.colors.onSurface, secondaryTextColor: Color = MaterialTheme.colors.primary, colors: ChipColors = chipDefaultColors(), - enabled: Boolean = true + enabled: Boolean = true, ) { val hasSecondaryLabel = secondaryLabel != null val hasIcon = icon != null @@ -193,11 +193,7 @@ fun Chip( textAlign = if (hasSecondaryLabel || hasIcon) TextAlign.Start else TextAlign.Center, overflow = TextOverflow.Ellipsis, maxLines = labelMaxLines ?: if (hasSecondaryLabel) 1 else 2, - style = - MaterialTheme.typography.button.copy( - fontWeight = FontWeight.W600, - hyphens = Hyphens.Auto - ) + style = MaterialTheme.typography.button.copy(hyphens = Hyphens.Auto), ) } @@ -209,7 +205,7 @@ fun Chip( color = secondaryTextColor, overflow = TextOverflow.Ellipsis, maxLines = secondaryLabelMaxLines ?: 1, - style = MaterialTheme.typography.caption2 + style = MaterialTheme.typography.caption2.copy(hyphens = Hyphens.Auto), ) } } @@ -221,7 +217,7 @@ fun Chip( start = 10.dp, top = verticalPadding, end = ChipDefaults.ChipHorizontalPadding, - bottom = verticalPadding + bottom = verticalPadding, ) } else { ChipDefaults.ContentPadding @@ -236,7 +232,7 @@ fun Chip( colors = colors, enabled = enabled, contentPadding = contentPadding, - shape = RoundedCornerShape(26.dp) + shape = RoundedCornerShape(26.dp), ) } @@ -258,6 +254,6 @@ fun chipDisabledColors(): ChipColors { backgroundColor = backgroundColor.copy(alpha = ContentAlpha.disabled), contentColor = contentColor.copy(alpha = ContentAlpha.disabled), secondaryContentColor = secondaryContentColor.copy(alpha = ContentAlpha.disabled), - iconColor = iconColor.copy(alpha = ContentAlpha.disabled) + iconColor = iconColor.copy(alpha = ContentAlpha.disabled), ) } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/Icon.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material2/Icon.kt index 1a304b37e..dfed0b196 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/Icon.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material2/Icon.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.elements +package com.android.permissioncontroller.wear.permission.components.material2 import android.graphics.drawable.Drawable import androidx.annotation.DrawableRes @@ -29,18 +29,19 @@ import androidx.compose.ui.unit.LayoutDirection import androidx.wear.compose.material.Icon import androidx.wear.compose.material.LocalContentAlpha import androidx.wear.compose.material.LocalContentColor +import com.android.permissioncontroller.wear.permission.components.rememberDrawablePainter /** * This component is an alternative to [Icon], providing the following: * - a convenient way of setting the icon to be mirrored in RTL mode; */ @Composable -public fun Icon( +fun Icon( imageVector: ImageVector, contentDescription: String?, modifier: Modifier = Modifier, tint: Color = LocalContentColor.current.copy(alpha = LocalContentAlpha.current), - rtlMode: IconRtlMode = IconRtlMode.Default + rtlMode: IconRtlMode = IconRtlMode.Default, ) { val shouldMirror = rtlMode == IconRtlMode.Mirrored && LocalLayoutDirection.current == LayoutDirection.Rtl @@ -48,7 +49,7 @@ public fun Icon( modifier = modifier.scale(scaleX = if (shouldMirror) -1f else 1f, scaleY = 1f), imageVector = imageVector, contentDescription = contentDescription, - tint = tint + tint = tint, ) } @@ -57,12 +58,12 @@ public fun Icon( * - a convenient way of setting the icon to be mirrored in RTL mode; */ @Composable -public fun Icon( +fun Icon( @DrawableRes id: Int, contentDescription: String?, modifier: Modifier = Modifier, tint: Color = LocalContentColor.current.copy(alpha = LocalContentAlpha.current), - rtlMode: IconRtlMode = IconRtlMode.Default + rtlMode: IconRtlMode = IconRtlMode.Default, ) { val shouldMirror = rtlMode == IconRtlMode.Mirrored && LocalLayoutDirection.current == LayoutDirection.Rtl @@ -71,7 +72,7 @@ public fun Icon( painter = painterResource(id = id), contentDescription = contentDescription, modifier = modifier.scale(scaleX = if (shouldMirror) -1f else 1f, scaleY = 1f), - tint = tint + tint = tint, ) } @@ -86,7 +87,7 @@ fun Icon( contentDescription: String?, modifier: Modifier = Modifier, tint: Color = LocalContentColor.current.copy(alpha = LocalContentAlpha.current), - rtlMode: IconRtlMode = IconRtlMode.Default + rtlMode: IconRtlMode = IconRtlMode.Default, ) { val shouldMirror = rtlMode == IconRtlMode.Mirrored && LocalLayoutDirection.current == LayoutDirection.Rtl @@ -98,7 +99,7 @@ fun Icon( imageVector = icon, modifier = iconModifier, contentDescription = contentDescription, - tint = tint + tint = tint, ) } is Int -> { @@ -106,7 +107,7 @@ fun Icon( painter = painterResource(id = icon), contentDescription = contentDescription, modifier = iconModifier, - tint = tint + tint = tint, ) } is Drawable -> { @@ -114,14 +115,14 @@ fun Icon( painter = rememberDrawablePainter(icon), contentDescription = contentDescription, modifier = iconModifier, - tint = tint + tint = tint, ) } else -> throw IllegalArgumentException("Type not supported.") } } -public enum class IconRtlMode { +enum class IconRtlMode { Default, - Mirrored + Mirrored, } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ListFooter.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material2/ListFooter.kt index 5ed912ec6..ac603d492 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ListFooter.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material2/ListFooter.kt @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.android.permissioncontroller.permission.ui.wear.elements +package com.android.permissioncontroller.wear.permission.components.material2 import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row @@ -52,7 +51,7 @@ fun ListFooter(description: String, iconRes: Int? = null, onClick: (() -> Unit)? contentDescription = null, modifier = Modifier.size(LeadingIconSize, LeadingIconSize) - .align(Alignment.CenterVertically) + .align(Alignment.CenterVertically), ) Spacer(modifier = Modifier.width(LeadingIconEndSpacing)) } @@ -62,7 +61,7 @@ fun ListFooter(description: String, iconRes: Int? = null, onClick: (() -> Unit)? textAlign = TextAlign.Start, overflow = TextOverflow.Ellipsis, color = MaterialTheme.colors.onSurfaceVariant, - style = MaterialTheme.typography.caption2 + style = MaterialTheme.typography.caption2, ) } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ListHeader.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material2/ListHeader.kt index 0a2a3937c..6ed81353a 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ListHeader.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material2/ListHeader.kt @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.android.permissioncontroller.permission.ui.wear.elements +package com.android.permissioncontroller.wear.permission.components.material2 import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -35,7 +34,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.semantics -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.Hyphens import androidx.compose.ui.unit.dp import androidx.wear.compose.material.LocalContentColor @@ -60,7 +58,7 @@ fun ListHeader( modifier: Modifier = Modifier, backgroundColor: Color = Color.Transparent, contentColor: Color = MaterialTheme.colors.onBackground, - content: @Composable RowScope.() -> Unit + content: @Composable RowScope.() -> Unit, ) { Row( horizontalArrangement = Arrangement.Center, @@ -69,15 +67,11 @@ fun ListHeader( mergeDescendants = true ) { heading() - } + }, ) { CompositionLocalProvider( LocalContentColor provides contentColor, - LocalTextStyle provides - MaterialTheme.typography.title3.copy( - fontWeight = FontWeight.W600, - hyphens = Hyphens.Auto - ), + LocalTextStyle provides MaterialTheme.typography.title3.copy(hyphens = Hyphens.Auto), ) { content() } @@ -111,7 +105,7 @@ fun ListSubheader( .fillMaxWidth() .wrapContentSize(align = Alignment.CenterStart) .background(backgroundColor) - .semantics(mergeDescendants = true) { heading() } + .semantics(mergeDescendants = true) { heading() }, ) { CompositionLocalProvider( LocalContentColor provides contentColor, @@ -120,7 +114,7 @@ fun ListSubheader( if (icon != null) { Box( modifier = Modifier.wrapContentSize(align = Alignment.CenterStart), - content = icon + content = icon, ) Spacer(modifier = Modifier.width(6.dp)) } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ResponsiveDialog.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material2/ResponsiveDialog.kt index e1e869f71..64597e23d 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ResponsiveDialog.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material2/ResponsiveDialog.kt @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.android.permissioncontroller.permission.ui.wear.elements +package com.android.permissioncontroller.wear.permission.components.material2 import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement.spacedBy @@ -29,15 +28,11 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Check -import androidx.compose.material.icons.filled.Close import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalConfiguration -import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp @@ -49,13 +44,14 @@ import androidx.wear.compose.material.LocalTextStyle import androidx.wear.compose.material.MaterialTheme import androidx.wear.compose.material.PositionIndicator import androidx.wear.compose.material.Scaffold -import com.android.permissioncontroller.permission.ui.wear.elements.layout.ScalingLazyColumn -import com.android.permissioncontroller.permission.ui.wear.elements.layout.ScalingLazyColumnDefaults.responsive -import com.android.permissioncontroller.permission.ui.wear.elements.layout.ScalingLazyColumnState -import com.android.permissioncontroller.permission.ui.wear.elements.layout.rememberColumnState - -// This file is a copy of ResponsiveDialogContent.kt from Horologist (go/horologist), -// remove it once after wear compose supports large screen dialogs. +import com.android.permissioncontroller.wear.permission.components.material2.layout.ScalingLazyColumn +import com.android.permissioncontroller.wear.permission.components.material2.layout.ScalingLazyColumnDefaults.responsive +import com.android.permissioncontroller.wear.permission.components.material2.layout.ScalingLazyColumnState +import com.android.permissioncontroller.wear.permission.components.material2.layout.rememberColumnState +import com.android.permissioncontroller.wear.permission.components.material3.DialogButtonContent +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionIconBuilder +import com.android.permissioncontroller.wear.permission.components.material3.defaultAlertConfirmIcon +import com.android.permissioncontroller.wear.permission.components.material3.defaultAlertDismissIcon @Composable fun ResponsiveDialogContent( @@ -63,18 +59,11 @@ fun ResponsiveDialogContent( icon: @Composable (() -> Unit)? = null, title: @Composable (() -> Unit)? = null, message: @Composable (() -> Unit)? = null, - okButtonIcon: Any = Icons.Default.Check, - cancelButtonIcon: Any = Icons.Default.Close, - onOk: (() -> Unit)? = null, - onCancel: (() -> Unit)? = null, - okButtonContentDescription: String = stringResource(android.R.string.ok), - cancelButtonContentDescription: String = stringResource(android.R.string.cancel), + positiveButtonContent: DialogButtonContent? = null, + negativeButtonContent: DialogButtonContent? = null, state: ScalingLazyColumnState = rememberColumnState( - responsive( - firstItemIsFullWidth = icon == null, - additionalPaddingAtBottom = 0.dp, - ), + responsive(firstItemIsFullWidth = icon == null, additionalPaddingAtBottom = 0.dp) ), showPositionIndicator: Boolean = true, content: (ScalingLazyListScope.() -> Unit)? = null, @@ -89,9 +78,7 @@ fun ResponsiveDialogContent( timeText = {}, ) { // This will be applied only to the content. - CompositionLocalProvider( - LocalTextStyle provides MaterialTheme.typography.body2, - ) { + CompositionLocalProvider(LocalTextStyle provides MaterialTheme.typography.body2) { ScalingLazyColumn(columnState = state) { icon?.let { item { @@ -107,11 +94,11 @@ fun ResponsiveDialogContent( item { CompositionLocalProvider( LocalTextStyle provides - MaterialTheme.typography.title3.copy(fontWeight = FontWeight.W600), + MaterialTheme.typography.title3.copy(fontWeight = FontWeight.W600) ) { Box( Modifier.fillMaxWidth(titleMaxWidthFraction) - .padding(bottom = 8.dp), // 12.dp below icon + .padding(bottom = 8.dp) // 12.dp below icon ) { it() } @@ -123,22 +110,20 @@ fun ResponsiveDialogContent( item { Spacer(Modifier.height(20.dp)) } } message?.let { - item { - Box( - Modifier.fillMaxWidth(messageMaxWidthFraction), - ) { - it() - } - } + item { Box(Modifier.fillMaxWidth(messageMaxWidthFraction)) { it() } } } content?.let { it() } - if (onOk != null || onCancel != null) { + if (positiveButtonContent != null || negativeButtonContent != null) { item { val width = LocalConfiguration.current.screenWidthDp // Single buttons, or buttons on smaller screens are not meant to be // responsive. val buttonWidth = - if (width < 225 || onOk == null || onCancel == null) { + if ( + width < 225 || + positiveButtonContent == null || + negativeButtonContent == null + ) { ButtonDefaults.DefaultButtonSize } else { // 14.56% on top of 5.2% margin on the sides, 12.dp between. @@ -147,25 +132,30 @@ fun ResponsiveDialogContent( Row( Modifier.fillMaxWidth() .padding( - top = if (content != null || message != null) 12.dp else 0.dp, + top = if (content != null || message != null) 12.dp else 0.dp ), horizontalArrangement = spacedBy(12.dp, Alignment.CenterHorizontally), verticalAlignment = Alignment.CenterVertically, ) { - onCancel?.let { + negativeButtonContent?.run { ResponsiveButton( - icon = cancelButtonIcon, - cancelButtonContentDescription, - onClick = it, + this.icon + ?: WearPermissionIconBuilder.defaultAlertDismissIcon() + .tint( + ChipDefaults.secondaryChipColors() + .contentColor(true) + .value + ), + onClick, buttonWidth, ChipDefaults.secondaryChipColors(), ) } - onOk?.let { + positiveButtonContent?.run { ResponsiveButton( - icon = okButtonIcon, - okButtonContentDescription, - onClick = it, + this.icon + ?: WearPermissionIconBuilder.defaultAlertConfirmIcon(), + onClick, buttonWidth, ) } @@ -179,8 +169,7 @@ fun ResponsiveDialogContent( @Composable private fun ResponsiveButton( - icon: Any, - contentDescription: String, + icon: WearPermissionIconBuilder, onClick: () -> Unit, buttonWidth: Dp, colors: ChipColors = ChipDefaults.primaryChipColors(), @@ -188,12 +177,9 @@ private fun ResponsiveButton( androidx.wear.compose.material.Chip( label = { Box(Modifier.fillMaxWidth()) { - Icon( - icon = icon, - contentDescription = contentDescription, - modifier = - Modifier.size(ButtonDefaults.DefaultIconSize).align(Alignment.Center), - ) + icon + .modifier(Modifier.size(ButtonDefaults.DefaultIconSize).align(Alignment.Center)) + .build() } }, contentPadding = PaddingValues(0.dp), @@ -210,19 +196,10 @@ internal const val titleExtraHorizontalPadding = 8.84f // Fraction of the max available width that message should take (after global and message padding) internal val messageMaxWidthFraction = - 1f - - 2f * - calculatePaddingFraction( - messageExtraHorizontalPadding, - ) + 1f - 2f * calculatePaddingFraction(messageExtraHorizontalPadding) // Fraction of the max available width that title should take (after global and message padding) -internal val titleMaxWidthFraction = - 1f - - 2f * - calculatePaddingFraction( - titleExtraHorizontalPadding, - ) +internal val titleMaxWidthFraction = 1f - 2f * calculatePaddingFraction(titleExtraHorizontalPadding) // Calculate total padding given global padding and additional padding required inside that. internal fun calculatePaddingFraction(extraPadding: Float) = diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ToggleChip.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material2/ToggleChip.kt index 4f4201748..46a55bdc7 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ToggleChip.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material2/ToggleChip.kt @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.android.permissioncontroller.permission.ui.wear.elements +package com.android.permissioncontroller.wear.permission.components.material2 import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.BoxScope @@ -29,6 +28,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.compositeOver +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.role +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.semantics.stateDescription +import androidx.compose.ui.text.style.Hyphens import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.wear.compose.material.ChipDefaults @@ -39,6 +44,8 @@ import androidx.wear.compose.material.ToggleChip import androidx.wear.compose.material.ToggleChipColors import androidx.wear.compose.material.ToggleChipDefaults import androidx.wear.compose.material.contentColorFor +import com.android.permissioncontroller.wear.permission.components.R +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionToggleControlType /** * This component is an alternative to [ToggleChip], providing the following: @@ -52,7 +59,7 @@ fun ToggleChip( onCheckedChanged: (Boolean) -> Unit, label: String, labelMaxLine: Int? = null, - toggleControl: ToggleChipToggleControl, + toggleControl: WearPermissionToggleControlType, modifier: Modifier = Modifier, icon: Any? = null, iconColor: Color = Color.Unspecified, @@ -72,7 +79,7 @@ fun ToggleChip( textAlign = TextAlign.Start, overflow = TextOverflow.Ellipsis, maxLines = labelMaxLine ?: if (hasSecondaryLabel) 1 else 2, - style = MaterialTheme.typography.button, + style = MaterialTheme.typography.button.copy(hyphens = Hyphens.Auto), ) } @@ -83,7 +90,7 @@ fun ToggleChip( text = secondaryLabel, overflow = TextOverflow.Ellipsis, maxLines = secondaryLabelMaxLine ?: 1, - style = MaterialTheme.typography.caption2, + style = MaterialTheme.typography.caption2.copy(hyphens = Hyphens.Auto), ) } } @@ -92,15 +99,16 @@ fun ToggleChip( Icon( imageVector = when (toggleControl) { - ToggleChipToggleControl.Switch -> ToggleChipDefaults.switchIcon(checked) - ToggleChipToggleControl.Radio -> ToggleChipDefaults.radioIcon(checked) - ToggleChipToggleControl.Checkbox -> ToggleChipDefaults.checkboxIcon(checked) + WearPermissionToggleControlType.Switch -> ToggleChipDefaults.switchIcon(checked) + WearPermissionToggleControlType.Radio -> ToggleChipDefaults.radioIcon(checked) + WearPermissionToggleControlType.Checkbox -> + ToggleChipDefaults.checkboxIcon(checked) }, contentDescription = null, // This potentially be removed once this issue is addressed: // https://issuetracker.google.com/issues/287087138 rtlMode = - if (toggleControl == ToggleChipToggleControl.Switch) { + if (toggleControl == WearPermissionToggleControlType.Switch) { IconRtlMode.Mirrored } else { IconRtlMode.Default @@ -125,7 +133,12 @@ fun ToggleChip( ToggleChip( checked = checked, - onCheckedChange = onCheckedChanged, + onCheckedChange = { newChecked -> + // Radio buttons cannot be toggled off by tapping on it again. + if (toggleControl != WearPermissionToggleControlType.Radio || newChecked) { + onCheckedChanged.invoke(newChecked) + } + }, label = labelParam, toggleControl = toggleControlParam, modifier = modifier.fillMaxWidth().toggleControlSemantics(toggleControl, checked), @@ -214,3 +227,29 @@ fun toggleChipBackgroundColors(): ToggleChipColors { uncheckedToggleControlColor = uncheckedToggleControlColor, ) } + +@Composable +fun Modifier.toggleControlSemantics( + toggleControl: WearPermissionToggleControlType, + checked: Boolean, +): Modifier { + val semanticsRole = + when (toggleControl) { + WearPermissionToggleControlType.Switch -> Role.Switch + WearPermissionToggleControlType.Radio -> Role.RadioButton + WearPermissionToggleControlType.Checkbox -> Role.Checkbox + } + val stateDescriptionSemantics = + stringResource( + if (checked) { + R.string.on + } else { + R.string.off + } + ) + + return semantics { + role = semanticsRole + stateDescription = stateDescriptionSemantics + } +} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ScrollableScreen.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material2/Wear2Scaffold.kt index d1b7e899b..b5ba5b71e 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/ScrollableScreen.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material2/Wear2Scaffold.kt @@ -1,11 +1,11 @@ /* - * Copyright (C) 2023 The Android Open Source Project + * Copyright 2025 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 + * https://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, @@ -13,12 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.android.permissioncontroller.wear.permission.components.material2 -package com.android.permissioncontroller.permission.ui.wear.elements - -import android.app.Activity -import android.content.Context -import android.content.ContextWrapper import android.graphics.drawable.Drawable import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box @@ -29,113 +25,44 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalConfiguration -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import androidx.fragment.app.FragmentActivity import androidx.lifecycle.Lifecycle import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.repeatOnLifecycle -import androidx.wear.compose.foundation.SwipeToDismissValue import androidx.wear.compose.foundation.lazy.ScalingLazyColumn import androidx.wear.compose.foundation.lazy.ScalingLazyListScope import androidx.wear.compose.foundation.lazy.ScalingLazyListState -import androidx.wear.compose.foundation.rememberSwipeToDismissBoxState import androidx.wear.compose.material.CircularProgressIndicator import androidx.wear.compose.material.MaterialTheme import androidx.wear.compose.material.PositionIndicator import androidx.wear.compose.material.Scaffold -import androidx.wear.compose.material.SwipeToDismissBox import androidx.wear.compose.material.Text import androidx.wear.compose.material.TimeText import androidx.wear.compose.material.Vignette import androidx.wear.compose.material.VignettePosition import androidx.wear.compose.material.scrollAway -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionScaffold -import com.android.permissioncontroller.permission.ui.wear.elements.rotaryinput.rotaryWithScroll -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion.MATERIAL2_5 -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionTheme +import com.android.permissioncontroller.wear.permission.components.AnnotatedText +import com.android.permissioncontroller.wear.permission.components.rememberDrawablePainter +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionTheme /** - * Screen that contains a list of items defined using the [content] parameter, adds the time text - * (if [showTimeText] is true), the tile (if [title] is not null), the vignette and the position - * indicator. It also manages the scaling animation and allows the user to scroll the content using - * the crown. + * This component is wrapper on material 2 scaffold component. It helps with time text, scroll + * indicator and standard list elements like title, icon and subtitle. */ @Composable -fun ScrollableScreen( - materialUIVersion: WearPermissionMaterialUIVersion = MATERIAL2_5, - showTimeText: Boolean = true, - title: String? = null, - subtitle: CharSequence? = null, - image: Any? = null, - isLoading: Boolean = false, - titleTestTag: String? = null, - subtitleTestTag: String? = null, - content: ScalingLazyListScope.() -> Unit, -) { - var dismissed by remember { mutableStateOf(false) } - val activity = LocalContext.current.findActivity() - val state = rememberSwipeToDismissBoxState() - - LaunchedEffect(state.currentValue) { - // If the swipe is complete - if (state.currentValue == SwipeToDismissValue.Dismissed) { - // pop the top fragment immediately or dismiss activity. - dismiss(activity) - // Set dismissed state as true - dismissed = true - // Set swipe box back to starting position(that is cancelled swipe effect) to - // show loading indicator while fragment dismisses. - // For some reason fragment `popBackImmediate` takes few secs at times. - state.snapTo(SwipeToDismissValue.Default) - } - } - - if (getBackStackEntryCount(activity) > 0) { - SwipeToDismissBox(state = state) { isBackground -> - WearPermissionScaffold( - materialUIVersion, - showTimeText, - title, - subtitle, - image, - isLoading = isLoading || isBackground || dismissed, - content, - titleTestTag, - subtitleTestTag, - ) - } - } else { - WearPermissionScaffold( - materialUIVersion, - showTimeText, - title, - subtitle, - image, - isLoading, - content, - titleTestTag, - subtitleTestTag, - ) - } -} - -@Composable -internal fun Wear2Scaffold( +fun Wear2Scaffold( showTimeText: Boolean, title: String?, subtitle: CharSequence?, @@ -192,13 +119,7 @@ internal fun Wear2Scaffold( } WearPermissionTheme { Scaffold( - // TODO: Use a rotary modifier from Wear Compose once Wear Compose 1.4 is landed. - // (b/325560444) - modifier = - Modifier.rotaryWithScroll( - scrollableState = listState, - focusRequester = focusRequester, - ), + modifier = Modifier.focusRequester(focusRequester), timeText = { if (showTimeText && !isLoading) { TimeText( @@ -220,6 +141,7 @@ internal fun Wear2Scaffold( if (isLoading) { CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) } else { + val iconColor = chipDefaultColors().iconColor(true).value ScalingLazyColumn( modifier = Modifier.fillMaxWidth(), state = listState, @@ -245,6 +167,7 @@ internal fun Wear2Scaffold( contentDescription = null, contentScale = ContentScale.Crop, modifier = imageModifier, + colorFilter = ColorFilter.tint(iconColor), ) } is Drawable -> @@ -254,6 +177,7 @@ internal fun Wear2Scaffold( contentDescription = null, contentScale = ContentScale.Crop, modifier = imageModifier, + colorFilter = ColorFilter.tint(iconColor), ) } else -> {} @@ -331,32 +255,3 @@ private fun RequestFocusOnResume(focusRequester: FocusRequester) { } } } - -internal fun dismiss(activity: Activity) { - if (activity is FragmentActivity) { - if (!activity.supportFragmentManager.popBackStackImmediate()) { - activity.finish() - } - } else { - activity.finish() - } -} - -internal fun getBackStackEntryCount(activity: Activity): Int { - return if (activity is FragmentActivity) { - activity.supportFragmentManager.primaryNavigationFragment - ?.childFragmentManager - ?.backStackEntryCount ?: 0 - } else { - 0 - } -} - -internal fun Context.findActivity(): Activity { - var context = this - while (context is ContextWrapper) { - if (context is Activity) return context - context = context.baseContext - } - throw IllegalStateException("The screen should be called in the context of an Activity") -} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/layout/ScalingLazyColumnDefaults.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material2/layout/ScalingLazyColumnDefaults.kt index 550f1dc24..f6fe5233c 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/layout/ScalingLazyColumnDefaults.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material2/layout/ScalingLazyColumnDefaults.kt @@ -16,7 +16,7 @@ @file:Suppress("ObjectLiteralToLambda") -package com.android.permissioncontroller.permission.ui.wear.elements.layout +package com.android.permissioncontroller.wear.permission.components.material2.layout import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues @@ -33,7 +33,7 @@ import androidx.wear.compose.foundation.lazy.ScalingLazyColumnDefaults import androidx.wear.compose.foundation.lazy.ScalingLazyListAnchorType import androidx.wear.compose.foundation.lazy.ScalingParams import androidx.wear.compose.material.ChipDefaults -import com.android.permissioncontroller.permission.ui.wear.elements.layout.ScalingLazyColumnState.RotaryMode +import com.android.permissioncontroller.wear.permission.components.material2.layout.ScalingLazyColumnState.RotaryMode import kotlin.math.sqrt // This file's content is copied from ScalingLazyColumnDefaults.kt from Horologist (go/horologist), @@ -63,10 +63,7 @@ object ScalingLazyColumnDefaults { firstItemIsFullWidth: Boolean = true, additionalPaddingAtBottom: Dp = 10.dp, verticalArrangement: Arrangement.Vertical = - Arrangement.spacedBy( - space = 4.dp, - alignment = Alignment.Top, - ), + Arrangement.spacedBy(space = 4.dp, alignment = Alignment.Top), horizontalPaddingPercent: Float = 0.052f, rotaryMode: RotaryMode? = RotaryMode.Scroll, hapticsEnabled: Boolean = true, @@ -145,7 +142,7 @@ object ScalingLazyColumnDefaults { return (radius - sqrt( (radius - childViewHeight + childViewWidth * 0.5f) * - (radius - childViewWidth * 0.5f), + (radius - childViewWidth * 0.5f) ) - childViewHeight * 0.5f) .dp @@ -225,10 +222,7 @@ object ScalingLazyColumnDefaults { last.bottomPaddingDp * height + first.paddingCorrection } else { if (configuration.isScreenRound) { - calculateVerticalOffsetForChip( - screenWidthDp, - horizontalPercent, - ) + 10.dp + calculateVerticalOffsetForChip(screenWidthDp, horizontalPercent) + 10.dp } else { 0.dp } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/layout/ScalingLazyColumnState.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material2/layout/ScalingLazyColumnState.kt index 0603647b1..c20b23aa3 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/layout/ScalingLazyColumnState.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material2/layout/ScalingLazyColumnState.kt @@ -17,7 +17,7 @@ @file:Suppress("ObjectLiteralToLambda") @file:OptIn(ExperimentalWearFoundationApi::class) -package com.android.permissioncontroller.permission.ui.wear.elements.layout +package com.android.permissioncontroller.wear.permission.components.material2.layout import androidx.compose.foundation.MutatePriority import androidx.compose.foundation.gestures.FlingBehavior @@ -42,14 +42,8 @@ import androidx.wear.compose.foundation.lazy.ScalingLazyListAnchorType import androidx.wear.compose.foundation.lazy.ScalingLazyListScope import androidx.wear.compose.foundation.lazy.ScalingLazyListState import androidx.wear.compose.foundation.lazy.ScalingParams -import androidx.wear.compose.foundation.rememberActiveFocusRequester -import com.android.permissioncontroller.permission.ui.wear.elements.layout.ScalingLazyColumnDefaults.responsiveScalingParams -import com.android.permissioncontroller.permission.ui.wear.elements.layout.ScalingLazyColumnState.RotaryMode -import com.android.permissioncontroller.permission.ui.wear.elements.rotaryinput.rememberDisabledHaptic -import com.android.permissioncontroller.permission.ui.wear.elements.rotaryinput.rememberRotaryHapticHandler -import com.android.permissioncontroller.permission.ui.wear.elements.rotaryinput.rotaryWithScroll -import com.android.permissioncontroller.permission.ui.wear.elements.rotaryinput.rotaryWithSnap -import com.android.permissioncontroller.permission.ui.wear.elements.rotaryinput.toRotaryScrollAdapter +import com.android.permissioncontroller.wear.permission.components.material2.layout.ScalingLazyColumnDefaults.responsiveScalingParams +import com.android.permissioncontroller.wear.permission.components.material2.layout.ScalingLazyColumnState.RotaryMode // This file is a copy of ScalingLazyColumnState.kt from Horologist (go/horologist), // remove it once after wear compose supports large screen dialogs. @@ -61,10 +55,7 @@ import com.android.permissioncontroller.permission.ui.wear.elements.rotaryinput. class ScalingLazyColumnState( val initialScrollPosition: ScrollPosition = ScrollPosition(1, 0), val autoCentering: AutoCenteringParams? = - AutoCenteringParams( - initialScrollPosition.index, - initialScrollPosition.offsetPx, - ), + AutoCenteringParams(initialScrollPosition.index, initialScrollPosition.offsetPx), val anchorType: ScalingLazyListAnchorType = ScalingLazyListAnchorType.ItemCenter, val contentPadding: PaddingValues = PaddingValues(horizontal = 10.dp), val rotaryMode: RotaryMode? = RotaryMode.Scroll, @@ -120,10 +111,7 @@ class ScalingLazyColumnState( data object Scroll : RotaryMode } - data class ScrollPosition( - val index: Int, - val offsetPx: Int, - ) + data class ScrollPosition(val index: Int, val offsetPx: Int) fun interface Factory { @Composable fun create(): ScalingLazyColumnState @@ -133,7 +121,7 @@ class ScalingLazyColumnState( // @Deprecated("Replaced by rememberResponsiveColumnState") @Composable fun rememberColumnState( - factory: ScalingLazyColumnState.Factory = ScalingLazyColumnDefaults.responsive(), + factory: ScalingLazyColumnState.Factory = ScalingLazyColumnDefaults.responsive() ): ScalingLazyColumnState { val columnState = factory.create() @@ -150,10 +138,7 @@ fun rememberResponsiveColumnState( last = ScalingLazyColumnDefaults.ItemType.Unspecified, ), verticalArrangement: Arrangement.Vertical = - Arrangement.spacedBy( - space = 4.dp, - alignment = Alignment.Top, - ), + Arrangement.spacedBy(space = 4.dp, alignment = Alignment.Top), rotaryMode: RotaryMode? = RotaryMode.Scroll, hapticsEnabled: Boolean = true, reverseLayout: Boolean = false, @@ -173,10 +158,7 @@ fun rememberResponsiveColumnState( val topScreenOffsetPx = screenHeightPx / 2 - topPaddingPx val initialScrollPosition = - ScalingLazyColumnState.ScrollPosition( - index = 0, - offsetPx = topScreenOffsetPx, - ) + ScalingLazyColumnState.ScrollPosition(index = 0, offsetPx = topScreenOffsetPx) val columnState = ScalingLazyColumnState( @@ -204,36 +186,8 @@ fun ScalingLazyColumn( modifier: Modifier = Modifier, content: ScalingLazyListScope.() -> Unit, ) { - val focusRequester = rememberActiveFocusRequester() - - val rotaryHaptics = - if (columnState.hapticsEnabled) { - rememberRotaryHapticHandler(columnState.state) - } else { - rememberDisabledHaptic() - } - - val modifierWithRotary = - when (columnState.rotaryMode) { - RotaryMode.Snap -> - modifier.rotaryWithSnap( - focusRequester = focusRequester, - rotaryScrollAdapter = columnState.state.toRotaryScrollAdapter(), - reverseDirection = columnState.reverseLayout, - rotaryHaptics = rotaryHaptics, - ) - RotaryMode.Scroll -> - modifier.rotaryWithScroll( - focusRequester = focusRequester, - scrollableState = columnState.state, - reverseDirection = columnState.reverseLayout, - rotaryHaptics = rotaryHaptics, - ) - else -> modifier - } - ScalingLazyColumn( - modifier = modifierWithRotary.fillMaxSize(), + modifier = modifier.fillMaxSize(), state = columnState.state, contentPadding = columnState.contentPadding, reverseLayout = columnState.reverseLayout, diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionButton.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButton.kt index 1d660ca35..320e58964 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionButton.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButton.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.elements.material3 +package com.android.permissioncontroller.wear.permission.components.material3 import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.PaddingValues @@ -22,7 +22,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.requiredSizeIn import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.graphics.Shape import androidx.compose.ui.text.style.Hyphens import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp @@ -32,8 +32,9 @@ import androidx.wear.compose.material3.ButtonDefaults import androidx.wear.compose.material3.LocalTextConfiguration import androidx.wear.compose.material3.LocalTextStyle import androidx.wear.compose.material3.Text -import com.android.permissioncontroller.permission.ui.wear.elements.Chip -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion +import com.android.permissioncontroller.wear.permission.components.material2.Chip +import com.android.permissioncontroller.wear.permission.components.theme.ResourceHelper +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionMaterialUIVersion /** * This component is wrapper on material Button component @@ -44,8 +45,7 @@ import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionM fun WearPermissionButton( label: String, modifier: Modifier = Modifier, - materialUIVersion: WearPermissionMaterialUIVersion = - WearPermissionMaterialUIVersion.MATERIAL2_5, + materialUIVersion: WearPermissionMaterialUIVersion = ResourceHelper.materialUIVersionInSettings, iconBuilder: WearPermissionIconBuilder? = null, labelMaxLines: Int? = null, secondaryLabel: String? = null, @@ -62,7 +62,7 @@ fun WearPermissionButton( modifier = modifier, secondaryLabel = secondaryLabel, secondaryLabelMaxLines = secondaryLabelMaxLines, - icon = { iconBuilder?.build() }, + icon = iconBuilder?.let { { iconBuilder.build() } }, largeIcon = false, colors = style.material2ChipColors(), enabled = enabled, @@ -95,6 +95,7 @@ internal fun WearPermissionButtonInternal( colors: ButtonColors = ButtonDefaults.filledTonalButtonColors(), contentPadding: PaddingValues = ButtonDefaults.ContentPadding, requiresMinimumHeight: Boolean = true, + shape: Shape = ButtonDefaults.shape, ) { val minHeight: Dp = if (requiresMinimumHeight) { @@ -110,11 +111,7 @@ internal fun WearPermissionButtonInternal( text = label, modifier = Modifier.fillMaxWidth(), maxLines = labelMaxLines ?: LocalTextConfiguration.current.maxLines, - style = - LocalTextStyle.current.copy( - fontWeight = FontWeight.W600, - hyphens = Hyphens.Auto, - ), + style = LocalTextStyle.current.copy(hyphens = Hyphens.Auto), ) } } @@ -126,6 +123,7 @@ internal fun WearPermissionButtonInternal( text = secondaryLabel, modifier = Modifier.fillMaxWidth(), maxLines = secondaryLabelMaxLines ?: LocalTextConfiguration.current.maxLines, + style = LocalTextStyle.current.copy(hyphens = Hyphens.Auto), ) } } @@ -139,5 +137,6 @@ internal fun WearPermissionButtonInternal( modifier = modifier.requiredSizeIn(minHeight = minHeight).fillMaxWidth(), contentPadding = contentPadding, colors = colors, + shape = shape, ) } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionButtonStyle.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButtonStyle.kt index 504c69bb0..f48d47b2c 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionButtonStyle.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionButtonStyle.kt @@ -13,20 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.android.permissioncontroller.permission.ui.wear.elements.material3 +package com.android.permissioncontroller.wear.permission.components.material3 import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color import androidx.wear.compose.material.ChipColors import androidx.wear.compose.material.ChipDefaults import androidx.wear.compose.material3.ButtonColors import androidx.wear.compose.material3.ButtonDefaults -import com.android.permissioncontroller.permission.ui.wear.elements.chipDefaultColors -import com.android.permissioncontroller.permission.ui.wear.elements.chipDisabledColors -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionButtonStyle.DisabledLike -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionButtonStyle.Primary -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionButtonStyle.Secondary -import com.android.permissioncontroller.permission.ui.wear.elements.material3.WearPermissionButtonStyle.Transparent +import com.android.permissioncontroller.wear.permission.components.material2.chipDefaultColors +import com.android.permissioncontroller.wear.permission.components.material2.chipDisabledColors +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButtonStyle.DisabledLike +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButtonStyle.Primary +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButtonStyle.Secondary +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButtonStyle.Transparent +import com.android.permissioncontroller.wear.permission.components.material3.WearPermissionButtonStyle.Warning /** * This component is wrapper on material control colors, It applies the right colors based material @@ -37,6 +38,7 @@ enum class WearPermissionButtonStyle { Secondary, Transparent, DisabledLike, + Warning, } @Composable @@ -46,6 +48,11 @@ internal fun WearPermissionButtonStyle.material2ChipColors(): ChipColors { Secondary -> ChipDefaults.secondaryChipColors() Transparent -> ChipDefaults.childChipColors() DisabledLike -> chipDisabledColors() + Warning -> + ChipDefaults.secondaryChipColors( + backgroundColor = + Color(red = 65, green = 14, blue = 11, alpha = (0.8f * 255).toInt()) + ) } } @@ -56,6 +63,11 @@ internal fun WearPermissionButtonStyle.material3ButtonColors(): ButtonColors { Secondary -> ButtonDefaults.filledTonalButtonColors() Transparent -> ButtonDefaults.childButtonColors() DisabledLike -> ButtonDefaults.disabledLikeColors() + Warning -> + ButtonDefaults.buttonColors( + containerColor = + Color(red = 65, green = 14, blue = 11, alpha = (0.8f * 255).toInt()) + ) } } diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionConfirmationDialog.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionConfirmationDialog.kt new file mode 100644 index 000000000..4ef6e8a72 --- /dev/null +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionConfirmationDialog.kt @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2025 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.permissioncontroller.wear.permission.components.material3 + +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.size +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState +import androidx.wear.compose.material3.AlertDialog as Material3AlertDialog +import androidx.wear.compose.material3.AlertDialogDefaults +import androidx.wear.compose.material3.Text +import com.android.permissioncontroller.wear.permission.components.material2.AlertDialog +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionMaterialUIVersion + +data class DialogButtonContent( + val icon: WearPermissionIconBuilder? = null, + val onClick: (() -> Unit), +) + +@Composable +fun WearPermissionConfirmationDialog( + materialUIVersion: WearPermissionMaterialUIVersion = + WearPermissionMaterialUIVersion.MATERIAL2_5, + show: Boolean, + iconRes: WearPermissionIconBuilder? = null, + title: String? = null, + message: String? = null, + positiveButtonContent: DialogButtonContent? = null, + negativeButtonContent: DialogButtonContent? = null, +) { + + if (materialUIVersion == WearPermissionMaterialUIVersion.MATERIAL3) { + if ( + (positiveButtonContent == null && negativeButtonContent != null) || + (positiveButtonContent != null && negativeButtonContent == null) + ) { + val edgeButtonContent = (positiveButtonContent ?: negativeButtonContent)!! + WearPermissionConfirmationDialogInternal( + show = show, + edgeButtonContent = edgeButtonContent, + iconRes = iconRes, + title = title, + message = message, + ) + } else { + WearPermissionConfirmationDialogInternal( + show = show, + positiveButtonContent = positiveButtonContent, + negativeButtonContent = negativeButtonContent, + iconRes = iconRes, + title = title, + message = message, + ) + } + } else { + AlertDialog( + title = title, + iconRes = iconRes, + message = message ?: "", + positiveButtonContent = positiveButtonContent, + negativeButtonContent = negativeButtonContent, + showDialog = show, + scalingLazyListState = rememberScalingLazyListState(), + ) + } +} + +@Composable +private fun WearPermissionConfirmationDialogInternal( + show: Boolean, + edgeButtonContent: DialogButtonContent, + iconRes: WearPermissionIconBuilder?, + title: String?, + message: String?, +) { + val edgeIcon: @Composable RowScope.() -> Unit = + edgeButtonContent.icon?.let { + { it.modifier(Modifier.size(36.dp).align(Alignment.CenterVertically)).build() } + } ?: AlertDialogDefaults.ConfirmIcon + + Material3AlertDialog( + visible = show, + onDismissRequest = edgeButtonContent.onClick, + edgeButton = { + AlertDialogDefaults.EdgeButton(onClick = edgeButtonContent.onClick, content = edgeIcon) + }, + icon = { iconRes?.build() }, + title = title?.let { { Text(text = title) } } ?: {}, + text = message?.let { { Text(text = message) } }, + ) +} + +@Composable +private fun WearPermissionConfirmationDialogInternal( + show: Boolean, + positiveButtonContent: DialogButtonContent?, + negativeButtonContent: DialogButtonContent?, + iconRes: WearPermissionIconBuilder?, + title: String?, + message: String?, +) { + val positiveButton: (@Composable RowScope.() -> Unit)? = + positiveButtonContent?.let { + { + val positiveIcon: @Composable RowScope.() -> Unit = + positiveButtonContent.icon?.let { + { + it.modifier(Modifier.size(36.dp).align(Alignment.CenterVertically)) + .build() + } + } ?: AlertDialogDefaults.ConfirmIcon + + AlertDialogDefaults.ConfirmButton( + onClick = positiveButtonContent.onClick, + content = positiveIcon, + ) + } + } + + val negativeButton: (@Composable RowScope.() -> Unit)? = + negativeButtonContent?.let { + { + val negativeIcon: @Composable RowScope.() -> Unit = + negativeButtonContent.icon?.let { + { + it.modifier(Modifier.size(36.dp).align(Alignment.CenterVertically)) + .build() + } + } ?: AlertDialogDefaults.DismissIcon + + AlertDialogDefaults.DismissButton( + onClick = negativeButtonContent.onClick, + content = negativeIcon, + ) + } + } + + Material3AlertDialog( + visible = show, + onDismissRequest = negativeButtonContent?.onClick ?: {}, + confirmButton = positiveButton ?: {}, + dismissButton = negativeButton ?: {}, + icon = { iconRes?.build() }, + title = title?.let { { Text(text = title) } } ?: {}, + text = message?.let { { Text(text = message) } }, + ) +} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionIconBuilder.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionIconBuilder.kt index b7521d073..e5e51af66 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionIconBuilder.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionIconBuilder.kt @@ -13,19 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.elements.material3 +package com.android.permissioncontroller.wear.permission.components.material3 import android.graphics.drawable.Drawable import androidx.compose.foundation.layout.size +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.filled.Close import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource import androidx.wear.compose.material3.Icon import androidx.wear.compose.material3.IconButtonDefaults -import com.android.permissioncontroller.permission.ui.wear.elements.rememberDrawablePainter +import com.android.permissioncontroller.wear.permission.components.rememberDrawablePainter /** * This class simplifies the construction of icons with various attributes like resource type, @@ -66,7 +70,7 @@ class WearPermissionIconBuilder private constructor() { } fun modifier(modifier: Modifier): WearPermissionIconBuilder { - this.modifier then modifier + this.modifier = modifier then this.modifier return this } @@ -99,3 +103,11 @@ class WearPermissionIconBuilder private constructor() { fun builder(icon: Any) = WearPermissionIconBuilder().apply { iconResource = icon } } } + +@Composable +fun WearPermissionIconBuilder.Companion.defaultAlertConfirmIcon() = + builder(Icons.Default.Check).contentDescription((stringResource(android.R.string.ok))) + +@Composable +fun WearPermissionIconBuilder.Companion.defaultAlertDismissIcon() = + builder(Icons.Default.Close).contentDescription((stringResource(android.R.string.cancel))) diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionListFooter.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionListFooter.kt index 10125c873..90ee09bab 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionListFooter.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionListFooter.kt @@ -13,20 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.android.permissioncontroller.permission.ui.wear.elements.material3 +package com.android.permissioncontroller.wear.permission.components.material3 import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.unit.dp import androidx.wear.compose.material3.ButtonDefaults -import com.android.permissioncontroller.permission.ui.wear.elements.ListFooter -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion +import com.android.permissioncontroller.wear.permission.components.material2.ListFooter +import com.android.permissioncontroller.wear.permission.components.theme.ResourceHelper +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionMaterialUIVersion /** This component is creates a transparent styled button to use as a list footer. */ @Composable fun WearPermissionListFooter( - materialUIVersion: WearPermissionMaterialUIVersion, + materialUIVersion: WearPermissionMaterialUIVersion = ResourceHelper.materialUIVersionInSettings, label: String, iconBuilder: WearPermissionIconBuilder? = null, onClick: (() -> Unit) = {}, @@ -46,6 +47,7 @@ fun WearPermissionListFooter( contentPadding = PaddingValues(0.dp), colors = ButtonDefaults.childButtonColors(), requiresMinimumHeight = false, + shape = RectangleShape, ) } } diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionListSubHeader.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionListSubHeader.kt new file mode 100644 index 000000000..2ed6e532f --- /dev/null +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionListSubHeader.kt @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2024 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.permissioncontroller.wear.permission.components.material3 + +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.requiredHeightIn +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.unit.dp +import androidx.wear.compose.material3.ListSubHeader +import com.android.permissioncontroller.wear.permission.components.material2.ListSubheader +import com.android.permissioncontroller.wear.permission.components.theme.ResourceHelper +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionMaterialUIVersion + +/* +This component is simplified wrapper over ListSubHeader with quick padding adjustments + */ +@Composable +fun WearPermissionListSubHeader( + wearPermissionMaterialUIVersion: WearPermissionMaterialUIVersion = + ResourceHelper.materialUIVersionInSettings, + isFirstItemInAList: Boolean, + label: @Composable RowScope.() -> Unit, +) { + val screenWidth = LocalConfiguration.current.screenWidthDp + val screenHeight = LocalConfiguration.current.screenHeightDp + val subtitlePaddingDefaults = + WearPermissionScaffoldPaddingDefaults( + screenWidth = screenWidth, + screenHeight = screenHeight, + ) + .subHeaderPaddingValues(needsLargePadding = !isFirstItemInAList) + + if (wearPermissionMaterialUIVersion == WearPermissionMaterialUIVersion.MATERIAL3) { + ListSubHeader( + modifier = Modifier.requiredHeightIn(1.dp), // We do not want default min height + contentPadding = subtitlePaddingDefaults, + label = label, + ) + } else { + ListSubheader(modifier = Modifier.padding(subtitlePaddingDefaults), label = label) + } +} diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffold.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffold.kt new file mode 100644 index 000000000..87ca048bc --- /dev/null +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffold.kt @@ -0,0 +1,403 @@ +/* + * Copyright 2024 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 + * + * https://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.permissioncontroller.wear.permission.components.material3 + +import android.graphics.drawable.Drawable +import androidx.compose.foundation.background +import androidx.compose.foundation.gestures.ScrollableState +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.requiredHeightIn +import androidx.compose.foundation.layout.size +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.style.Hyphens +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.wear.compose.foundation.ExpandableState +import androidx.wear.compose.foundation.ScrollInfoProvider +import androidx.wear.compose.foundation.expandableButton +import androidx.wear.compose.foundation.expandableItems +import androidx.wear.compose.foundation.lazy.ScalingLazyColumn +import androidx.wear.compose.foundation.lazy.ScalingLazyListScope +import androidx.wear.compose.foundation.lazy.ScalingLazyListState +import androidx.wear.compose.foundation.lazy.TransformingLazyColumn +import androidx.wear.compose.foundation.lazy.TransformingLazyColumnScope +import androidx.wear.compose.foundation.lazy.TransformingLazyColumnState +import androidx.wear.compose.foundation.lazy.rememberScalingLazyListState +import androidx.wear.compose.foundation.lazy.rememberTransformingLazyColumnState +import androidx.wear.compose.material3.AppScaffold +import androidx.wear.compose.material3.CircularProgressIndicator +import androidx.wear.compose.material3.Icon +import androidx.wear.compose.material3.IconButtonDefaults +import androidx.wear.compose.material3.ListHeader +import androidx.wear.compose.material3.MaterialTheme +import androidx.wear.compose.material3.ScreenScaffold +import androidx.wear.compose.material3.ScrollIndicator +import androidx.wear.compose.material3.Text +import androidx.wear.compose.material3.TimeText +import com.android.permissioncontroller.wear.permission.components.AnnotatedText +import com.android.permissioncontroller.wear.permission.components.ListScopeWrapper +import com.android.permissioncontroller.wear.permission.components.material2.Wear2Scaffold +import com.android.permissioncontroller.wear.permission.components.rememberDrawablePainter +import com.android.permissioncontroller.wear.permission.components.theme.ResourceHelper +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionMaterialUIVersion +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionMaterialUIVersion.MATERIAL2_5 +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionTheme + +private class TransformingScopeConverter(private val scope: TransformingLazyColumnScope) : + ListScopeWrapper { + override fun item(key: Any?, contentType: Any?, content: @Composable () -> Unit) { + // TODO:https://buganizer.corp.google.com/issues/389093588. + scope.item { content() } + } + + override fun items( + count: Int, + key: ((Int) -> Any)?, + contentType: (Int) -> Any?, + content: @Composable ((Int) -> Unit), + ) { + scope.items(count, key, contentType) { content(it) } + } + + override fun expandableItems( + state: ExpandableState, + count: Int, + key: ((Int) -> Any)?, + itemContent: @Composable (BoxScope.(Int) -> Unit), + ) { + throw Exception("Expandable Items are not implemented on TLC Yet. Use SLC.") + } + + override fun expandableButton( + state: ExpandableState, + key: Any?, + content: @Composable (() -> Unit), + ) { + throw Exception("Expandable Button is not implemented on TLC Yet. Use SLC.") + } +} + +private class ScalingScopeConverter(private val scope: ScalingLazyListScope) : ListScopeWrapper { + override fun item(key: Any?, contentType: Any?, content: @Composable () -> Unit) { + scope.item { content() } + } + + override fun items( + count: Int, + key: ((Int) -> Any)?, + contentType: (Int) -> Any?, + content: @Composable ((Int) -> Unit), + ) { + scope.items(count, key) { content(it) } + } + + override fun expandableItems( + state: ExpandableState, + count: Int, + key: ((Int) -> Any)?, + itemContent: @Composable (BoxScope.(Int) -> Unit), + ) { + scope.expandableItems(state, count, key, itemContent) + } + + override fun expandableButton( + state: ExpandableState, + key: Any?, + content: @Composable (() -> Unit), + ) { + scope.expandableButton(state, key, content) + } +} + +/** + * This component is wrapper on material scaffold component. It helps with time text, scroll + * indicator and standard list elements like title, icon and subtitle. + */ +@Composable +fun WearPermissionScaffold( + materialUIVersion: WearPermissionMaterialUIVersion = ResourceHelper.materialUIVersionInSettings, + asScalingList: Boolean = false, + showTimeText: Boolean, + title: String?, + subtitle: CharSequence?, + image: Any?, + isLoading: Boolean, + content: ListScopeWrapper.() -> Unit, + titleTestTag: String? = null, + subtitleTestTag: String? = null, +) { + + if (materialUIVersion == MATERIAL2_5) { + Wear2Scaffold( + showTimeText, + title, + subtitle, + image, + isLoading, + { content.invoke(ScalingScopeConverter(this)) }, + titleTestTag, + subtitleTestTag, + ) + } else { + WearPermissionScaffoldInternal( + asScalingList = asScalingList, + showTimeText = showTimeText, + title = title, + subtitle = subtitle, + image = image, + isLoading = isLoading, + content = content, + titleTestTag = titleTestTag, + subtitleTestTag = subtitleTestTag, + ) + } +} + +@Composable +private fun WearPermissionScaffoldInternal( + asScalingList: Boolean = false, + showTimeText: Boolean, + title: String?, + subtitle: CharSequence?, + image: Any?, + isLoading: Boolean, + content: ListScopeWrapper.() -> Unit, + titleTestTag: String? = null, + subtitleTestTag: String? = null, +) { + + val scalingListState = rememberScalingLazyListState() + val transformingLazyColumnState = rememberTransformingLazyColumnState() + LaunchedEffect(title, subtitle) { + // When the title/subtitle changes go to the top. Ex: A chain of permission requests. + scalingListState.scrollToItem(index = 0) + transformingLazyColumnState.scrollToItem(index = 0) + } + val listState = if (asScalingList) scalingListState else transformingLazyColumnState + val scrollInfoProvider = + if (asScalingList) ScrollInfoProvider(scalingListState) + else ScrollInfoProvider(transformingLazyColumnState) + val positionIndicator = + if (asScalingList) wearPermissionScrollIndicator(!isLoading, scalingListState) + else wearPermissionScrollIndicator(!isLoading, transformingLazyColumnState) + + WearPermissionTheme(version = WearPermissionMaterialUIVersion.MATERIAL3) { + AppScaffold(timeText = wearPermissionTimeText(showTimeText && !isLoading)) { + ScreenScaffold( + scrollInfoProvider = scrollInfoProvider, + scrollIndicator = positionIndicator, + ) { + Box(modifier = Modifier.fillMaxSize()) { + if (isLoading) { + CircularProgressIndicator(modifier = Modifier.align(Alignment.Center)) + } else { + LazyColumnView( + asScalingList = asScalingList, + showTimeText = showTimeText, + listState = listState, + title = title, + subtitle = subtitle, + image = image, + content = content, + titleTestTag = titleTestTag, + subtitleTestTag = subtitleTestTag, + ) + } + } + } + } + } +} + +@Composable +private fun BoxScope.LazyColumnView( + asScalingList: Boolean = false, + showTimeText: Boolean, + listState: ScrollableState, + title: String?, + subtitle: CharSequence?, + image: Any?, + content: ListScopeWrapper.() -> Unit, + titleTestTag: String? = null, + subtitleTestTag: String? = null, +) { + val screenWidth = LocalConfiguration.current.screenWidthDp + val screenHeight = LocalConfiguration.current.screenHeightDp + val paddingDefaults = + WearPermissionScaffoldPaddingDefaults( + screenWidth = screenWidth, + screenHeight = screenHeight, + ) + val painterImage = image?.let { painterFromImage(image = image) } + val scrollContentPadding = + if (showTimeText) { + paddingDefaults.scrollContentPadding + } else { + paddingDefaults.scrollContentPaddingForDialogs(painterImage == null) + } + + fun BoxScope.scrollingViewContent(scopeWrapper: ListScopeWrapper) { + with(scopeWrapper) { + iconItem( + painter = painterImage, + modifier = Modifier.size(IconButtonDefaults.LargeIconSize), + ) + titleItem( + text = title, + testTag = titleTestTag, + asScalingList = true, + contentPaddingValues = paddingDefaults.titlePaddingValues(subtitle == null), + ) + subtitleItem( + text = subtitle, + testTag = subtitleTestTag, + modifier = + Modifier.align(Alignment.Center).padding(paddingDefaults.subTitlePaddingValues), + ) + content() + } + } + + if (asScalingList) { + ScalingLazyColumn( + contentPadding = scrollContentPadding, + state = listState as ScalingLazyListState, + autoCentering = null, + modifier = Modifier.background(MaterialTheme.colorScheme.background), + content = { scrollingViewContent(ScalingScopeConverter(this)) }, + ) + } else { + TransformingLazyColumn( + contentPadding = scrollContentPadding, + state = listState as TransformingLazyColumnState, + modifier = Modifier.background(MaterialTheme.colorScheme.background), + content = { scrollingViewContent(TransformingScopeConverter(this)) }, + ) + } +} + +private fun wearPermissionTimeText(showTime: Boolean): @Composable () -> Unit { + return if (showTime) { + { TimeText() } + } else { + {} + } +} + +private fun wearPermissionScrollIndicator( + showIndicator: Boolean, + columnState: TransformingLazyColumnState, +): @Composable (BoxScope.() -> Unit)? { + return if (showIndicator) { + { ScrollIndicator(modifier = Modifier.align(Alignment.CenterEnd), state = columnState) } + } else { + null + } +} + +private fun wearPermissionScrollIndicator( + showIndicator: Boolean, + columnState: ScalingLazyListState, +): @Composable (BoxScope.() -> Unit)? { + return if (showIndicator) { + { ScrollIndicator(modifier = Modifier.align(Alignment.CenterEnd), state = columnState) } + } else { + null + } +} + +@Composable +private fun painterFromImage(image: Any?): Painter? { + return when (image) { + is Int -> painterResource(id = image) + is Drawable -> rememberDrawablePainter(image) + else -> null + } +} + +private fun Modifier.optionalTestTag(tag: String?): Modifier { + if (tag == null) { + return this + } + return this then testTag(tag) +} + +private fun ListScopeWrapper.iconItem(painter: Painter?, modifier: Modifier = Modifier) = + painter?.let { + item { + val iconColor = WearPermissionButtonStyle.Secondary.material3ButtonColors().iconColor + Icon(painter = it, contentDescription = null, modifier = modifier, tint = iconColor) + } + } + +private fun ListScopeWrapper.titleItem( + text: String?, + asScalingList: Boolean, + testTag: String?, + contentPaddingValues: PaddingValues, + modifier: Modifier = Modifier, +) = + text?.let { + item(contentType = "header") { + val style = + if (asScalingList) { + MaterialTheme.typography.titleMedium + } else { + MaterialTheme.typography.titleLarge + } + ListHeader( + modifier = modifier.requiredHeightIn(1.dp), // We do not want default min height + contentPadding = contentPaddingValues, + ) { + Text( + text = it, + textAlign = TextAlign.Center, + modifier = Modifier.optionalTestTag(testTag), + style = style.copy(hyphens = Hyphens.Auto), + ) + } + } + } + +private fun ListScopeWrapper.subtitleItem( + text: CharSequence?, + testTag: String?, + modifier: Modifier = Modifier, +) = + text?.let { + item { + AnnotatedText( + text = it, + style = + MaterialTheme.typography.bodyMedium.copy( + color = MaterialTheme.colorScheme.onSurfaceVariant + ), + modifier = modifier.optionalTestTag(testTag), + shouldCapitalize = true, + ) + } + } diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffoldPaddingDefaults.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffoldPaddingDefaults.kt new file mode 100644 index 000000000..01b8fc4be --- /dev/null +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionScaffoldPaddingDefaults.kt @@ -0,0 +1,82 @@ +/* + * Copyright 2025 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 + * + * https://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.permissioncontroller.wear.permission.components.material3 + +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.ui.unit.dp + +/* A common class for calculating padding for list items as per the latest design. +https://www.figma.com/design/nb1atBKcK3luF8AXWLUe0X/BC25-Settings-on-Wear?node-id=2336-3304&t=n35PgTUC2O8hGSI0-0 */ +data class WearPermissionScaffoldPaddingDefaults( + private val screenWidth: Int, + private val screenHeight: Int, +) { + private val scrollContentHorizontalPadding = (screenWidth * 0.052).dp + private val titleHorizontalPadding = (screenWidth * 0.1200).dp + private val subtitleHorizontalPadding = (screenWidth * 0.0416).dp + private val scrollContentTopPadding = (screenHeight * 0.1664).dp + private val dialogScrollContentLargeTopPadding = (screenHeight * 0.10).dp + private val dialogScrollContentTopPadding = (screenHeight * 0.012).dp + private val scrollContentBottomPadding = (screenHeight * 0.3646).dp + private val noPadding = 0.dp + private val defaultItemPadding = 4.dp + private val largeItemPadding = 12.dp + private val extraLargePadding = 12.dp + + fun titlePaddingValues(needsLargePadding: Boolean): PaddingValues = + PaddingValues( + start = titleHorizontalPadding, + top = defaultItemPadding, + bottom = if (needsLargePadding) largeItemPadding else defaultItemPadding, + end = titleHorizontalPadding, + ) + + fun subHeaderPaddingValues(needsLargePadding: Boolean): PaddingValues = + PaddingValues( + start = subtitleHorizontalPadding, + top = if (needsLargePadding) extraLargePadding else noPadding, + bottom = 8.dp, + end = subtitleHorizontalPadding, + ) + + fun scrollContentPaddingForDialogs(needsLargePadding: Boolean) = + PaddingValues( + start = scrollContentHorizontalPadding, + end = scrollContentHorizontalPadding, + top = + if (needsLargePadding) { + dialogScrollContentLargeTopPadding + } else { + dialogScrollContentTopPadding + }, + bottom = scrollContentBottomPadding, + ) + + val subTitlePaddingValues = + PaddingValues( + start = subtitleHorizontalPadding, + top = defaultItemPadding, + bottom = largeItemPadding, + end = subtitleHorizontalPadding, + ) + val scrollContentPadding = + PaddingValues( + start = scrollContentHorizontalPadding, + end = scrollContentHorizontalPadding, + top = scrollContentTopPadding, + bottom = scrollContentBottomPadding, + ) +} diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionToggleControl.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionToggleControl.kt index 4a139f91f..7998f43de 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionToggleControl.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionToggleControl.kt @@ -13,22 +13,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.elements.material3 +package com.android.permissioncontroller.wear.permission.components.material3 import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.semantics.stateDescription +import androidx.compose.ui.text.style.Hyphens import androidx.wear.compose.material3.CheckboxButton import androidx.wear.compose.material3.LocalTextConfiguration +import androidx.wear.compose.material3.LocalTextStyle import androidx.wear.compose.material3.RadioButton import androidx.wear.compose.material3.SwitchButton import androidx.wear.compose.material3.Text -import com.android.permissioncontroller.permission.ui.wear.elements.ToggleChip -import com.android.permissioncontroller.permission.ui.wear.elements.ToggleChipToggleControl -import com.android.permissioncontroller.permission.ui.wear.elements.toggleControlSemantics -import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionMaterialUIVersion +import com.android.permissioncontroller.wear.permission.components.R +import com.android.permissioncontroller.wear.permission.components.material2.ToggleChip +import com.android.permissioncontroller.wear.permission.components.theme.ResourceHelper +import com.android.permissioncontroller.wear.permission.components.theme.WearPermissionMaterialUIVersion + +/** Defines various toggle control types. */ +enum class WearPermissionToggleControlType { + Switch, + Radio, + Checkbox, +} /** * The custom component is a wrapper on different material3 toggle controls. @@ -39,14 +51,13 @@ import com.android.permissioncontroller.permission.ui.wear.theme.WearPermissionM */ @Composable fun WearPermissionToggleControl( - toggleControl: ToggleChipToggleControl, + toggleControl: WearPermissionToggleControlType, label: String, checked: Boolean, onCheckedChanged: (Boolean) -> Unit, modifier: Modifier = Modifier, labelMaxLines: Int? = null, - materialUIVersion: WearPermissionMaterialUIVersion = - WearPermissionMaterialUIVersion.MATERIAL2_5, + materialUIVersion: WearPermissionMaterialUIVersion = ResourceHelper.materialUIVersionInSettings, iconBuilder: WearPermissionIconBuilder? = null, secondaryLabel: String? = null, secondaryLabelMaxLines: Int? = null, @@ -87,7 +98,7 @@ fun WearPermissionToggleControl( @Composable private fun WearPermissionToggleControlInternal( label: String, - toggleControl: ToggleChipToggleControl, + toggleControl: WearPermissionToggleControlType, checked: Boolean, onCheckedChanged: (Boolean) -> Unit, modifier: Modifier = Modifier, @@ -103,6 +114,7 @@ private fun WearPermissionToggleControlInternal( text = label, modifier = Modifier.fillMaxWidth(), maxLines = labelMaxLines ?: LocalTextConfiguration.current.maxLines, + style = LocalTextStyle.current.copy(hyphens = Hyphens.Auto), ) } @@ -113,23 +125,34 @@ private fun WearPermissionToggleControlInternal( text = it, modifier = Modifier.fillMaxWidth(), maxLines = secondaryLabelMaxLines ?: LocalTextConfiguration.current.maxLines, + style = LocalTextStyle.current.copy(hyphens = Hyphens.Auto), ) } } val iconParam: (@Composable BoxScope.() -> Unit)? = iconBuilder?.let { { it.build() } } - + val toggleControlStateDescription = + stringResource( + if (checked) { + R.string.on + } else { + R.string.off + } + ) val updatedModifier = - modifier - .fillMaxWidth() - // .heightIn(min = 58.dp) // TODO(b/370783358): This should be a overlaid value - .toggleControlSemantics(toggleControl, checked) + modifier.fillMaxWidth().semantics { stateDescription = toggleControlStateDescription } when (toggleControl) { - ToggleChipToggleControl.Radio -> + WearPermissionToggleControlType.Radio -> RadioButton( selected = checked, - onSelect = { onCheckedChanged(true) }, + onSelect = { + // We do not want to call if it is already checked. + // Radio button can't be toggled off + if (!checked) { + onCheckedChanged(true) + } + }, modifier = updatedModifier, enabled = enabled, icon = iconParam, @@ -138,7 +161,7 @@ private fun WearPermissionToggleControlInternal( colors = style.radioButtonColorScheme(), ) - ToggleChipToggleControl.Checkbox -> + WearPermissionToggleControlType.Checkbox -> CheckboxButton( checked = checked, onCheckedChange = onCheckedChanged, @@ -150,7 +173,7 @@ private fun WearPermissionToggleControlInternal( colors = style.checkboxColorScheme(), ) - ToggleChipToggleControl.Switch -> + WearPermissionToggleControlType.Switch -> SwitchButton( checked = checked, onCheckedChange = onCheckedChanged, diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionToggleControlStyle.kt b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionToggleControlStyle.kt index b5746f019..26a0ea0ef 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/elements/material3/WearPermissionToggleControlStyle.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/material3/WearPermissionToggleControlStyle.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.elements.material3 +package com.android.permissioncontroller.wear.permission.components.material3 import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color @@ -25,8 +25,8 @@ import androidx.wear.compose.material3.RadioButtonColors import androidx.wear.compose.material3.RadioButtonDefaults.radioButtonColors import androidx.wear.compose.material3.SwitchButtonColors import androidx.wear.compose.material3.SwitchButtonDefaults.switchButtonColors -import com.android.permissioncontroller.permission.ui.wear.elements.toggleChipBackgroundColors -import com.android.permissioncontroller.permission.ui.wear.elements.toggleChipDisabledColors +import com.android.permissioncontroller.wear.permission.components.material2.toggleChipBackgroundColors +import com.android.permissioncontroller.wear.permission.components.material2.toggleChipDisabledColors /** * Defines toggle control styles, It helps in setting the right colors scheme to a toggle control. diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/ResourceHelper.kt b/PermissionController/wear-permission-components/src/wear.permission.components/theme/ResourceHelper.kt index c7ed0958c..010d66a30 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/ResourceHelper.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/theme/ResourceHelper.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.theme +package com.android.permissioncontroller.wear.permission.components.theme import android.content.Context import android.os.SystemProperties @@ -23,21 +23,45 @@ import androidx.annotation.DoNotInline import androidx.annotation.StringRes import androidx.compose.ui.graphics.Color -internal object ResourceHelper { +object ResourceHelper { private const val MATERIAL3_ENABLED_SYSPROP = "persist.cw_build.bluechip.enabled" - val material3Enabled: Boolean + /* This controls in app permission controller experience. */ + private val material3Enabled: Boolean get() { return SystemProperties.getBoolean(MATERIAL3_ENABLED_SYSPROP, false) } + val materialUIVersionInApp: WearPermissionMaterialUIVersion = + if (material3Enabled) { + WearPermissionMaterialUIVersion.MATERIAL3 + } else { + WearPermissionMaterialUIVersion.MATERIAL2_5 + } + + /* + This is to control the permission controller screens in settings. + Currently it is set as false. We will either use the flag or a common property from settings + based on settings implementation when we are ready" */ + private val material3EnabledInSettings: Boolean + get() { + return false + } + + val materialUIVersionInSettings: WearPermissionMaterialUIVersion = + if (material3EnabledInSettings) { + WearPermissionMaterialUIVersion.MATERIAL3 + } else { + WearPermissionMaterialUIVersion.MATERIAL2_5 + } + @DoNotInline fun getColor(context: Context, @ColorRes id: Int): Color? { return try { val colorInt = context.resources.getColor(id, context.theme) Color(colorInt) - } catch (e: Exception) { + } catch (_: Exception) { null } } @@ -46,7 +70,7 @@ internal object ResourceHelper { fun getString(context: Context, @StringRes id: Int): String? { return try { context.resources.getString(id) - } catch (e: Exception) { + } catch (_: Exception) { null } } @@ -55,7 +79,7 @@ internal object ResourceHelper { fun getDimen(context: Context, @DimenRes id: Int): Float? { return try { context.resources.getDimension(id) / context.resources.displayMetrics.density - } catch (e: Exception) { + } catch (_: Exception) { null } } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearComposeMaterial3ColorScheme.kt b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3ColorScheme.kt index 7ac6c8114..41e8fd975 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearComposeMaterial3ColorScheme.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3ColorScheme.kt @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.theme +package com.android.permissioncontroller.wear.permission.components.theme import android.content.Context import android.os.Build import androidx.annotation.ColorRes import androidx.annotation.RequiresApi import androidx.compose.ui.graphics.Color +import androidx.wear.compose.material.Colors import androidx.wear.compose.material3.ColorScheme /** @@ -29,6 +30,24 @@ import androidx.wear.compose.material3.ColorScheme */ internal object WearComposeMaterial3ColorScheme { + fun legacyColorScheme(): ColorScheme { + return Colors().run { + ColorScheme( + background = background, + onBackground = onBackground, + onPrimaryContainer = primary, + primaryDim = primaryVariant, + onPrimary = onPrimary, + tertiary = secondary, // Best-Fit Mapping: Refer WearMaterialBridgedTheme. + tertiaryDim = secondaryVariant, + onTertiary = onSecondary, + surfaceContainer = surface, + onSurface = onSurface, + onSurfaceVariant = onSurfaceVariant, + ) + } + } + @RequiresApi(Build.VERSION_CODES.S) fun tonalColorScheme(context: Context): ColorScheme { val tonalPalette = dynamicTonalPalette(context) diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearComposeMaterial3Shapes.kt b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Shapes.kt index f81022842..89851d60e 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearComposeMaterial3Shapes.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Shapes.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.theme +package com.android.permissioncontroller.wear.permission.components.theme import android.content.Context import androidx.annotation.DimenRes @@ -21,7 +21,7 @@ import androidx.compose.foundation.shape.CornerBasedShape import androidx.compose.foundation.shape.CornerSize import androidx.compose.ui.unit.dp import androidx.wear.compose.material3.Shapes -import com.android.permissioncontroller.R +import com.android.permissioncontroller.wear.permission.components.R // TODO(b/324928718): Use system defined symbols. internal object WearComposeMaterial3Shapes { diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearComposeMaterial3TypeScaleTokens.kt b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3TypeScaleTokens.kt index a4ec9ee1d..df5057472 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearComposeMaterial3TypeScaleTokens.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3TypeScaleTokens.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.theme +package com.android.permissioncontroller.wear.permission.components.theme /* * These values are retrieved from https://carbon.googleplex.com/wear-m3/pages and diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearComposeMaterial3Typography.kt b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Typography.kt index ceae526a7..c85381c1b 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearComposeMaterial3Typography.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Typography.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.theme +package com.android.permissioncontroller.wear.permission.components.theme import android.content.Context import androidx.annotation.DimenRes @@ -24,8 +24,9 @@ import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontVariation import androidx.compose.ui.unit.sp +import androidx.wear.compose.foundation.CurvedTextStyle import androidx.wear.compose.material3.Typography -import com.android.permissioncontroller.R +import com.android.permissioncontroller.wear.permission.components.R internal object WearComposeMaterial3Typography { @@ -50,6 +51,18 @@ internal object WearComposeMaterial3Typography { return FontFamily(font) } + private fun CurvedTextStyle.updatedTextStyle( + context: Context, + @StringRes fontRes: Int, + variationSettings: FontVariation.Settings? = null, + @DimenRes fontSizeRes: Int, + ): CurvedTextStyle { + val fontFamily = + fontFamily(context = context, id = fontRes, variationSettings = variationSettings) + val fontSize = ResourceHelper.getDimen(context = context, id = fontSizeRes)?.sp ?: fontSize + return copy(fontFamily = fontFamily, fontSize = fontSize) + } + private fun TextStyle.updatedTextStyle( context: Context, @StringRes fontRes: Int, diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearComposeMaterial3VariableFontTokens.kt b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3VariableFontTokens.kt index 1b42a3b05..644a1b754 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearComposeMaterial3VariableFontTokens.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3VariableFontTokens.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.theme +package com.android.permissioncontroller.wear.permission.components.theme import androidx.compose.ui.text.font.FontVariation diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearMaterialBridgedLegacyTheme.kt b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearMaterialBridgedLegacyTheme.kt index 160dc2e93..51ae16477 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearMaterialBridgedLegacyTheme.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearMaterialBridgedLegacyTheme.kt @@ -13,10 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.theme +package com.android.permissioncontroller.wear.permission.components.theme -import android.os.Build -import androidx.annotation.RequiresApi import androidx.compose.ui.unit.sp import androidx.wear.compose.material.Colors import androidx.wear.compose.material.Shapes @@ -29,10 +27,8 @@ import androidx.wear.compose.material.Typography * However to avoid maintaining two sets of resources for overlays, this class construct 2.5 theme * from 3.0 */ -@RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM) internal class WearMaterialBridgedLegacyTheme private constructor(newTheme: WearOverlayableMaterial3Theme) { - val colors = newTheme.colorScheme.run { Colors( diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearOverlayableMaterial3Theme.kt b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearOverlayableMaterial3Theme.kt index 8aeb5f74d..f6bf56f47 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/theme/WearOverlayableMaterial3Theme.kt +++ b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearOverlayableMaterial3Theme.kt @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.permissioncontroller.permission.ui.wear.theme +package com.android.permissioncontroller.wear.permission.components.theme import android.content.Context import android.os.Build -import androidx.annotation.RequiresApi /** * Theme wrapper providing Material 3 styling while maintaining compatibility with Runtime Resource @@ -26,13 +25,18 @@ import androidx.annotation.RequiresApi * Uses the tonal palette from the previous Material Design version until dynamic color tokens are * available in SDK 36. */ -@RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM) internal class WearOverlayableMaterial3Theme(context: Context) { val colorScheme = - if (Build.VERSION.SDK_INT >= 36) { - WearComposeMaterial3ColorScheme.dynamicColorScheme(context) - } else { - WearComposeMaterial3ColorScheme.tonalColorScheme(context) + when { + Build.VERSION.SDK_INT >= 36 -> { + WearComposeMaterial3ColorScheme.dynamicColorScheme(context) + } + Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + WearComposeMaterial3ColorScheme.tonalColorScheme(context) + } + else -> { + WearComposeMaterial3ColorScheme.legacyColorScheme() + } } val typography = WearComposeMaterial3Typography.dynamicTypography(context) diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearPermissionTheme.kt b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearPermissionTheme.kt new file mode 100644 index 000000000..b1c87108c --- /dev/null +++ b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearPermissionTheme.kt @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2024 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.permissioncontroller.wear.permission.components.theme + +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext +import androidx.wear.compose.material.MaterialTheme +import androidx.wear.compose.material3.MaterialTheme as Material3Theme + +/** This enum is used to specify the material version used for a specific screen */ +enum class WearPermissionMaterialUIVersion { + MATERIAL2_5, + MATERIAL3, +} + +/** An overlay-able compose theme supporting both material2.5 and 3. */ +@Composable +fun WearPermissionTheme( + version: WearPermissionMaterialUIVersion = ResourceHelper.materialUIVersionInSettings, + content: @Composable () -> Unit, +) { + WearOverlayableMaterial3Theme(LocalContext.current).run { + when (version) { + WearPermissionMaterialUIVersion.MATERIAL3 -> + Material3Theme( + colorScheme = colorScheme, + typography = typography, + shapes = shapes, + content = content, + ) + // Material2_5 UI controls are still being used in the screen, + // To avoid having two set of overlay resources, we will use material3 overlay resources + // to + // support material2_5 UI controls as well. + WearPermissionMaterialUIVersion.MATERIAL2_5 -> + WearMaterialBridgedLegacyTheme.createFrom(this).run { + MaterialTheme( + colors = colors, + typography = typography, + shapes = shapes, + content = content, + ) + } + } + } +} diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearPermissionTonalPalette.kt b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearPermissionTonalPalette.kt new file mode 100644 index 000000000..72aa3e487 --- /dev/null +++ b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearPermissionTonalPalette.kt @@ -0,0 +1,216 @@ +@file:Suppress("unused") + +/* + * Copyright (C) 2024 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.permissioncontroller.wear.permission.components.theme + +import android.content.Context +import android.os.Build +import androidx.annotation.ColorRes +import androidx.annotation.DoNotInline +import androidx.annotation.RequiresApi +import androidx.compose.ui.graphics.Color + +/** + * Tonal Palette structure in Material. + * + * A tonal palette is comprised of 5 tonal ranges. Each tonal range includes the 13 stops, or tonal + * swatches. + * + * Tonal range names are: + * - Neutral (N) + * - Neutral variant (NV) + * - Primary (P) + * - Secondary (S) + * - Tertiary (T) + */ +internal class WearPermissionTonalPalette( + // The neutral tonal range. + val neutral100: Color, + val neutral99: Color, + val neutral95: Color, + val neutral90: Color, + val neutral80: Color, + val neutral70: Color, + val neutral60: Color, + val neutral50: Color, + val neutral40: Color, + val neutral30: Color, + val neutral20: Color, + val neutral10: Color, + val neutral0: Color, + + // The neutral variant tonal range, sometimes called "neutral 2" + val neutralVariant100: Color, + val neutralVariant99: Color, + val neutralVariant95: Color, + val neutralVariant90: Color, + val neutralVariant80: Color, + val neutralVariant70: Color, + val neutralVariant60: Color, + val neutralVariant50: Color, + val neutralVariant40: Color, + val neutralVariant30: Color, + val neutralVariant20: Color, + val neutralVariant10: Color, + val neutralVariant0: Color, + + // The primary tonal range, also known as accent 1 + val primary100: Color, + val primary99: Color, + val primary95: Color, + val primary90: Color, + val primary80: Color, + val primary70: Color, + val primary60: Color, + val primary50: Color, + val primary40: Color, + val primary30: Color, + val primary20: Color, + val primary10: Color, + val primary0: Color, + + // The Secondary tonal range, also know as accent 2 + val secondary100: Color, + val secondary99: Color, + val secondary95: Color, + val secondary90: Color, + val secondary80: Color, + val secondary70: Color, + val secondary60: Color, + val secondary50: Color, + val secondary40: Color, + val secondary30: Color, + val secondary20: Color, + val secondary10: Color, + val secondary0: Color, + + // The tertiary tonal range, also known as accent 3 + val tertiary100: Color, + val tertiary99: Color, + val tertiary95: Color, + val tertiary90: Color, + val tertiary80: Color, + val tertiary70: Color, + val tertiary60: Color, + val tertiary50: Color, + val tertiary40: Color, + val tertiary30: Color, + val tertiary20: Color, + val tertiary10: Color, + val tertiary0: Color, +) + +/** Dynamic colors for wear compose material to support resource overlay. */ +@RequiresApi(Build.VERSION_CODES.S) +internal fun dynamicTonalPalette(context: Context) = + WearPermissionTonalPalette( + // The neutral tonal range from the generated dynamic color palette. + neutral100 = ColorResourceHelper.getColor(context, android.R.color.system_neutral1_0), + neutral99 = ColorResourceHelper.getColor(context, android.R.color.system_neutral1_10), + neutral95 = ColorResourceHelper.getColor(context, android.R.color.system_neutral1_50), + neutral90 = ColorResourceHelper.getColor(context, android.R.color.system_neutral1_100), + neutral80 = ColorResourceHelper.getColor(context, android.R.color.system_neutral1_200), + neutral70 = ColorResourceHelper.getColor(context, android.R.color.system_neutral1_300), + neutral60 = ColorResourceHelper.getColor(context, android.R.color.system_neutral1_400), + neutral50 = ColorResourceHelper.getColor(context, android.R.color.system_neutral1_500), + neutral40 = ColorResourceHelper.getColor(context, android.R.color.system_neutral1_600), + neutral30 = ColorResourceHelper.getColor(context, android.R.color.system_neutral1_700), + neutral20 = ColorResourceHelper.getColor(context, android.R.color.system_neutral1_800), + neutral10 = ColorResourceHelper.getColor(context, android.R.color.system_neutral1_900), + neutral0 = ColorResourceHelper.getColor(context, android.R.color.system_neutral1_1000), + + // The neutral variant tonal range, sometimes called "neutral 2", from the + // generated dynamic color palette. + neutralVariant100 = + ColorResourceHelper.getColor(context, android.R.color.system_neutral2_0), + neutralVariant99 = + ColorResourceHelper.getColor(context, android.R.color.system_neutral2_10), + neutralVariant95 = + ColorResourceHelper.getColor(context, android.R.color.system_neutral2_50), + neutralVariant90 = + ColorResourceHelper.getColor(context, android.R.color.system_neutral2_100), + neutralVariant80 = + ColorResourceHelper.getColor(context, android.R.color.system_neutral2_200), + neutralVariant70 = + ColorResourceHelper.getColor(context, android.R.color.system_neutral2_300), + neutralVariant60 = + ColorResourceHelper.getColor(context, android.R.color.system_neutral2_400), + neutralVariant50 = + ColorResourceHelper.getColor(context, android.R.color.system_neutral2_500), + neutralVariant40 = + ColorResourceHelper.getColor(context, android.R.color.system_neutral2_600), + neutralVariant30 = + ColorResourceHelper.getColor(context, android.R.color.system_neutral2_700), + neutralVariant20 = + ColorResourceHelper.getColor(context, android.R.color.system_neutral2_800), + neutralVariant10 = + ColorResourceHelper.getColor(context, android.R.color.system_neutral2_900), + neutralVariant0 = + ColorResourceHelper.getColor(context, android.R.color.system_neutral2_1000), + + // The primary tonal range from the generated dynamic color palette. + primary100 = ColorResourceHelper.getColor(context, android.R.color.system_accent1_0), + primary99 = ColorResourceHelper.getColor(context, android.R.color.system_accent1_10), + primary95 = ColorResourceHelper.getColor(context, android.R.color.system_accent1_50), + primary90 = ColorResourceHelper.getColor(context, android.R.color.system_accent1_100), + primary80 = ColorResourceHelper.getColor(context, android.R.color.system_accent1_200), + primary70 = ColorResourceHelper.getColor(context, android.R.color.system_accent1_300), + primary60 = ColorResourceHelper.getColor(context, android.R.color.system_accent1_400), + primary50 = ColorResourceHelper.getColor(context, android.R.color.system_accent1_500), + primary40 = ColorResourceHelper.getColor(context, android.R.color.system_accent1_600), + primary30 = ColorResourceHelper.getColor(context, android.R.color.system_accent1_700), + primary20 = ColorResourceHelper.getColor(context, android.R.color.system_accent1_800), + primary10 = ColorResourceHelper.getColor(context, android.R.color.system_accent1_900), + primary0 = ColorResourceHelper.getColor(context, android.R.color.system_accent1_1000), + + // The secondary tonal range from the generated dynamic color palette. + secondary100 = ColorResourceHelper.getColor(context, android.R.color.system_accent2_0), + secondary99 = ColorResourceHelper.getColor(context, android.R.color.system_accent2_10), + secondary95 = ColorResourceHelper.getColor(context, android.R.color.system_accent2_50), + secondary90 = ColorResourceHelper.getColor(context, android.R.color.system_accent2_100), + secondary80 = ColorResourceHelper.getColor(context, android.R.color.system_accent2_200), + secondary70 = ColorResourceHelper.getColor(context, android.R.color.system_accent2_300), + secondary60 = ColorResourceHelper.getColor(context, android.R.color.system_accent2_400), + secondary50 = ColorResourceHelper.getColor(context, android.R.color.system_accent2_500), + secondary40 = ColorResourceHelper.getColor(context, android.R.color.system_accent2_600), + secondary30 = ColorResourceHelper.getColor(context, android.R.color.system_accent2_700), + secondary20 = ColorResourceHelper.getColor(context, android.R.color.system_accent2_800), + secondary10 = ColorResourceHelper.getColor(context, android.R.color.system_accent2_900), + secondary0 = ColorResourceHelper.getColor(context, android.R.color.system_accent2_1000), + + // The tertiary tonal range from the generated dynamic color palette. + tertiary100 = ColorResourceHelper.getColor(context, android.R.color.system_accent3_0), + tertiary99 = ColorResourceHelper.getColor(context, android.R.color.system_accent3_10), + tertiary95 = ColorResourceHelper.getColor(context, android.R.color.system_accent3_50), + tertiary90 = ColorResourceHelper.getColor(context, android.R.color.system_accent3_100), + tertiary80 = ColorResourceHelper.getColor(context, android.R.color.system_accent3_200), + tertiary70 = ColorResourceHelper.getColor(context, android.R.color.system_accent3_300), + tertiary60 = ColorResourceHelper.getColor(context, android.R.color.system_accent3_400), + tertiary50 = ColorResourceHelper.getColor(context, android.R.color.system_accent3_500), + tertiary40 = ColorResourceHelper.getColor(context, android.R.color.system_accent3_600), + tertiary30 = ColorResourceHelper.getColor(context, android.R.color.system_accent3_700), + tertiary20 = ColorResourceHelper.getColor(context, android.R.color.system_accent3_800), + tertiary10 = ColorResourceHelper.getColor(context, android.R.color.system_accent3_900), + tertiary0 = ColorResourceHelper.getColor(context, android.R.color.system_accent3_1000), + ) + +private object ColorResourceHelper { + @DoNotInline + fun getColor(context: Context, @ColorRes id: Int): Color { + return Color(context.resources.getColor(id, context.theme)) + } +} diff --git a/SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigOverlayTest.kt b/SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigOverlayTest.kt index ef9ad4e1e..d16b76846 100644 --- a/SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigOverlayTest.kt +++ b/SafetyCenter/Config/tests/java/com/android/safetycenter/config/ParserConfigOverlayTest.kt @@ -17,6 +17,7 @@ package com.android.safetycenter.config import android.content.Context +import android.os.UserHandle import androidx.test.core.app.ApplicationProvider.getApplicationContext import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.compatibility.common.util.SystemUtil.runShellCommand @@ -124,9 +125,12 @@ class ParserConfigOverlayTest { "/data/local/tmp/com/safetycenter/config/tests/SafetyCenterConfigTestsOverlay.apk" private const val STATE_ENABLED = "STATE_ENABLED" - private fun getStateForOverlay(overlayPackage: String): String? { + private fun getStateForOverlay(uid: Int, overlayPackage: String): String? { + val result: String = - runShellCommand("cmd overlay dump --user 0 state $overlayPackage").lines().first() + runShellCommand("cmd overlay dump --user $uid state $overlayPackage") + .lines() + .first() if (!result.startsWith("STATE_")) { return null } @@ -136,10 +140,11 @@ class ParserConfigOverlayTest { @JvmStatic @BeforeClass fun install() { + val uid = UserHandle.myUserId() runShellCommand("pm install -r --force-sdk --force-queryable $OVERLAY_PATH") - waitForWithTimeout { getStateForOverlay(OVERLAY_PACKAGE) != null } - runShellCommand("cmd overlay enable --user 0 $OVERLAY_PACKAGE") - waitForWithTimeout { getStateForOverlay(OVERLAY_PACKAGE) == STATE_ENABLED } + waitForWithTimeout { getStateForOverlay(uid, OVERLAY_PACKAGE) != null } + runShellCommand("cmd overlay enable --user $uid $OVERLAY_PACKAGE") + waitForWithTimeout { getStateForOverlay(uid, OVERLAY_PACKAGE) == STATE_ENABLED } } @JvmStatic diff --git a/SafetyCenter/Resources/res/raw-v36/safety_center_config.xml b/SafetyCenter/Resources/res/raw-v36/safety_center_config.xml index de033ac44..730edf812 100644 --- a/SafetyCenter/Resources/res/raw-v36/safety_center_config.xml +++ b/SafetyCenter/Resources/res/raw-v36/safety_center_config.xml @@ -30,6 +30,36 @@ initialDisplayState="disabled" notificationsAllowed="true"/> <dynamic-safety-source + id="AndroidFingerprintUnlock" + packageName="com.android.settings" + profile="all_profiles" + title="@com.android.safetycenter.resources:string/fingerprint_unlock_title" + titleForWork="@com.android.safetycenter.resources:string/fingerprint_unlock_title_for_work" + titleForPrivateProfile="@com.android.safetycenter.resources:string/fingerprint_unlock_title_for_private_profile" + searchTerms="@com.android.safetycenter.resources:string/fingerprint_unlock_search_terms" + refreshOnPageOpenAllowed="true" + initialDisplayState="hidden"/> + <dynamic-safety-source + id="AndroidFaceUnlock" + packageName="com.android.settings" + profile="all_profiles" + title="@com.android.safetycenter.resources:string/face_unlock_title" + titleForWork="@com.android.safetycenter.resources:string/face_unlock_title_for_work" + titleForPrivateProfile="@com.android.safetycenter.resources:string/face_unlock_title_for_private_profile" + searchTerms="@com.android.safetycenter.resources:string/face_unlock_search_terms" + refreshOnPageOpenAllowed="true" + initialDisplayState="hidden"/> + <dynamic-safety-source + id="AndroidWearUnlock" + packageName="com.android.settings" + profile="all_profiles" + title="@com.android.safetycenter.resources:string/wear_unlock_title" + titleForWork="@com.android.safetycenter.resources:string/wear_unlock_title_for_work" + titleForPrivateProfile="@com.android.safetycenter.resources:string/wear_unlock_title_for_private_profile" + searchTerms="@com.android.safetycenter.resources:string/wear_unlock_search_terms" + refreshOnPageOpenAllowed="true" + initialDisplayState="hidden"/> + <dynamic-safety-source id="AndroidBiometrics" packageName="com.android.settings" profile="all_profiles" @@ -37,6 +67,7 @@ titleForWork="@com.android.safetycenter.resources:string/biometrics_title_for_work" titleForPrivateProfile="@com.android.safetycenter.resources:string/biometrics_title_for_private_profile" searchTerms="@com.android.safetycenter.resources:string/biometrics_search_terms" + refreshOnPageOpenAllowed="true" initialDisplayState="hidden"/> </safety-sources-group> <safety-sources-group diff --git a/SafetyCenter/Resources/res/values-af-v36/strings.xml b/SafetyCenter/Resources/res/values-af-v36/strings.xml new file mode 100644 index 000000000..304c3ec83 --- /dev/null +++ b/SafetyCenter/Resources/res/values-af-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Gesig"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Gesig vir werk"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Gesigslot, gesig"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Vingerafdruk"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Vingerafdruk vir werk"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Vingerafdruk, vinger, voeg vingerafdruk by"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Horlosie"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Horlosie vir werk"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Horlosie, Horlosieontsluiting"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-am-v36/strings.xml b/SafetyCenter/Resources/res/values-am-v36/strings.xml new file mode 100644 index 000000000..573331193 --- /dev/null +++ b/SafetyCenter/Resources/res/values-am-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"መልክ"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"መልክ ለሥራ"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"በመልክ መክፈት፣ መልክ"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"የጣት አሻራ"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"የጣት አሻራ ለሥራ"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"የጣት አሻራ፣ ጣት፣ የጣት አሻራ ያክሉ"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"የእጅ ሰዓት"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"የእጅ ሰዓት ለሥራ"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"የእጅ ሰዓት፣ የእጅ ሰዓት መክፈቻ"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-ar-v36/strings.xml b/SafetyCenter/Resources/res/values-ar-v36/strings.xml new file mode 100644 index 000000000..0012b1548 --- /dev/null +++ b/SafetyCenter/Resources/res/values-ar-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"الوجه"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"بصمة الوجه للعمل"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"فتح الجهاز ببصمة الوجه، الوجه"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"بصمة الإصبع"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"بصمة الإصبع للعمل"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"بصمة الإصبع، إصبع، إضافة بصمة إصبع"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"الساعة"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"فتح الجهاز من الساعة للعمل"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"الساعة، فتح الجهاز من الساعة"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-as-v36/strings.xml b/SafetyCenter/Resources/res/values-as-v36/strings.xml new file mode 100644 index 000000000..dff88f101 --- /dev/null +++ b/SafetyCenter/Resources/res/values-as-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"মুখাৱয়ব"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"কৰ্মস্থানৰ বাবে মুখাৱয়ব"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"ফে’চ আনলক, মুখাৱয়ব"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"ফিংগাৰপ্ৰিণ্ট"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"কৰ্মস্থানৰ ফিংগাৰপ্ৰিণ্ট"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"ফিংগাৰপ্ৰিণ্ট, আঙুলি, ফিংগাৰপ্ৰিণ্ট যোগ দিয়ক"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"ঘড়ী"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"কৰ্মস্থানৰ বাবে ঘড়ী"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"ঘড়ী, ঘড়ীৰ দ্বাৰা আনলক কৰাৰ সুবিধা"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-az-v36/strings.xml b/SafetyCenter/Resources/res/values-az-v36/strings.xml new file mode 100644 index 000000000..26a77a7d7 --- /dev/null +++ b/SafetyCenter/Resources/res/values-az-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Üz"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"İş üçün üz"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Üz ilə Kiliddən Açma, Üz"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Barmaq izi"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"İş üçün barmaq izi"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Barmaq izi, barmaq, barmaq izi əlavə edin"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Saat"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"İş üçün saat"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Saat, Saatla kilidaçma"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-b+sr+Latn-v36/strings.xml b/SafetyCenter/Resources/res/values-b+sr+Latn-v36/strings.xml new file mode 100644 index 000000000..3613b2c02 --- /dev/null +++ b/SafetyCenter/Resources/res/values-b+sr+Latn-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Lice"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Otključavanje licem za posao"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Otključavanje licem, lice"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Otisak prsta"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Otisak prsta za posao"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Otisak prsta, prst, dodaj otisak prsta"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Sat"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Otključavanje satom za posao"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Sat, otključavanje satom"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-be-v36/strings.xml b/SafetyCenter/Resources/res/values-be-v36/strings.xml new file mode 100644 index 000000000..7fdab64d0 --- /dev/null +++ b/SafetyCenter/Resources/res/values-be-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Твар"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Твар (для выкарыстання)"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Распазнаванне твару, твар"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Адбітак пальца"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Адбітак пальца (для выкарыстання)"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Адбітак пальца, палец, дадаць адбітак пальца"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Гадзіннік"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Гадзіннік (для выкарыстання)"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Гадзіннік, разблакіроўка гадзіннікам"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-bg-v36/strings.xml b/SafetyCenter/Resources/res/values-bg-v36/strings.xml new file mode 100644 index 000000000..d3f211236 --- /dev/null +++ b/SafetyCenter/Resources/res/values-bg-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Лице"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Лице за служебни цели"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Отключване с лице, лице"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Отпечатък"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Отпечатък за служебни цели"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Отпечатък, пръст, добавяне на отпечатък"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Часовник"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Часовник за служебни цели"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Часовник, отключване чрез часовника"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-bn-v36/strings.xml b/SafetyCenter/Resources/res/values-bn-v36/strings.xml new file mode 100644 index 000000000..d06b0617c --- /dev/null +++ b/SafetyCenter/Resources/res/values-bn-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"ফেস"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"ডিভাইসে কাজ করার জন্য ফেস আনলক"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"ফেস আনলক, ফেস"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"ফিঙ্গারপ্রিন্ট"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"ডিভাইসে কাজ করার জন্য ফিঙ্গারপ্রিন্ট আনলক"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"ফিঙ্গারপ্রিন্ট, ফিঙ্গার, ফিঙ্গারপ্রিন্ট যোগ করুন"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"স্মার্টওয়াচ"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"ডিভাইসে কাজ করার জন্য স্মার্টওয়াচ আনলক"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"স্মার্টওয়াচ, স্মার্টওয়াচ আনলক করা"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-bs-v36/strings.xml b/SafetyCenter/Resources/res/values-bs-v36/strings.xml new file mode 100644 index 000000000..21ef83688 --- /dev/null +++ b/SafetyCenter/Resources/res/values-bs-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Lice"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Otključavanje licem za radni profil"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Otključavanje licem, lice"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Otisak prsta"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Otisak prsta za radni profil"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Otisak prsta, prst, dodavanje otiska prsta"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Sat"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Sat za radni profil"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Sat, otključavanje pomoću sata"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-ca-v36/strings.xml b/SafetyCenter/Resources/res/values-ca-v36/strings.xml new file mode 100644 index 000000000..7921f0a93 --- /dev/null +++ b/SafetyCenter/Resources/res/values-ca-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Cara"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Cara de la feina"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Desbloqueig facial, cara"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Empremta digital"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Empremta digital de la feina"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Empremta digital, dit, afegir una empremta digital"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Rellotge"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Rellotge de la feina"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Rellotge, Desbloqueig amb rellotge"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-cs-v36/strings.xml b/SafetyCenter/Resources/res/values-cs-v36/strings.xml new file mode 100644 index 000000000..e14e7f8ee --- /dev/null +++ b/SafetyCenter/Resources/res/values-cs-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Obličej"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Obličej pro práci"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Odemknutí obličejem, obličej"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Otisk prstu"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Otisk prstu pro práci"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Otisk prstu, prst, přidat otisk prstu"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Hodinky"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Hodinky pro práci"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Hodinky, odemknutí hodinkami"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-da-v36/strings.xml b/SafetyCenter/Resources/res/values-da-v36/strings.xml new file mode 100644 index 000000000..be7c51016 --- /dev/null +++ b/SafetyCenter/Resources/res/values-da-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Ansigt"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Ansigt til arbejdsprofil"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Ansigtsoplåsning, ansigt"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Fingeraftryk"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Fingeraftryk til arbejdsprofil"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Fingeraftryk, finger, tilføj fingeraftryk"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Ur"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Ur til arbejdsprofil"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Ur, uroplåsning"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-de-v36/strings.xml b/SafetyCenter/Resources/res/values-de-v36/strings.xml new file mode 100644 index 000000000..693573d89 --- /dev/null +++ b/SafetyCenter/Resources/res/values-de-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Gesicht"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Einstellungen der Entsperrung per Gesichtserkennung für die Arbeit"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Entsperrung per Gesichtserkennung, Gesichtsentsperrung, Gesicht"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Fingerabdruck"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Einstellungen der Entsperrung per Fingerabdruck für die Arbeit"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Fingerabdruck, Finger, Fingerabdruck hinzufügen"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Smartwatch"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Einstellungen von „Mit Smartwatch entsperren“ für die Arbeit"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Smartwatch, Mit Smartwatch entsperren"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-el-v36/strings.xml b/SafetyCenter/Resources/res/values-el-v36/strings.xml new file mode 100644 index 000000000..9a57115d4 --- /dev/null +++ b/SafetyCenter/Resources/res/values-el-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Πρόσωπο"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Πρόσωπο για επαγγελματική χρήση"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Ξεκλείδωμα με το πρόσωπο, Πρόσωπο"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Δακτυλικό αποτύπωμα"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Δακτυλικό αποτύπωμα για επαγγελματική χρήση"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Δακτυλικό αποτύπωμα, Δάχτυλο, Προσθήκη δακτυλικού αποτυπώματος"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Ρολόι"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Ρολόι για επαγγελματική χρήση"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Ρολόι, Ξεκλείδωμα ρολογιού"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-en-rAU-v36/strings.xml b/SafetyCenter/Resources/res/values-en-rAU-v36/strings.xml new file mode 100644 index 000000000..327a15b5d --- /dev/null +++ b/SafetyCenter/Resources/res/values-en-rAU-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Face"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Face for work"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Face Unlock, Face"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Fingerprint"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Fingerprint for work"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Fingerprint, Finger, Add fingerprint"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Watch"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Watch for work"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Watch, Watch Unlock"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-en-rCA-v36/strings.xml b/SafetyCenter/Resources/res/values-en-rCA-v36/strings.xml new file mode 100644 index 000000000..6a70e3a9b --- /dev/null +++ b/SafetyCenter/Resources/res/values-en-rCA-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Face"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Face for work"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Face unlock, Face"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Fingerprint"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Fingerprint for work"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Fingerprint, Finger, Add fingerprint"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Watch"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Watch for work"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Watch, Watch unlock"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-en-rGB-v36/strings.xml b/SafetyCenter/Resources/res/values-en-rGB-v36/strings.xml new file mode 100644 index 000000000..327a15b5d --- /dev/null +++ b/SafetyCenter/Resources/res/values-en-rGB-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Face"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Face for work"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Face Unlock, Face"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Fingerprint"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Fingerprint for work"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Fingerprint, Finger, Add fingerprint"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Watch"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Watch for work"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Watch, Watch Unlock"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-en-rIN-v36/strings.xml b/SafetyCenter/Resources/res/values-en-rIN-v36/strings.xml new file mode 100644 index 000000000..327a15b5d --- /dev/null +++ b/SafetyCenter/Resources/res/values-en-rIN-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Face"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Face for work"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Face Unlock, Face"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Fingerprint"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Fingerprint for work"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Fingerprint, Finger, Add fingerprint"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Watch"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Watch for work"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Watch, Watch Unlock"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-es-rUS-v36/strings.xml b/SafetyCenter/Resources/res/values-es-rUS-v36/strings.xml new file mode 100644 index 000000000..02e0214fd --- /dev/null +++ b/SafetyCenter/Resources/res/values-es-rUS-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Rostro"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Rostro para el trabajo"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Desbloqueo facial, rostro"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Huella dactilar"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Huella para el trabajo"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Huella dactilar, huella, agregar huella dactilar"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Reloj"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Reloj para trabajar"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Reloj, Desbloqueo con reloj"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-es-v36/strings.xml b/SafetyCenter/Resources/res/values-es-v36/strings.xml new file mode 100644 index 000000000..8dd8a23c4 --- /dev/null +++ b/SafetyCenter/Resources/res/values-es-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Cara"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Cara para el trabajo"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Desbloqueo facial, cara"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Huella digital"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Huella para el trabajo"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Huella digital, dedo, añadir huella digital"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Reloj"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Reloj para el trabajo"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Reloj, Desbloqueo con reloj"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-et-v36/strings.xml b/SafetyCenter/Resources/res/values-et-v36/strings.xml new file mode 100644 index 000000000..c5828aebf --- /dev/null +++ b/SafetyCenter/Resources/res/values-et-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Nägu"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Näoga avamine töö jaoks"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Näoga avamine, nägu"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Sõrmejälg"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Sõrmejäljega avamine töö jaoks"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Sõrmejälg, sõrm, sõrmejälje lisamine"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Kell"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Kellaga avamine töö jaoks"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Kell, kellaga avamine"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-eu-v36/strings.xml b/SafetyCenter/Resources/res/values-eu-v36/strings.xml new file mode 100644 index 000000000..6187881b1 --- /dev/null +++ b/SafetyCenter/Resources/res/values-eu-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Aurpegia"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Aurpegia lanerako"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Aurpegi bidez desblokeatzea, aurpegia"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Hatz-marka"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Hatz-marka lanerako"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Hatz-marka, hatza, hatz-marka gehitu"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Ikusi"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Erlojua lanerako"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Erlojua, Erloju bidez desblokeatzea"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-fa-v36/strings.xml b/SafetyCenter/Resources/res/values-fa-v36/strings.xml new file mode 100644 index 000000000..5a2885223 --- /dev/null +++ b/SafetyCenter/Resources/res/values-fa-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"چهره"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"چهره برای نمایه کاری"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"قفلگشایی با چهره، چهره"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"اثر انگشت"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"اثر انگشت برای نمایه کاری"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"اثر انگشت، انگشت، افزودن اثر انگشت"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"ساعت"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"ساعت برای نمایه کاری"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"ساعت، قفلگشایی با ساعت"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-fi-v36/strings.xml b/SafetyCenter/Resources/res/values-fi-v36/strings.xml new file mode 100644 index 000000000..42ab15309 --- /dev/null +++ b/SafetyCenter/Resources/res/values-fi-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Kasvot"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Kasvot (työ)"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Kasvojentunnistusavaus, kasvot"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Sormenjälki"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Sormenjälki (työ)"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Sormenjälki, sormi, lisää sormenjälki"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Kello"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Kello (työ)"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Kello, kelloavaus"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-fr-rCA-v36/strings.xml b/SafetyCenter/Resources/res/values-fr-rCA-v36/strings.xml new file mode 100644 index 000000000..cc3a3dba6 --- /dev/null +++ b/SafetyCenter/Resources/res/values-fr-rCA-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Reconnaissance faciale"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Reconnaissance faciale pour le travail"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Déverrouillage par reconnaissance faciale, reconnaissance faciale"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Empreinte digitale"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Empreinte digitale pour le travail"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Empreinte digitale, doigt, ajouter une empreinte digitale"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Montre"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Montre pour le travail"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Montre, Déverrouillage à l\'aide d\'une montre"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-fr-v36/strings.xml b/SafetyCenter/Resources/res/values-fr-v36/strings.xml new file mode 100644 index 000000000..d5b3b68ec --- /dev/null +++ b/SafetyCenter/Resources/res/values-fr-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Visage"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Déverrouillage par reconnaissance faciale pour le travail"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Déverrouillage par reconnaissance faciale, Visage"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Empreinte digitale"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Déverrouillage par empreinte digitale pour le travail"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Empreinte digitale, Doigt, Ajouter une empreinte digitale"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Montre"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Déverrouillage par une montre pour le travail"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Montre, Déverrouillage par une montre"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-gl-v36/strings.xml b/SafetyCenter/Resources/res/values-gl-v36/strings.xml new file mode 100644 index 000000000..d0eed4528 --- /dev/null +++ b/SafetyCenter/Resources/res/values-gl-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Cara"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Cara para o traballo"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Desbloqueo facial, cara"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Impresión dixital"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Impresión dixital para o traballo"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Impresión dixital, dedo, engadir impresión dixital"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Reloxo"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Reloxo para o traballo"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Reloxo, desbloqueo mediante reloxo"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-gu-v36/strings.xml b/SafetyCenter/Resources/res/values-gu-v36/strings.xml new file mode 100644 index 000000000..709be02b9 --- /dev/null +++ b/SafetyCenter/Resources/res/values-gu-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"ફેસ"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"ડિવાઇસ પર કામ કરવા માટે ફેસ અનલૉક"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"ફેસ અનલૉક, ફેસ"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"ફિંગરપ્રિન્ટ"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"ડિવાઇસ પર કામ કરવા માટે ફિંગરપ્રિન્ટ"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"ફિંગરપ્રિન્ટ, ફિંગર, ફિંગરપ્રિન્ટ ઉમેરો"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"વૉચ"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"ડિવાઇસ પર કામ કરવા માટે વૉચ"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"વૉચ, વૉચ અનલૉક"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-hi-v36/strings.xml b/SafetyCenter/Resources/res/values-hi-v36/strings.xml new file mode 100644 index 000000000..3edfcabaa --- /dev/null +++ b/SafetyCenter/Resources/res/values-hi-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"फ़ेस अनलॉक"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"डिवाइस पर काम करने के लिए फ़ेस अनलॉक"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"फ़ेस अनलॉक, फ़ेस"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"फ़िंगरप्रिंट"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"डिवाइस पर काम करने के लिए फ़िंगरप्रिंट"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"फ़िंगरप्रिंट, फ़िंगर, फ़िंगरप्रिंट जोड़ें"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"स्मार्टवॉच"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"डिवाइस पर काम करने के लिए स्मार्टवॉच"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"स्मार्टवॉच, स्मार्टवॉच से डिवाइस अनलॉक करने की सुविधा"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-hr-v36/strings.xml b/SafetyCenter/Resources/res/values-hr-v36/strings.xml new file mode 100644 index 000000000..8e8c0c288 --- /dev/null +++ b/SafetyCenter/Resources/res/values-hr-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Lice"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Lice za poslovni profil"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Otključavanje licem, lice"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Otisak prsta"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Otisak za poslovni profil"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Otisak prsta, prst, dodavanje otiska prsta"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Sat"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Sat za poslovni profil"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Sat, otključavanje satom"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-hu-v36/strings.xml b/SafetyCenter/Resources/res/values-hu-v36/strings.xml new file mode 100644 index 000000000..065af914c --- /dev/null +++ b/SafetyCenter/Resources/res/values-hu-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Arc"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Arc munkához"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Arcalapú feloldás, Arc"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Ujjlenyomat"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Ujjlenyomat munkához"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Ujjlenyomat, Ujj, Ujjlenyomat hozzáadása"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Óra"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Óra munkához"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Óra, Feloldás órával"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-hy-v36/strings.xml b/SafetyCenter/Resources/res/values-hy-v36/strings.xml new file mode 100644 index 000000000..97da4e698 --- /dev/null +++ b/SafetyCenter/Resources/res/values-hy-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Դեմք"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Դեմք (աշխատանք)"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Դեմքով ապակողպում, դեմք"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Մատնահետք"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Մատնահետք (աշխատանք)"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Մատնահետք, մատ, ավելացնել մատնահետք"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Ժամացույց"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Ժամացույց (աշխատանք)"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Ժամացույց, ժամացույցով ապակողպում"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-in-v36/strings.xml b/SafetyCenter/Resources/res/values-in-v36/strings.xml new file mode 100644 index 000000000..ed52e1557 --- /dev/null +++ b/SafetyCenter/Resources/res/values-in-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Wajah"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Wajah untuk kerja"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Buka dengan wajah, Wajah"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Sidik jari"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Sidik jari untuk kerja"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Sidik jari, Jari, Tambahkan sidik jari"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Smartwatch"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Smartwatch untuk kerja"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Smartwatch, Buka dengan smartwatch"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-is-v36/strings.xml b/SafetyCenter/Resources/res/values-is-v36/strings.xml new file mode 100644 index 000000000..c1284b2a1 --- /dev/null +++ b/SafetyCenter/Resources/res/values-is-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Andlit"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Andlit fyrir vinnu"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Andlitskenni, andlit"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Fingrafar"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Fingrafar fyrir vinnu"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Fingrafar, fingur, bæta fingrafari við"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Úr"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Úr fyrir vinnu"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Úr, opnun með úri"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-it-v36/strings.xml b/SafetyCenter/Resources/res/values-it-v36/strings.xml new file mode 100644 index 000000000..267daef8f --- /dev/null +++ b/SafetyCenter/Resources/res/values-it-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Volto"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Volto per lavoro"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Sblocco con il Volto, Volto"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Impronta"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Impronta per lavoro"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Impronta, Dito, Aggiungi impronta"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Orologio"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Orologio per lavoro"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Orologio, Sblocco dall\'orologio"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-iw-v36/strings.xml b/SafetyCenter/Resources/res/values-iw-v36/strings.xml new file mode 100644 index 000000000..e17879fc3 --- /dev/null +++ b/SafetyCenter/Resources/res/values-iw-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"זיהוי הפנים"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"זיהוי הפנים לפרופיל העבודה"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"פתיחה בזיהוי פנים, פנים"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"זיהוי טביעת אצבע"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"זיהוי טביעת אצבע לפרופיל עבודה"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"טביעת אצבע, אצבע, הוספת טביעת אצבע"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"ביטול נעילה עם השעון"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"ביטול נעילה עם השעון לפרופיל עבודה"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"שעון, ביטול נעילה עם השעון"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-iw/strings.xml b/SafetyCenter/Resources/res/values-iw/strings.xml index bde0d294b..a6c39074b 100644 --- a/SafetyCenter/Resources/res/values-iw/strings.xml +++ b/SafetyCenter/Resources/res/values-iw/strings.xml @@ -18,7 +18,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="safetyCenterResourcesAppLabel" msgid="4043334186295695930">"משאבים למרכז הבטיחות"</string> - <string name="lock_screen_sources_title" msgid="3317906280484627707">"נעילת מכשיר"</string> + <string name="lock_screen_sources_title" msgid="3317906280484627707">"נעילת המכשיר"</string> <string name="lock_screen_sources_summary" msgid="7220439741282516496"></string> <string name="lock_screen_title" msgid="4069104894527169877">"נעילת מסך"</string> <string name="lock_screen_summary_disabled" msgid="354071230916616692">"אין עדיין פרטים"</string> diff --git a/SafetyCenter/Resources/res/values-ja-v36/strings.xml b/SafetyCenter/Resources/res/values-ja-v36/strings.xml new file mode 100644 index 000000000..7fc642fe8 --- /dev/null +++ b/SafetyCenter/Resources/res/values-ja-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"顔認証"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"顔認証（仕事用）"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"顔認証, 顔"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"指紋認証"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"指紋認証（仕事用）"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"指紋, 指, 指紋 追加"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"ウォッチ認証"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"ウォッチ認証（仕事用）"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"ウォッチ, ウォッチ認証"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-ka-v36/strings.xml b/SafetyCenter/Resources/res/values-ka-v36/strings.xml new file mode 100644 index 000000000..723402437 --- /dev/null +++ b/SafetyCenter/Resources/res/values-ka-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"სახე"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"სახე სამუშაოსთვის"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"სახით განბლოკვა, სახე"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"თითის ანაბეჭდი"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"თითის ანაბეჭდი სამუშაოსთვის"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"თითის ანაბეჭდი, თითი, თითის ანაბეჭდის დამატება"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"საათი"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"საათი სამუშაოსთვის"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"საათი, საათის განბლოკვა"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-kk-v36/strings.xml b/SafetyCenter/Resources/res/values-kk-v36/strings.xml new file mode 100644 index 000000000..c61a05257 --- /dev/null +++ b/SafetyCenter/Resources/res/values-kk-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Бет"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Жұмысқа арналған бет тану функциясы"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Бет тану, бет"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Саусақ ізі"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Жұмысқа арналған саусақ ізі"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Саусақ ізі, саусақ, саусақ ізін қосу"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Сағат"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Жұмысқа арналған сағат"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Сағат, құлыпты сағат арқылы ашу"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-km-v36/strings.xml b/SafetyCenter/Resources/res/values-km-v36/strings.xml new file mode 100644 index 000000000..cefd48bec --- /dev/null +++ b/SafetyCenter/Resources/res/values-km-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"មុខ"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"មុខសម្រាប់ការងារ"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"ការដោះសោដោយស្កេនមុខ, មុខ"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"ស្នាមម្រាមដៃ"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"ស្នាមម្រាមដៃសម្រាប់ការងារ"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"ស្នាមម្រាមដៃ, ម្រាមដៃ, បញ្ចូលស្នាមម្រាមដៃ"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"នាឡិកា"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"នាឡិកាសម្រាប់ការងារ"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"នាឡិកា, ការដោះសោដោយប្រើនាឡិកា"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-kn-v36/strings.xml b/SafetyCenter/Resources/res/values-kn-v36/strings.xml new file mode 100644 index 000000000..222c4f1ab --- /dev/null +++ b/SafetyCenter/Resources/res/values-kn-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"ಫೇಸ್"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"ಕೆಲಸದ ಸ್ಥಳದ ಫೇಸ್"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"ಫೇಸ್ ಅನ್ಲಾಕ್, ಫೇಸ್"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"ಫಿಂಗರ್ ಪ್ರಿಂಟ್"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"ಕೆಲಸಕ್ಕಾಗಿ ಫಿಂಗರ್ ಪ್ರಿಂಟ್"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"ಫಿಂಗರ್ ಪ್ರಿಂಟ್, ಫಿಂಗರ್, ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಸೇರಿಸಿ"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"ವಾಚ್"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"ಕೆಲಸಕ್ಕಾಗಿ ಒಂದು ವಾಚ್"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"ವಾಚ್, ವಾಚ್ ಅನ್ಲಾಕ್"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-ko-v36/strings.xml b/SafetyCenter/Resources/res/values-ko-v36/strings.xml new file mode 100644 index 000000000..619c47d66 --- /dev/null +++ b/SafetyCenter/Resources/res/values-ko-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"얼굴"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"직장용 얼굴"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"얼굴 인식 잠금 해제, 얼굴"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"지문"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"직장용 지문"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"지문, 손가락, 지문 추가"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"시계"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"직장용 스마트시계"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"시계, 스마트시계 잠금 해제"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-ky-v36/strings.xml b/SafetyCenter/Resources/res/values-ky-v36/strings.xml new file mode 100644 index 000000000..3e2823a05 --- /dev/null +++ b/SafetyCenter/Resources/res/values-ky-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Жүз"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Жумуш колдонмолорун жүзүнөн таанып ачуу"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Жүзүнөн таанып ачуу, Жүз"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Манжа изи"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Жумуш колдонмолору үчүн манжа изи"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Манжа изи, Манжа, Манжа изин кошуу"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Саат"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Жумуш колдонмолорун саат менен ачуу"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Саат, Кулпуну саат менен ачуу"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-lo-v36/strings.xml b/SafetyCenter/Resources/res/values-lo-v36/strings.xml new file mode 100644 index 000000000..e96e6c1a9 --- /dev/null +++ b/SafetyCenter/Resources/res/values-lo-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"ໃບໜ້າ"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"ໃບໜ້າສຳລັບວຽກ"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"ປົດລັອກດ້ວຍໜ້າ, ໃບໜ້າ"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"ລາຍນີ້ວມື"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"ລາຍນິ້ວມື້ສຳລັບວຽກ"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"ລາຍນິ້ວມື, ນິ້ວມື, ເພີ່ມລາຍນິ້ວມື"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"ໂມງ"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"ໂມງສຳລັບວຽກ"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"ໂມງ, ປົດລັອກດ້ວຍໂມງ"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-lt-v36/strings.xml b/SafetyCenter/Resources/res/values-lt-v36/strings.xml new file mode 100644 index 000000000..5376e7754 --- /dev/null +++ b/SafetyCenter/Resources/res/values-lt-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Veidas"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Atrakinimas pagal veidą, skirtas darbo profiliui"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Atrakinimas pagal veidą, veidas"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Piršto atspaudas"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Piršto atspaudas, skirtas darbo profiliui"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Piršto atspaudas, pirštas, pridėti piršto atspaudą"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Laikrodis"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Laikrodis, skirtas darbo profiliui"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Laikrodis, laikrodžio atrakinimas"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-lv-v36/strings.xml b/SafetyCenter/Resources/res/values-lv-v36/strings.xml new file mode 100644 index 000000000..57861575e --- /dev/null +++ b/SafetyCenter/Resources/res/values-lv-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Seja"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Seja darba profilam"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Autorizācija pēc sejas, seja"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Pirksta nospiedums"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Pirksta nospiedums darba profilam"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Pirksta nospiedums, pirksts, pievienot pirksta nospiedumu"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Pulkstenis"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Pulkstenis darba profilam"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Pulkstenis, atbloķēšana ar pulksteni"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-mk-v35/strings.xml b/SafetyCenter/Resources/res/values-mk-v35/strings.xml index c4fc4bd17..1201ae74f 100644 --- a/SafetyCenter/Resources/res/values-mk-v35/strings.xml +++ b/SafetyCenter/Resources/res/values-mk-v35/strings.xml @@ -21,7 +21,7 @@ <string name="cellular_network_security_summary" msgid="7319307247487475572">"Тип мрежа, шифрирање, контроли за известувања"</string> <string name="biometrics_title_for_private_profile" msgid="542819107383037820"></string> <string name="privacy_title" msgid="7047524783080782769">"Приватност"</string> - <string name="privacy_sources_title" msgid="309304028326660956">"Контроли на приватноста"</string> + <string name="privacy_sources_title" msgid="309304028326660956">"Контроли за приватност"</string> <string name="privacy_sources_summary" msgid="2165270848857537278">"Дозволи, контроли"</string> <string name="privacy_additional_title" msgid="4239060639056083649"></string> <string name="private_space_title" msgid="6158245041481535879">"Приватен простор"</string> diff --git a/SafetyCenter/Resources/res/values-mk-v36/strings.xml b/SafetyCenter/Resources/res/values-mk-v36/strings.xml new file mode 100644 index 000000000..7f2986393 --- /dev/null +++ b/SafetyCenter/Resources/res/values-mk-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Лик"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Лик за работен профил"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"„Отклучување со лик“, лик"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Отпечаток"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Отпечаток за работен профил"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Отпечаток, прст, додај отпечаток"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Часовник"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Часовник за работен профил"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Часовник, „Отклучување со часовник“"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-mk/strings.xml b/SafetyCenter/Resources/res/values-mk/strings.xml index 2b2414d0d..379a5234b 100644 --- a/SafetyCenter/Resources/res/values-mk/strings.xml +++ b/SafetyCenter/Resources/res/values-mk/strings.xml @@ -33,9 +33,9 @@ <string name="permission_manager_title" msgid="5277347862821255015">"Управувач со дозволи"</string> <string name="permission_manager_summary" msgid="8099852107340970790">"Го контролира пристапот на апликациите до вашите податоци"</string> <string name="permission_manager_search_terms" msgid="2895147613099694722">"Дозволи, Управувач со дозволи"</string> - <string name="privacy_controls_title" msgid="5322875777945432395">"Контроли за приватноста"</string> + <string name="privacy_controls_title" msgid="5322875777945432395">"Контроли за приватност"</string> <string name="privacy_controls_summary" msgid="2402066941190435424">"Го контролира пристапот на уредот до микрофонот, камерата и друго"</string> - <string name="privacy_controls_search_terms" msgid="3774472175934304165">"Приватност, Контроли на приватноста"</string> + <string name="privacy_controls_search_terms" msgid="3774472175934304165">"Приватност, Контроли за приватност"</string> <string name="advanced_title" msgid="8745436380690561172">"Повеќе поставки"</string> <string name="advanced_security_title" msgid="1126833338772188155">"Повеќе поставки за безбедност"</string> <string name="advanced_security_summary" msgid="6172253327022425123">"Шифрирање, акредитиви и друго"</string> diff --git a/SafetyCenter/Resources/res/values-ml-v36/strings.xml b/SafetyCenter/Resources/res/values-ml-v36/strings.xml new file mode 100644 index 000000000..902c67639 --- /dev/null +++ b/SafetyCenter/Resources/res/values-ml-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"ഫെയ്സ്"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"ഔദ്യോഗിക പ്രൊഫെെലിനുള്ള ഫെയ്സ്"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"ഫെയ്സ് അൺലോക്ക്, ഫെയ്സ്"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"ഫിംഗർപ്രിന്റ്"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"ഔദ്യോഗിക പ്രൊഫൈലിനുള്ള ഫിംഗർപ്രിന്റ്"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"ഫിംഗർപ്രിൻറ്, ഫിംഗർ, ഫിംഗർപ്രിന്റ് ചേർക്കുക"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"വാച്ച്"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"ഔദ്യോഗിക പ്രൊഫൈലിനുള്ള വാച്ച്"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"വാച്ച്, വാച്ച് അൺലോക്ക്"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-mn-v36/strings.xml b/SafetyCenter/Resources/res/values-mn-v36/strings.xml new file mode 100644 index 000000000..868fe1e63 --- /dev/null +++ b/SafetyCenter/Resources/res/values-mn-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Царай"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Ажлын зориулалтаар ашиглах царай"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Царайгаар түгжээ тайлах, царай"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Хурууны хээ"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Ажлын зориулалтаар ашиглах хурууны хээ"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Хурууны хээ, хуруу, хурууны хээ нэмэх"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Цаг"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Ажлын зориулалтаар ашиглах цаг"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Цаг, Утасны түгжээг цагаараа тайлах"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-mr-v36/strings.xml b/SafetyCenter/Resources/res/values-mr-v36/strings.xml new file mode 100644 index 000000000..6eef98db9 --- /dev/null +++ b/SafetyCenter/Resources/res/values-mr-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"फेस"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"कार्य प्रोफाइलसाठी फेस अनलॉक"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"फेस अनलॉक, फेस"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"फिंगरप्रिंट"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"कार्य प्रोफाइलसाठी फिंगरप्रिंट"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"फिंगरप्रिंट, बोट, फिंगरप्रिंट जोडा"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"वॉच"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"कार्य प्रोफाइलसाठी वॉच"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"वॉच, वॉच अनलॉक"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-ms-v36/strings.xml b/SafetyCenter/Resources/res/values-ms-v36/strings.xml new file mode 100644 index 000000000..e867d5629 --- /dev/null +++ b/SafetyCenter/Resources/res/values-ms-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Wajah"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Wajah untuk profil kerja"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Buka kunci wajah, Wajah"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Cap jari"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Cap jari untuk kerja"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Cap jari, Jari, Tambahkan cap jari"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Jam tangan"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Jam tangan untuk bekerja"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Jam tangan, Buka kunci jam tangan"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-my-v36/strings.xml b/SafetyCenter/Resources/res/values-my-v36/strings.xml new file mode 100644 index 000000000..60475a70b --- /dev/null +++ b/SafetyCenter/Resources/res/values-my-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"မျက်နှာ"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"အလုပ်အတွက် မျက်နှာ"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း၊ မျက်နှာ"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"လက်ဗွေ"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"အလုပ်အတွက် လက်ဗွေ"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"လက်ဗွေ၊ လက်ချောင်း၊ လက်ဗွေထည့်ရန်"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"လက်ပတ်နာရီ"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"အလုပ်အတွက် လက်ပတ်နာရီ"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"လက်ပတ်နာရီ၊ နာရီဖြင့်ဖွင့်ခြင်း"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-nb-v36/strings.xml b/SafetyCenter/Resources/res/values-nb-v36/strings.xml new file mode 100644 index 000000000..7ad44d31f --- /dev/null +++ b/SafetyCenter/Resources/res/values-nb-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Ansikt"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Ansikt for jobb"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Ansiktslås, ansikt"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Fingeravtrykk"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Fingeravtrykk for jobb"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Fingeravtrykk, finger, legg til fingeravtrykk"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Klokke"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Klokke for jobb"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Klokke, klokkelås"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-ne-v36/strings.xml b/SafetyCenter/Resources/res/values-ne-v36/strings.xml new file mode 100644 index 000000000..5b7e16192 --- /dev/null +++ b/SafetyCenter/Resources/res/values-ne-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"फेस अनलक"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"कामसम्बन्धी प्रयोजनका लागि फेस अनलक"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"फेस अनलक, फेस"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"फिंगरप्रिन्ट"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"कामसम्बन्धी प्रयोजनका लागि फिंगरप्रिन्ट"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"फिंगरप्रिन्ट, फिंगर, फिंगरप्रिन्ट हाल्नुहोस्"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"स्मार्ट वाच"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"कामसम्बन्धी प्रयोजनका लागि स्मार्ट वाच"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"स्मार्ट वाच, स्मार्ट वाच अनलक गर्ने सुविधा"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-nl-v36/strings.xml b/SafetyCenter/Resources/res/values-nl-v36/strings.xml new file mode 100644 index 000000000..69db97338 --- /dev/null +++ b/SafetyCenter/Resources/res/values-nl-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Gezicht"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Gezicht voor werk"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Ontgrendelen via gezichtsherkenning, Gezicht"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Vingerafdruk"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Vingerafdruk voor werk"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Vingerafdruk, Vinger, Vingerafdruk toevoegen"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Smartwatch"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Smartwatch voor werk"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Smartwatch, Ontgrendelen via smartwatch"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-or-v36/strings.xml b/SafetyCenter/Resources/res/values-or-v36/strings.xml new file mode 100644 index 000000000..6ca5d6efa --- /dev/null +++ b/SafetyCenter/Resources/res/values-or-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"ଫେସ"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"ୱାର୍କ ପାଇଁ ଫେସ"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"ଫେସ ଅନଲକ, ଫେସ"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"ଟିପଚିହ୍ନ"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"ୱାର୍କ ପାଇଁ ଟିପଚିହ୍ନ"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"ଟିପଚିହ୍ନ, ଆଙ୍ଗୁଠି, ଟିପଚିହ୍ନ ଯୋଗ କରନ୍ତୁ"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"ୱାଚ"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"ୱାର୍କ ପାଇଁ ୱାଚ"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"ୱାଚ, ୱାଚ ଅନଲକ"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-pa-v36/strings.xml b/SafetyCenter/Resources/res/values-pa-v36/strings.xml new file mode 100644 index 000000000..2dc9bb8c9 --- /dev/null +++ b/SafetyCenter/Resources/res/values-pa-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"ਫ਼ੇਸ ਅਣਲਾਕ"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"ਕੰਮ ਲਈ ਫ਼ੇਸ"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"ਫ਼ੇਸ ਅਣਲਾਕ, ਫ਼ੇਸ"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"ਕੰਮ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"ਫਿੰਗਰਪ੍ਰਿੰਟ, ਫਿੰਗਰ, ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰੋ"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"ਵਾਚ"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"ਕੰਮ ਲਈ ਵਾਚ"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"ਵਾਚ, ਵਾਚ ਅਣਲਾਕ"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-pl-v36/strings.xml b/SafetyCenter/Resources/res/values-pl-v36/strings.xml new file mode 100644 index 000000000..8705e008c --- /dev/null +++ b/SafetyCenter/Resources/res/values-pl-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Twarz"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Twarz – profil służbowy"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Rozpoznawanie twarzy, twarz"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Odcisk palca"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Odcisk palca – profil służbowy"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Odcisk palca, palec, dodaj odcisk palca"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Zegarek"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Zegarek – profil służbowy"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Zegarek, odblokowywanie za pomocą zegarka"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-pt-rBR-v36/strings.xml b/SafetyCenter/Resources/res/values-pt-rBR-v36/strings.xml new file mode 100644 index 000000000..144078c11 --- /dev/null +++ b/SafetyCenter/Resources/res/values-pt-rBR-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Rosto"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Reconhecimento facial para o trabalho"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Desbloqueio facial, Rosto"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Impressão digital"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Impressão digital para o trabalho"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Impressão digital, Dedo, Adicionar impressão digital"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Relógio"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Relógio para o trabalho"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Relógio, Desbloqueio do relógio"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-pt-rPT-v36/strings.xml b/SafetyCenter/Resources/res/values-pt-rPT-v36/strings.xml new file mode 100644 index 000000000..10a613c26 --- /dev/null +++ b/SafetyCenter/Resources/res/values-pt-rPT-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Rosto"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Rosto para trabalho"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Desbloqueio facial, rosto"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Impressão digital"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Impressão digital para trabalho"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Impressão digital, dedo, adicionar impressão digital"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Relógio"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Relógio para trabalho"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Relógio, Desbloqueio com o relógio"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-pt-v36/strings.xml b/SafetyCenter/Resources/res/values-pt-v36/strings.xml new file mode 100644 index 000000000..144078c11 --- /dev/null +++ b/SafetyCenter/Resources/res/values-pt-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Rosto"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Reconhecimento facial para o trabalho"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Desbloqueio facial, Rosto"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Impressão digital"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Impressão digital para o trabalho"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Impressão digital, Dedo, Adicionar impressão digital"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Relógio"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Relógio para o trabalho"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Relógio, Desbloqueio do relógio"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-ro-v36/strings.xml b/SafetyCenter/Resources/res/values-ro-v36/strings.xml new file mode 100644 index 000000000..edc1a5ad9 --- /dev/null +++ b/SafetyCenter/Resources/res/values-ro-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Chip"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Chip pentru serviciu"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Deblocare facială, Chip"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Amprentă"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Amprentă pentru serviciu"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Amprentă, Deget, Adaugă o amprentă"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Ceas"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Ceas pentru serviciu"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Ceas, Deblocare cu ceasul"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-ru-v36/strings.xml b/SafetyCenter/Resources/res/values-ru-v36/strings.xml new file mode 100644 index 000000000..cdaea134f --- /dev/null +++ b/SafetyCenter/Resources/res/values-ru-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Лицо"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Лицо для работы"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Фейсконтроль, лицо"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Отпечаток пальца"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Отпечаток для работы"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Отпечаток пальца, палец, добавить отпечаток пальца"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Часы"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Часы для работы"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Часы, разблокировка часов"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-si-v36/strings.xml b/SafetyCenter/Resources/res/values-si-v36/strings.xml new file mode 100644 index 000000000..4bf8b1c89 --- /dev/null +++ b/SafetyCenter/Resources/res/values-si-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"මුහුණ"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"රැකියාව සඳහා මුහුණ"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"මුහුණ අගුළු හැරීම, මුහුණ"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"ඇඟිලි සලකුණ"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"කාර්යාලය සඳහා ඇඟිලි සලකුණ"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"ඇඟිලි සලකුණ, ඇඟිල්ල, ඇඟිලි සලකුණ එක් කරන්න"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"ඔරලෝසුව"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"රැකියාව සඳහා ඔරලෝසුව"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"ඔරලෝසුව, ඔරලෝසුව අගුළු ඇරීම"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-sk-v36/strings.xml b/SafetyCenter/Resources/res/values-sk-v36/strings.xml new file mode 100644 index 000000000..ffbc3391e --- /dev/null +++ b/SafetyCenter/Resources/res/values-sk-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Tvár"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Tvár pre prácu"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Odomknutie tvárou, tvár"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Odtlačok prsta"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Odtlačok prsta pre prácu"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Odtlačok prsta, prst, pridať odtlačok prsta"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Hodinky"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Hodinky pre prácu"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Hodinky, odomknutie hodinkami"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-sk/strings.xml b/SafetyCenter/Resources/res/values-sk/strings.xml index 6357114cd..042d2dd75 100644 --- a/SafetyCenter/Resources/res/values-sk/strings.xml +++ b/SafetyCenter/Resources/res/values-sk/strings.xml @@ -30,7 +30,7 @@ <string name="permission_usage_title" msgid="3633779688945350407">"Panel ochrany súkromia"</string> <string name="permission_usage_summary" msgid="5323079206029964468">"Zobraziť, ktoré aplikácie nedávno použili povolenia"</string> <string name="permission_usage_search_terms" msgid="3852343592870257104">"Ochrana súkromia, panel ochrany súkromia"</string> - <string name="permission_manager_title" msgid="5277347862821255015">"Správca povolení"</string> + <string name="permission_manager_title" msgid="5277347862821255015">"Správa povolení"</string> <string name="permission_manager_summary" msgid="8099852107340970790">"Ovládanie prístupu aplikácií k vašim údajom"</string> <string name="permission_manager_search_terms" msgid="2895147613099694722">"Povolenia, správca povolení"</string> <string name="privacy_controls_title" msgid="5322875777945432395">"Nastavenia ochrany súkromia"</string> diff --git a/SafetyCenter/Resources/res/values-sl-v36/strings.xml b/SafetyCenter/Resources/res/values-sl-v36/strings.xml new file mode 100644 index 000000000..9f0a32d41 --- /dev/null +++ b/SafetyCenter/Resources/res/values-sl-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Obraz"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Obraz za službo"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Odklepanje z obrazom, obraz"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Prstni odtis"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Prstni odtis za službo"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Prstni odtis, prst, dodajanje prstnega odtisa"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Ura"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Ura za službo"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Ura, odklepanje z uro"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-sq-v36/strings.xml b/SafetyCenter/Resources/res/values-sq-v36/strings.xml new file mode 100644 index 000000000..ee8d02923 --- /dev/null +++ b/SafetyCenter/Resources/res/values-sq-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Fytyra"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Fytyra për punën"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Shkyçja me fytyrë, fytyra"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Gjurma e gishtit"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Gjurma e gishtit për punën"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Gjurma e gishtit, gishti, shto gjurmë gishti"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Ora"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Ora për punën"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Ora, shkyçja me orë"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-sr-v36/strings.xml b/SafetyCenter/Resources/res/values-sr-v36/strings.xml new file mode 100644 index 000000000..9a73a0707 --- /dev/null +++ b/SafetyCenter/Resources/res/values-sr-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Лице"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Откључавање лицем за посао"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Откључавање лицем, лице"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Отисак прста"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Отисак прста за посао"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Отисак прста, прст, додај отисак прста"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Сат"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Откључавање сатом за посао"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Сат, откључавање сатом"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-sv-v36/strings.xml b/SafetyCenter/Resources/res/values-sv-v36/strings.xml new file mode 100644 index 000000000..c79423a8f --- /dev/null +++ b/SafetyCenter/Resources/res/values-sv-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Ansikte"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Ansikte för jobbet"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Ansiktslås, ansikte"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Fingeravtryck"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Fingeravtryck för jobbet"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Fingeravtryck, finger, lägg till fingeravtryck"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Klocka"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Klocka för jobbet"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Klocka, upplåsning med klockan"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-sw-v36/strings.xml b/SafetyCenter/Resources/res/values-sw-v36/strings.xml new file mode 100644 index 000000000..61d141ab9 --- /dev/null +++ b/SafetyCenter/Resources/res/values-sw-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Uso"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Uso kwenye wasifu wa kazini"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Kufungua kwa uso, Uso"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Alama ya kidole"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Alama ya kidole kwenye wasifu wa kazini"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Alama ya kidole, Kidole, Weka alama ya kidole"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Saa"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Saa kwenye wasifu wa kazini"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Saa, Kufungua kupitia saa"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-ta-v36/strings.xml b/SafetyCenter/Resources/res/values-ta-v36/strings.xml new file mode 100644 index 000000000..2d81dcc9f --- /dev/null +++ b/SafetyCenter/Resources/res/values-ta-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"முகம்"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"பணிக்கான முகம்"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"முகம் காட்டித் திறத்தல், முகம்"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"கைரேகை"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"பணிக்கான கைரேகை"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"கைரேகை, விரல், கைரேகையைச் சேர்த்தல்"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"வாட்ச்"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"பணிக்கான வாட்ச்"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"வாட்ச், வாட்ச் அன்லாக்"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-te-v36/strings.xml b/SafetyCenter/Resources/res/values-te-v36/strings.xml new file mode 100644 index 000000000..ff5785cff --- /dev/null +++ b/SafetyCenter/Resources/res/values-te-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"ముఖం"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"ఆఫీస్ కోసం ఫేస్ అన్లాక్"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"ఫేస్ అన్లాక్, ముఖం"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"వేలిముద్ర"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"ఆఫీస్ కోసం వేలిముద్ర అన్లాక్"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"వేలిముద్ర, వేలు, వేలిముద్రను జోడించండి"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"వాచ్"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"ఆఫీస్ కోసం వాచ్ అన్లాక్"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"వాచ్, వాచ్ అన్లాక్"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-th-v36/strings.xml b/SafetyCenter/Resources/res/values-th-v36/strings.xml new file mode 100644 index 000000000..ca675dee0 --- /dev/null +++ b/SafetyCenter/Resources/res/values-th-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"ใบหน้า"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"ใช้ใบหน้าสำหรับการทำงาน"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"การปลดล็อกด้วยใบหน้า, ใบหน้า"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"ลายนิ้วมือ"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"ใช้ลายนิ้วมือสำหรับการทำงาน"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"ลายนิ้วมือ, นิ้ว, เพิ่มลายนิ้วมือ"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"นาฬิกา"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"ใช้นาฬิกาเพื่อการทำงาน"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"นาฬิกา, การปลดล็อกด้วยนาฬิกา"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-tl-v36/strings.xml b/SafetyCenter/Resources/res/values-tl-v36/strings.xml new file mode 100644 index 000000000..ab3854f74 --- /dev/null +++ b/SafetyCenter/Resources/res/values-tl-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Mukha"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Mukha sa trabaho"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Pag-unlock gamit ang mukha, Mukha"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Fingerprint"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Fingerprint sa trabaho"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Fingerprint, Daliri, Magdagdag ng fingerprint"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Relo"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Relo sa trabaho"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Relo, Pag-unlock gamit ang relo"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-tr-v36/strings.xml b/SafetyCenter/Resources/res/values-tr-v36/strings.xml new file mode 100644 index 000000000..9bc9110c4 --- /dev/null +++ b/SafetyCenter/Resources/res/values-tr-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Yüz"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Çalışma için yüz"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Yüz Tanıma Kilidi, Yüz"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Parmak izi"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Çalışma için parmak izi"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Parmak izi, Parmak, Parmak izi ekle"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Kol saati"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Çalışma için kol saati"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Kol saati, Saat ile Kilit Açma"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-uk-v36/strings.xml b/SafetyCenter/Resources/res/values-uk-v36/strings.xml new file mode 100644 index 000000000..22cc885e6 --- /dev/null +++ b/SafetyCenter/Resources/res/values-uk-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Обличчя"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Фейс-контроль для роботи"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Фейс-контроль, обличчя"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Відбиток пальця"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Відбиток пальця для роботи"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Відбиток пальця, палець, додати відбиток пальця"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Годинник"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Годинник для роботи"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Годинник, розблокування годинником"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-ur-v36/strings.xml b/SafetyCenter/Resources/res/values-ur-v36/strings.xml new file mode 100644 index 000000000..0d1b90f12 --- /dev/null +++ b/SafetyCenter/Resources/res/values-ur-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"چہرہ"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"کام کے لیے چہرہ"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"فیس اَنلاک، چہرہ"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"فنگر پرنٹ"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"کام کیلئے فنگر پرنٹ"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"فنگر پرنٹ، انگلی، فنگر پرنٹ شامل کریں"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"گھڑی"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"کام کے لیے گھڑی"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"گھڑی، واچ اَن لاک"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-uz-v36/strings.xml b/SafetyCenter/Resources/res/values-uz-v36/strings.xml new file mode 100644 index 000000000..06aea14bb --- /dev/null +++ b/SafetyCenter/Resources/res/values-uz-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Yuz"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Ish uchun yuz"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Yuz bilan ochish, yuz"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Barmoq izi"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Ish uchun barmoq izi"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Barmoq izi, barmoq, barmoq izi kiritish"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Soat"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Ish uchun soat"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Soat, soat bilan ochish"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-v36/config.xml b/SafetyCenter/Resources/res/values-v36/config.xml new file mode 100644 index 000000000..6fa28a340 --- /dev/null +++ b/SafetyCenter/Resources/res/values-v36/config.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Comma separated list of safety source IDs to show in the same task as the safety center --> + <string name="config_same_task_safety_source_ids" translatable="false">AndroidAccessibility,AndroidBackgroundLocation,AndroidBiometrics,AndroidFaceUnlock,AndroidFingerprintUnlock,AndroidHealthConnect,AndroidLockScreen,AndroidPrivateSpace,AndroidMoreSettings,AndroidNotificationListener,AndroidPermissionAutoRevoke,AndroidPermissionManager,AndroidPermissionUsage,AndroidPrivacyAppDataSharingUpdates,AndroidPrivacyControls,AndroidWearUnlock,AndroidWorkPolicyInfo</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-v36/strings.xml b/SafetyCenter/Resources/res/values-v36/strings.xml new file mode 100644 index 000000000..f452e045a --- /dev/null +++ b/SafetyCenter/Resources/res/values-v36/strings.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" description="The default title of the setting for managing face unlock options on the device">Face</string> + <string name="face_unlock_title_for_work" description="The default title of the setting for managing face unlock options for work on the device">Face for work</string> + <string name="face_unlock_title_for_private_profile" description="The default title of the setting for managing face unlock options for private profile on the device"><!-- Empty placeholder--></string> + <string name="face_unlock_search_terms" description="Search keywords of the setting for managing face unlock options on the device">Face unlock, Face</string> + + <string name="fingerprint_unlock_title" description="The default title of the setting for managing fingerprint unlock options on the device">Fingerprint</string> + <string name="fingerprint_unlock_title_for_work" description="The default title of the setting for managing fingerprint unlock options for work on the device">Fingerprint for work</string> + <string name="fingerprint_unlock_title_for_private_profile" description="The default title of the setting for managing fingerprint unlock options for private profile on the device"><!-- Empty placeholder--></string> + <string name="fingerprint_unlock_search_terms" description="Search keywords of the setting for managing fingerprint unlock options on the device">Fingerprint, Finger, Add fingerprint</string> + + <string name="wear_unlock_title" description="The default title of the setting for managing wear unlock options on the device">Watch</string> + <string name="wear_unlock_title_for_work" description="The default title of the setting for managing wear unlock options for work on the device">Watch for work</string> + <string name="wear_unlock_title_for_private_profile" description="The default title of the setting for managing wear unlock options for private profile on the device"><!-- Empty placeholder--></string> + <string name="wear_unlock_search_terms" description="Search keywords of the setting for managing wear unlock options on the device">Watch, Watch unlock</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-vi-v36/strings.xml b/SafetyCenter/Resources/res/values-vi-v36/strings.xml new file mode 100644 index 000000000..3665f3bcf --- /dev/null +++ b/SafetyCenter/Resources/res/values-vi-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Khuôn mặt"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Khuôn mặt cho ứng dụng công việc"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Mở khoá bằng khuôn mặt, Khuôn mặt"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Vân tay"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Vân tay cho ứng dụng công việc"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Vân tay, Ngón tay, Thêm vân tay"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Đồng hồ"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Đồng hồ cho ứng dụng công việc"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Đồng hồ, Mở khoá bằng đồng hồ"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-zh-rCN-v36/strings.xml b/SafetyCenter/Resources/res/values-zh-rCN-v36/strings.xml new file mode 100644 index 000000000..e60d81f96 --- /dev/null +++ b/SafetyCenter/Resources/res/values-zh-rCN-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"人脸"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"工作专用人脸"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"人脸解锁, 人脸, Face unlock, Face"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"指纹"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"工作专用指纹"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"指纹, 手指, 添加指纹, Fingerprint, Finger, Add fingerprint"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"手表"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"工作专用手表"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"手表, 手表解锁, Watch, Watch unlock"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-zh-rHK-v36/strings.xml b/SafetyCenter/Resources/res/values-zh-rHK-v36/strings.xml new file mode 100644 index 000000000..55c92891d --- /dev/null +++ b/SafetyCenter/Resources/res/values-zh-rHK-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"面孔"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"工作設定檔的面孔"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"面孔解鎖, 面孔"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"指紋"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"工作設定檔的指紋"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"指紋, 手指, 新增指紋"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"手錶"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"工作設定檔的手錶"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"手錶, 手錶解鎖"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-zh-rTW-v36/strings.xml b/SafetyCenter/Resources/res/values-zh-rTW-v36/strings.xml new file mode 100644 index 000000000..9adfdca6f --- /dev/null +++ b/SafetyCenter/Resources/res/values-zh-rTW-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"人臉"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"使用人臉解鎖工作資料夾"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"人臉解鎖, 人臉"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"指紋"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"使用指紋解鎖工作資料夾"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"指紋, 手指, 新增指紋"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"智慧手錶"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"使用智慧手錶解鎖工作資料夾"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"智慧手錶, 智慧手錶解鎖"</string> +</resources> diff --git a/SafetyCenter/Resources/res/values-zu-v36/strings.xml b/SafetyCenter/Resources/res/values-zu-v36/strings.xml new file mode 100644 index 000000000..bba0ffe78 --- /dev/null +++ b/SafetyCenter/Resources/res/values-zu-v36/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2025 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. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="face_unlock_title" msgid="3991635517593572926">"Ubuso"</string> + <string name="face_unlock_title_for_work" msgid="1451170625947022012">"Ubuso bomsebenzi"</string> + <string name="face_unlock_title_for_private_profile" msgid="2758692637409168420"></string> + <string name="face_unlock_search_terms" msgid="2708195853333028283">"Ukuvula ngobuso, Ubuso"</string> + <string name="fingerprint_unlock_title" msgid="5579868242026550596">"Isigxivizo somunwe"</string> + <string name="fingerprint_unlock_title_for_work" msgid="6343690273672384918">"Isigxivizo somunwe somsebenzi"</string> + <string name="fingerprint_unlock_title_for_private_profile" msgid="9004513575240235691"></string> + <string name="fingerprint_unlock_search_terms" msgid="688405183240088603">"Isigxivizo somunwe, Umunwe, Faka isigxivizo somunwe"</string> + <string name="wear_unlock_title" msgid="1613730442896319515">"Iwashi"</string> + <string name="wear_unlock_title_for_work" msgid="3103157953371670280">"Iwashi lomsebenzi"</string> + <string name="wear_unlock_title_for_private_profile" msgid="927318621331822758"></string> + <string name="wear_unlock_search_terms" msgid="3769797118448924263">"Iwashi, Ukuvula iwashi"</string> +</resources> diff --git a/SafetyCenter/Resources/shared_res/values-fa/strings.xml b/SafetyCenter/Resources/shared_res/values-fa/strings.xml index 744ac950c..c2123de3a 100644 --- a/SafetyCenter/Resources/shared_res/values-fa/strings.xml +++ b/SafetyCenter/Resources/shared_res/values-fa/strings.xml @@ -23,7 +23,7 @@ <string name="overall_severity_level_ok_summary" msgid="383626536912856690">"مشکلی پیدا نشد"</string> <string name="overall_severity_level_tip_summary" msgid="1935765582243024999">"{count,plural, =1{دیدن توصیه}one{دیدن توصیه}other{دیدن توصیهها}}"</string> <string name="overall_severity_level_action_taken_summary" msgid="8064091657855656545">"{count,plural, =1{اقدام انجام شد}one{اقدام انجام شد}other{اقدامات انجام شد}}"</string> - <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"مرور تنظیمات"</string> + <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"بازبینی تنظیمات"</string> <string name="overall_severity_level_ok_review_summary" msgid="7743619617413076275">"بررسی فهرست تنظیمات"</string> <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"دستگاه ممکن است درمعرض خطر باشد"</string> <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"دستگاه درمعرض خطر است"</string> diff --git a/SafetyCenter/Resources/shared_res/values-ky/strings.xml b/SafetyCenter/Resources/shared_res/values-ky/strings.xml index 474377b87..152661d8a 100644 --- a/SafetyCenter/Resources/shared_res/values-ky/strings.xml +++ b/SafetyCenter/Resources/shared_res/values-ky/strings.xml @@ -37,7 +37,7 @@ <string name="overall_severity_level_critical_safety_warning_title" msgid="6666640109779586868">"Коркунучтар табылды"</string> <string name="overall_severity_level_account_recommendation_title" msgid="2267542168734275090">"Аккаунт коркунучта болушу мүмкүн"</string> <string name="overall_severity_level_critical_account_warning_title" msgid="1913235490583842004">"Аккаунт коркунучта"</string> - <string name="overall_severity_n_alerts_summary" msgid="3262010942295408403">"{count,plural, =1{Эскетүүнү көрүү}other{Эскертүүлөрдү көрүү}}"</string> + <string name="overall_severity_n_alerts_summary" msgid="3262010942295408403">"{count,plural, =1{Эскертүүнү көрүү}other{Эскертүүлөрдү көрүү}}"</string> <string name="redirecting_error" msgid="8146983632878233202">"Барак ачылган жок"</string> <string name="resolving_action_error" msgid="371968886143262375">"Эскертүү чечилген жок"</string> <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Параметр текшерилген жок}other{Параметрлер текшерилген жок}}"</string> diff --git a/TEST_MAPPING b/TEST_MAPPING index 823738181..5c6f04426 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -45,6 +45,9 @@ "name" : "CtsRoleTestCases" }, { + "name" : "CtsRoleMultiUserTestCases" + }, + { "name" : "CtsPermissionMultiUserTestCases" }, { diff --git a/flags/Android.bp b/flags/Android.bp index d22da26c3..166e55492 100644 --- a/flags/Android.bp +++ b/flags/Android.bp @@ -30,15 +30,18 @@ java_aconfig_library { name: "com.android.permission.flags-aconfig-java-export", aconfig_declarations: "com.android.permission.flags-aconfig", mode: "exported", - sdk_version: "module_current", + defaults: ["framework-minus-apex-aconfig-java-defaults"], min_sdk_version: "30", installable: false, - libs: ["framework-configinfrastructure.stubs.module_lib"], visibility: [ + "//frameworks/base", "//packages/modules/Permission:__subpackages__", + "//packages/modules/Nfc:__subpackages__", "//vendor:__subpackages__", ], apex_available: [ + "//apex_available:platform", + "com.android.nfcservices", "com.android.permission", "test_com.android.permission", ], diff --git a/flags/flags.aconfig b/flags/flags.aconfig index 4cb084988..99a50ab7d 100644 --- a/flags/flags.aconfig +++ b/flags/flags.aconfig @@ -65,15 +65,6 @@ flag { } flag { - name: "livedata_refactor_permission_timeline_enabled" - is_exported: true - namespace: "permissions" - description: "This flag is used to enable modern app architecture implementation for timeline page" - bug: "354234946" - is_fixed_read_only: true -} - -flag { name: "odad_notifications_supported" is_exported: true namespace: "permissions" @@ -119,6 +110,18 @@ flag { } flag { + name: "cross_user_role_ux_bugfix_enabled" + is_exported: true + namespace: "permissions" + description: "This flag enables cross-user roles support ux bug fixes" + bug: "367732307" + is_fixed_read_only: true + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "permission_timeline_attribution_label_fix" is_exported: true namespace: "permissions" @@ -152,4 +155,22 @@ flag { description: "This flag is used to enable Expressive Design for Settings pages inside PermissionController" bug: "375480184" is_fixed_read_only: true -}
\ No newline at end of file +} + +flag { + name: "default_apps_recommendation_enabled" + is_exported: true + namespace: "permissions" + description: "This flag enables the recommended section in default apps" + bug: "388234667" + is_fixed_read_only: true +} + +flag { + name: "fix_safety_center_touch_target" + is_exported: true + namespace: "permissions" + description: "This flag fixes an issue with the SafetyCenterTouchTarget code" + bug: "399872661" + is_fixed_read_only: true +} diff --git a/framework-s/api/system-current.txt b/framework-s/api/system-current.txt index fc06d6927..c5d971435 100644 --- a/framework-s/api/system-current.txt +++ b/framework-s/api/system-current.txt @@ -54,7 +54,7 @@ package android.app.role { method @FlaggedApi("com.android.permission.flags.cross_user_role_enabled") @RequiresPermission(allOf={android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, android.Manifest.permission.MANAGE_ROLE_HOLDERS, android.Manifest.permission.MANAGE_DEFAULT_APPLICATIONS}, conditional=true) public void setActiveUserForRole(@NonNull String, @NonNull android.os.UserHandle, int); method @RequiresPermission(android.Manifest.permission.BYPASS_ROLE_QUALIFICATION) public void setBypassingRoleQualification(boolean); method @RequiresPermission(android.Manifest.permission.MANAGE_DEFAULT_APPLICATIONS) public void setDefaultApplication(@NonNull String, @Nullable String, int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>); - method @FlaggedApi("com.android.permission.flags.cross_user_role_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void setDefaultHoldersForTest(@NonNull String, @Nullable java.util.List<java.lang.String>); + method @FlaggedApi("com.android.permission.flags.cross_user_role_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void setDefaultHoldersForTest(@NonNull String, @NonNull java.util.List<java.lang.String>); method @FlaggedApi("android.permission.flags.system_server_role_controller_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void setRoleFallbackEnabled(@NonNull String, boolean); method @Deprecated @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public void setRoleNamesFromController(@NonNull java.util.List<java.lang.String>); method @FlaggedApi("com.android.permission.flags.cross_user_role_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void setRoleVisibleForTest(@NonNull String, boolean); @@ -64,6 +64,7 @@ package android.app.role { field @FlaggedApi("com.android.permission.flags.cross_user_role_enabled") public static final String ROLE_RESERVED_FOR_TESTING_PROFILE_GROUP_EXCLUSIVITY = "android.app.role.RESERVED_FOR_TESTING_PROFILE_GROUP_EXCLUSIVITY"; field public static final String ROLE_SYSTEM_ACTIVITY_RECOGNIZER = "android.app.role.SYSTEM_ACTIVITY_RECOGNIZER"; field public static final String ROLE_SYSTEM_CALL_STREAMING = "android.app.role.SYSTEM_CALL_STREAMING"; + field @FlaggedApi("android.content.pm.sdk_dependency_installer") public static final String ROLE_SYSTEM_DEPENDENCY_INSTALLER = "android.app.role.SYSTEM_DEPENDENCY_INSTALLER"; field public static final String ROLE_SYSTEM_SUPERVISION = "android.app.role.SYSTEM_SUPERVISION"; field public static final String ROLE_SYSTEM_WELLBEING = "android.app.role.SYSTEM_WELLBEING"; } diff --git a/framework-s/java/android/app/ecm/EnhancedConfirmationManager.java b/framework-s/java/android/app/ecm/EnhancedConfirmationManager.java index db05a0af6..4248a429c 100644 --- a/framework-s/java/android/app/ecm/EnhancedConfirmationManager.java +++ b/framework-s/java/android/app/ecm/EnhancedConfirmationManager.java @@ -33,6 +33,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.os.Build; import android.os.RemoteException; +import android.os.UserHandle; import android.permission.flags.Flags; import android.util.ArraySet; @@ -202,6 +203,19 @@ public final class EnhancedConfirmationManager { public static final String ACTION_SHOW_ECM_RESTRICTED_SETTING_DIALOG = "android.app.ecm.action.SHOW_ECM_RESTRICTED_SETTING_DIALOG"; + /** + * The setting is restricted because of the phone state of the device + * @hide + */ + public static final String REASON_PHONE_STATE = "phone_state"; + + /** + * The setting is restricted because the restricted app op is set for the given package + * @hide + */ + public static final String REASON_PACKAGE_RESTRICTED = "package_restricted"; + + /** A map of ECM states to their corresponding app op states */ @Retention(java.lang.annotation.RetentionPolicy.SOURCE) @IntDef(prefix = {"ECM_STATE_"}, value = {EcmState.ECM_STATE_NOT_GUARDED, @@ -349,8 +363,17 @@ public final class EnhancedConfirmationManager { @NonNull String settingIdentifier) throws NameNotFoundException { Intent intent = new Intent(ACTION_SHOW_ECM_RESTRICTED_SETTING_DIALOG); intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName); - intent.putExtra(Intent.EXTRA_UID, getPackageUid(packageName)); + int uid = getPackageUid(packageName); + intent.putExtra(Intent.EXTRA_UID, uid); intent.putExtra(Intent.EXTRA_SUBJECT, settingIdentifier); + try { + String restrictionReason = mService.getRestrictionReason(packageName, + settingIdentifier, UserHandle.getUserHandleForUid(uid).getIdentifier()); + intent.putExtra(Intent.EXTRA_REASON, restrictionReason); + } catch (SecurityException | RemoteException e) { + // The caller of this method does not have permission to read the ECM state, so we + // won't include it in the return + } return intent; } diff --git a/framework-s/java/android/app/ecm/IEnhancedConfirmationManager.aidl b/framework-s/java/android/app/ecm/IEnhancedConfirmationManager.aidl index 5149daa49..79d2322bd 100644 --- a/framework-s/java/android/app/ecm/IEnhancedConfirmationManager.aidl +++ b/framework-s/java/android/app/ecm/IEnhancedConfirmationManager.aidl @@ -25,6 +25,8 @@ interface IEnhancedConfirmationManager { boolean isRestricted(in String packageName, in String settingIdentifier, int userId); + String getRestrictionReason(in String packageName, in String settingIdentifier, int userId); + void clearRestriction(in String packageName, int userId); boolean isClearRestrictionAllowed(in String packageName, int userId); diff --git a/framework-s/java/android/app/role/IRoleManager.aidl b/framework-s/java/android/app/role/IRoleManager.aidl index dc5bc8cb4..cf98a6016 100644 --- a/framework-s/java/android/app/role/IRoleManager.aidl +++ b/framework-s/java/android/app/role/IRoleManager.aidl @@ -85,11 +85,12 @@ interface IRoleManager { boolean isApplicationVisibleForRoleAsUser(in String roleName, in String packageName, int userId); - List<String> getDefaultHoldersForTest(in String roleName); + List<String> getDefaultHoldersForTestAsUser(in String roleName, int userId); - void setDefaultHoldersForTest(in String roleName, in List<String> packageNames); + void setDefaultHoldersForTestAsUser(in String roleName, in List<String> packageNames, + int userId); - boolean isRoleVisibleForTest(in String roleName); + boolean isRoleVisibleForTestAsUser(in String roleName, int userId); - void setRoleVisibleForTest(in String roleName, boolean visible); + void setRoleVisibleForTestAsUser(in String roleName, boolean visible, int userId); } diff --git a/framework-s/java/android/app/role/RoleManager.java b/framework-s/java/android/app/role/RoleManager.java index 42445b4d6..9f28b7f19 100644 --- a/framework-s/java/android/app/role/RoleManager.java +++ b/framework-s/java/android/app/role/RoleManager.java @@ -264,6 +264,19 @@ public final class RoleManager { public static final String PERMISSION_MANAGE_ROLES_FROM_CONTROLLER = "com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER"; + /** + * The name of the system dependency installer role. + * + * A dependency installer installs missing SDK or static shared library dependencies that an app + * requires to be installed. + * + * @hide + */ + @FlaggedApi("android.content.pm.sdk_dependency_installer") + @SystemApi + public static final String ROLE_SYSTEM_DEPENDENCY_INSTALLER = + "android.app.role.SYSTEM_DEPENDENCY_INSTALLER"; + @NonNull private final Context mContext; @@ -1189,7 +1202,8 @@ public final class RoleManager { public List<String> getDefaultHoldersForTest(@NonNull String roleName) { Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); try { - return mService.getDefaultHoldersForTest(roleName); + return mService.getDefaultHoldersForTestAsUser(roleName, + mContext.getUser().getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1203,9 +1217,10 @@ public final class RoleManager { * not persisted. * <p> * Throws {@link IllegalArgumentException} if role is not a test role + * Throws {@link NullPointerException} if packageNames is {@code null} * * @param roleName the name of the role to set test default holders for - * @param packageNames a list of package names of the default holders or {@code null} to unset + * @param packageNames a list of package names of the default holders, or an empty list to unset * * @hide */ @@ -1215,10 +1230,12 @@ public final class RoleManager { @UserHandleAware @FlaggedApi(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) public void setDefaultHoldersForTest( - @NonNull String roleName, @Nullable List<String> packageNames) { + @NonNull String roleName, @NonNull List<String> packageNames) { Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); + Objects.requireNonNull(packageNames, "packageNames cannot be null"); try { - mService.setDefaultHoldersForTest(roleName, packageNames); + mService.setDefaultHoldersForTestAsUser(roleName, packageNames, + mContext.getUser().getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1245,7 +1262,8 @@ public final class RoleManager { public boolean isRoleVisibleForTest(@NonNull String roleName) { Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); try { - return mService.isRoleVisibleForTest(roleName); + return mService.isRoleVisibleForTestAsUser(roleName, + mContext.getUser().getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1272,7 +1290,8 @@ public final class RoleManager { public void setRoleVisibleForTest(@NonNull String roleName, boolean visible) { Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); try { - mService.setRoleVisibleForTest(roleName, visible); + mService.setRoleVisibleForTestAsUser(roleName, visible, + mContext.getUser().getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/framework-s/java/android/app/role/TEST_MAPPING b/framework-s/java/android/app/role/TEST_MAPPING index 46b148e68..62c07e5d9 100644 --- a/framework-s/java/android/app/role/TEST_MAPPING +++ b/framework-s/java/android/app/role/TEST_MAPPING @@ -7,6 +7,9 @@ "exclude-annotation": "androidx.test.filters.FlakyTest" } ] + }, + { + "name": "CtsRoleMultiUserTestCases" } ], "mainline-presubmit": [ @@ -24,6 +27,9 @@ "exclude-annotation": "androidx.test.filters.FlakyTest" } ] + }, + { + "name": "CtsRoleMultiUserTestCases[com.google.android.permission.apex]" } ], "permission-mainline-presubmit": [ @@ -41,6 +47,9 @@ "exclude-annotation": "androidx.test.filters.FlakyTest" } ] + }, + { + "name": "CtsRoleMultiUserTestCases" } ], "postsubmit": [ diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt index d9833ca56..bad5c7666 100644 --- a/service/jarjar-rules.txt +++ b/service/jarjar-rules.txt @@ -42,6 +42,10 @@ rule com.android.safetycenter.annotations.** com.android.permission.jarjar.@0 rule com.android.safetycenter.internaldata.** com.android.permission.jarjar.@0 rule com.android.safetycenter.pendingintents.** com.android.permission.jarjar.@0 rule com.android.safetycenter.resources.** com.android.permission.jarjar.@0 +rule com.android.settingslib.flags.*FeatureFlags* com.android.permission.jarjar.@0 +rule com.android.settingslib.flags.FeatureFlags* com.android.permission.jarjar.@0 +rule com.android.settingslib.flags.FeatureFlags com.android.permission.jarjar.@0 +rule com.android.settingslib.flags.Flags com.android.permission.jarjar.@0 rule com.google.protobuf.** com.android.permission.jarjar.@0 rule kotlin.** com.android.permission.jarjar.@0 rule com.android.permissioncontroller.PermissionControllerStatsLog com.android.permission.jarjar.@0 diff --git a/service/java/com/android/ecm/EnhancedConfirmationCallTrackerService.java b/service/java/com/android/ecm/EnhancedConfirmationCallTrackerService.java index 407d56f70..038c28383 100644 --- a/service/java/com/android/ecm/EnhancedConfirmationCallTrackerService.java +++ b/service/java/com/android/ecm/EnhancedConfirmationCallTrackerService.java @@ -28,6 +28,9 @@ import android.telecom.InCallService; import com.android.server.LocalManagerRegistry; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + /** * @hide * @@ -41,10 +44,12 @@ import com.android.server.LocalManagerRegistry; public class EnhancedConfirmationCallTrackerService extends InCallService { private EnhancedConfirmationManagerLocal mEnhancedConfirmationManagerLocal; + private final ExecutorService mBackgroundExecutor = Executors.newSingleThreadExecutor(); + @Override public void onCreate() { super.onCreate(); - if (Flags.enhancedConfirmationInCallApisEnabled()) { + if (Flags.unknownCallPackageInstallBlockingEnabled()) { mEnhancedConfirmationManagerLocal = LocalManagerRegistry.getManager(EnhancedConfirmationManagerLocal.class); } @@ -56,7 +61,7 @@ public class EnhancedConfirmationCallTrackerService extends InCallService { return; } - mEnhancedConfirmationManagerLocal.addOngoingCall(call); + mBackgroundExecutor.submit(() -> mEnhancedConfirmationManagerLocal.addOngoingCall(call)); } @Override @@ -65,7 +70,8 @@ public class EnhancedConfirmationCallTrackerService extends InCallService { return; } - mEnhancedConfirmationManagerLocal.removeOngoingCall(call.getDetails().getId()); + mBackgroundExecutor.submit(() -> + mEnhancedConfirmationManagerLocal.removeOngoingCall(call.getDetails().getId())); } /** @@ -73,7 +79,8 @@ public class EnhancedConfirmationCallTrackerService extends InCallService { */ public boolean onUnbind(@Nullable Intent intent) { if (mEnhancedConfirmationManagerLocal != null) { - mEnhancedConfirmationManagerLocal.clearOngoingCalls(); + mBackgroundExecutor.submit(() -> + mEnhancedConfirmationManagerLocal.clearOngoingCalls()); } return super.onUnbind(intent); } diff --git a/service/java/com/android/ecm/EnhancedConfirmationManagerLocal.java b/service/java/com/android/ecm/EnhancedConfirmationManagerLocal.java index 483071716..984a6783c 100644 --- a/service/java/com/android/ecm/EnhancedConfirmationManagerLocal.java +++ b/service/java/com/android/ecm/EnhancedConfirmationManagerLocal.java @@ -34,10 +34,10 @@ import android.telecom.Call; @TargetApi(Build.VERSION_CODES.BAKLAVA) public interface EnhancedConfirmationManagerLocal { /** - * Inform the enhanced confirmation service of an ongoing call + * Inform the enhanced confirmation service of an ongoing call. * * @param call The call to potentially track - * + * @throws IllegalStateException if called on the main thread */ void addOngoingCall(@NonNull Call call); @@ -45,12 +45,14 @@ public interface EnhancedConfirmationManagerLocal { * Inform the enhanced confirmation service that a call has ended * * @param callId The ID of the call to stop tracking + * @throws IllegalStateException if called on the main thread * */ void removeOngoingCall(@NonNull String callId); /** * Informs the enhanced confirmation service it should clear out any ongoing calls + * @throws IllegalStateException if called on the main thread */ void clearOngoingCalls(); } diff --git a/service/java/com/android/ecm/EnhancedConfirmationManagerLocalImpl.java b/service/java/com/android/ecm/EnhancedConfirmationManagerLocalImpl.java index a5c6d3c36..b34eac9f4 100644 --- a/service/java/com/android/ecm/EnhancedConfirmationManagerLocalImpl.java +++ b/service/java/com/android/ecm/EnhancedConfirmationManagerLocalImpl.java @@ -29,7 +29,7 @@ class EnhancedConfirmationManagerLocalImpl implements EnhancedConfirmationManage private final EnhancedConfirmationService mService; EnhancedConfirmationManagerLocalImpl(EnhancedConfirmationService service) { - if (Flags.enhancedConfirmationInCallApisEnabled()) { + if (Flags.unknownCallPackageInstallBlockingEnabled()) { mService = service; } else { mService = null; diff --git a/service/java/com/android/ecm/EnhancedConfirmationService.java b/service/java/com/android/ecm/EnhancedConfirmationService.java index 515f70add..1cc3a743e 100644 --- a/service/java/com/android/ecm/EnhancedConfirmationService.java +++ b/service/java/com/android/ecm/EnhancedConfirmationService.java @@ -16,19 +16,28 @@ package com.android.ecm; +import static android.app.ecm.EnhancedConfirmationManager.REASON_PACKAGE_RESTRICTED; +import static android.app.ecm.EnhancedConfirmationManager.REASON_PHONE_STATE; + +import static com.android.permission.PermissionStatsLog.CALL_WITH_ECM_INTERACTION_REPORTED; +import static com.android.permissioncontroller.PermissionControllerStatsLog.ECM_RESTRICTION_QUERY_IN_CALL_REPORTED; + import android.Manifest; +import android.accessibilityservice.AccessibilityServiceInfo; import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SuppressLint; import android.annotation.UserIdInt; +import android.annotation.WorkerThread; import android.app.AppOpsManager; import android.app.ecm.EnhancedConfirmationManager; import android.app.ecm.IEnhancedConfirmationManager; import android.app.role.RoleManager; import android.content.ContentResolver; import android.content.Context; +import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.InstallSourceInfo; import android.content.pm.PackageInstaller; @@ -39,6 +48,9 @@ import android.database.Cursor; import android.net.Uri; import android.os.Binder; import android.os.Build; +import android.os.Bundle; +import android.os.Looper; +import android.os.SystemClock; import android.os.SystemConfigManager; import android.os.UserHandle; import android.permission.flags.Flags; @@ -51,12 +63,15 @@ import android.telephony.TelephonyManager; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; +import android.view.accessibility.AccessibilityManager; import androidx.annotation.Keep; import androidx.annotation.RequiresApi; +import com.android.internal.annotations.GuardedBy; import com.android.internal.util.Preconditions; import com.android.permission.util.UserUtils; +import com.android.permissioncontroller.PermissionControllerStatsLog; import com.android.server.LocalManagerRegistry; import com.android.server.SystemService; @@ -65,7 +80,10 @@ import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; /** @@ -82,14 +100,59 @@ import java.util.Set; public class EnhancedConfirmationService extends SystemService { private static final String LOG_TAG = EnhancedConfirmationService.class.getSimpleName(); + /** A map of ECM states to their corresponding app op states */ + @Retention(java.lang.annotation.RetentionPolicy.SOURCE) + @IntDef(prefix = {"ECM_STATE_"}, value = {EcmState.ECM_STATE_NOT_GUARDED, + EcmState.ECM_STATE_GUARDED, EcmState.ECM_STATE_GUARDED_AND_ACKNOWLEDGED, + EcmState.ECM_STATE_IMPLICIT}) + private @interface EcmState { + int ECM_STATE_NOT_GUARDED = AppOpsManager.MODE_ALLOWED; + int ECM_STATE_GUARDED = AppOpsManager.MODE_ERRORED; + int ECM_STATE_GUARDED_AND_ACKNOWLEDGED = AppOpsManager.MODE_IGNORED; + int ECM_STATE_IMPLICIT = AppOpsManager.MODE_DEFAULT; + } + + private static final ArraySet<String> PER_PACKAGE_PROTECTED_SETTINGS = new ArraySet<>(); + + // Settings restricted when an untrusted call is ongoing. These must also be added to + // PROTECTED_SETTINGS + private static final ArraySet<String> UNTRUSTED_CALL_RESTRICTED_SETTINGS = new ArraySet<>(); + + static { + // Runtime permissions + PER_PACKAGE_PROTECTED_SETTINGS.add(Manifest.permission.SEND_SMS); + PER_PACKAGE_PROTECTED_SETTINGS.add(Manifest.permission.RECEIVE_SMS); + PER_PACKAGE_PROTECTED_SETTINGS.add(Manifest.permission.READ_SMS); + PER_PACKAGE_PROTECTED_SETTINGS.add(Manifest.permission.RECEIVE_MMS); + PER_PACKAGE_PROTECTED_SETTINGS.add(Manifest.permission.RECEIVE_WAP_PUSH); + PER_PACKAGE_PROTECTED_SETTINGS.add(Manifest.permission.READ_CELL_BROADCASTS); + PER_PACKAGE_PROTECTED_SETTINGS.add(Manifest.permission_group.SMS); + + PER_PACKAGE_PROTECTED_SETTINGS.add(Manifest.permission.BIND_DEVICE_ADMIN); + // App ops + PER_PACKAGE_PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_BIND_ACCESSIBILITY_SERVICE); + PER_PACKAGE_PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_ACCESS_NOTIFICATIONS); + PER_PACKAGE_PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_SYSTEM_ALERT_WINDOW); + PER_PACKAGE_PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_GET_USAGE_STATS); + PER_PACKAGE_PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_LOADER_USAGE_STATS); + // Default application roles. + PER_PACKAGE_PROTECTED_SETTINGS.add(RoleManager.ROLE_DIALER); + PER_PACKAGE_PROTECTED_SETTINGS.add(RoleManager.ROLE_SMS); + + if (Flags.unknownCallPackageInstallBlockingEnabled()) { + // Requesting package installs, limited during phone calls + UNTRUSTED_CALL_RESTRICTED_SETTINGS.add( + AppOpsManager.OPSTR_REQUEST_INSTALL_PACKAGES); + UNTRUSTED_CALL_RESTRICTED_SETTINGS.add( + AppOpsManager.OPSTR_BIND_ACCESSIBILITY_SERVICE); + } + } + private Map<String, List<byte[]>> mTrustedPackageCertDigests; private Map<String, List<byte[]>> mTrustedInstallerCertDigests; - // A map of call ID to call type - private final Map<String, Integer> mOngoingCalls = new ArrayMap<>(); - private static final int CALL_TYPE_UNTRUSTED = 0; private static final int CALL_TYPE_TRUSTED = 1; - private static final int CALL_TYPE_EMERGENCY = 2; + private static final int CALL_TYPE_EMERGENCY = 1 << 1; @IntDef(flag = true, value = { CALL_TYPE_UNTRUSTED, CALL_TYPE_TRUSTED, @@ -104,8 +167,14 @@ public class EnhancedConfirmationService extends SystemService { new EnhancedConfirmationManagerLocalImpl(this)); } - private ContentResolver mContentResolver; - private TelephonyManager mTelephonyManager; + private PackageManager mPackageManager; + + // A helper which tracks the calls received by the system, and information about them. + private CallTracker mCallTracker; + + @GuardedBy("mUserAccessibilityManagers") + private final Map<Integer, AccessibilityManager> mUserAccessibilityManagers = + new ArrayMap<>(); @Override public void onStart() { @@ -118,8 +187,11 @@ public class EnhancedConfirmationService extends SystemService { systemConfigManager.getEnhancedConfirmationTrustedInstallers()); publishBinderService(Context.ECM_ENHANCED_CONFIRMATION_SERVICE, new Stub()); - mContentResolver = getContext().getContentResolver(); - mTelephonyManager = getContext().getSystemService(TelephonyManager.class); + + if (Flags.unknownCallPackageInstallBlockingEnabled()) { + mCallTracker = new CallTracker(getContext()); + } + mPackageManager = getContext().getPackageManager(); } private Map<String, List<byte[]>> toTrustedPackageMap(Set<SignedPackage> signedPackages) { @@ -133,164 +205,65 @@ public class EnhancedConfirmationService extends SystemService { } void addOngoingCall(Call call) { - if (!Flags.enhancedConfirmationInCallApisEnabled()) { - return; - } - if (call.getDetails() == null) { - return; + assertNotMainThread(); + if (mCallTracker != null) { + mCallTracker.addCall(call); } - mOngoingCalls.put(call.getDetails().getId(), getCallType(call)); } + @WorkerThread void removeOngoingCall(String callId) { - if (!Flags.enhancedConfirmationInCallApisEnabled()) { - return; - } - Integer returned = mOngoingCalls.remove(callId); - if (returned == null) { - // TODO b/379941144: Capture a bug report whenever this happens. + assertNotMainThread(); + if (mCallTracker != null) { + mCallTracker.endCall(callId); } } + @WorkerThread void clearOngoingCalls() { - mOngoingCalls.clear(); - } + assertNotMainThread(); - private @CallType int getCallType(Call call) { - String number = getPhoneNumber(call); - try { - if (number != null && mTelephonyManager.isEmergencyNumber(number)) { - return CALL_TYPE_EMERGENCY; - } - } catch (RuntimeException e) { - // If either of these are thrown, the telephony service is not available on the current - // device, either because the device lacks telephony calling, or the telephony service - // is unavailable. - } - if (number != null) { - return hasContactWithPhoneNumber(number) ? CALL_TYPE_TRUSTED : CALL_TYPE_UNTRUSTED; - } else { - return hasContactWithDisplayName(call.getDetails().getCallerDisplayName()) - ? CALL_TYPE_TRUSTED : CALL_TYPE_UNTRUSTED; + if (mCallTracker != null) { + mCallTracker.endAllCalls(); } } - private String getPhoneNumber(Call call) { - Uri handle = call.getDetails().getHandle(); - if (handle == null || handle.getScheme() == null) { - return null; - } - if (!handle.getScheme().equals(PhoneAccount.SCHEME_TEL)) { - return null; - } - return handle.getSchemeSpecificPart(); + static int getPackageUid(PackageManager pm, String packageName, + int userId) throws NameNotFoundException { + return pm.getPackageUidAsUser(packageName, PackageManager.PackageInfoFlags.of(0), userId); } - private boolean hasContactWithPhoneNumber(String phoneNumber) { - if (phoneNumber == null) { - return false; - } - Uri uri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, - Uri.encode(phoneNumber)); - String[] projection = new String[]{ - PhoneLookup.DISPLAY_NAME, - ContactsContract.PhoneLookup._ID - }; - try (Cursor res = mContentResolver.query(uri, projection, null, null)) { - return res != null && res.getCount() > 0; + private void assertNotMainThread() throws IllegalStateException { + if (Looper.myLooper() == Looper.getMainLooper()) { + throw new IllegalStateException("Ecm WorkerThread method called on main thread"); } } - private boolean hasContactWithDisplayName(String displayName) { - if (displayName == null) { - return false; - } - Uri uri = ContactsContract.Data.CONTENT_URI; - String[] projection = new String[]{PhoneLookup._ID}; - String selection = StructuredName.DISPLAY_NAME + " = ?"; - String[] selectionArgs = new String[]{displayName}; - try (Cursor res = mContentResolver.query(uri, projection, selection, selectionArgs, null)) { - return res != null && res.getCount() > 0; - } - } - - private boolean hasCallOfType(@CallType int callType) { - for (int ongoingCallType : mOngoingCalls.values()) { - if (ongoingCallType == callType) { - return true; - } - } - return false; - } - private class Stub extends IEnhancedConfirmationManager.Stub { - /** A map of ECM states to their corresponding app op states */ - @Retention(java.lang.annotation.RetentionPolicy.SOURCE) - @IntDef(prefix = {"ECM_STATE_"}, value = {EcmState.ECM_STATE_NOT_GUARDED, - EcmState.ECM_STATE_GUARDED, EcmState.ECM_STATE_GUARDED_AND_ACKNOWLEDGED, - EcmState.ECM_STATE_IMPLICIT}) - private @interface EcmState { - int ECM_STATE_NOT_GUARDED = AppOpsManager.MODE_ALLOWED; - int ECM_STATE_GUARDED = AppOpsManager.MODE_ERRORED; - int ECM_STATE_GUARDED_AND_ACKNOWLEDGED = AppOpsManager.MODE_IGNORED; - int ECM_STATE_IMPLICIT = AppOpsManager.MODE_DEFAULT; - } - - private static final ArraySet<String> PROTECTED_SETTINGS = new ArraySet<>(); - - // Settings restricted when an untrusted call is ongoing. These must also be added to - // PROTECTED_SETTINGS - private static final ArraySet<String> UNTRUSTED_CALL_RESTRICTED_SETTINGS = new ArraySet<>(); - - static { - // Runtime permissions - PROTECTED_SETTINGS.add(Manifest.permission.SEND_SMS); - PROTECTED_SETTINGS.add(Manifest.permission.RECEIVE_SMS); - PROTECTED_SETTINGS.add(Manifest.permission.READ_SMS); - PROTECTED_SETTINGS.add(Manifest.permission.RECEIVE_MMS); - PROTECTED_SETTINGS.add(Manifest.permission.RECEIVE_WAP_PUSH); - PROTECTED_SETTINGS.add(Manifest.permission.READ_CELL_BROADCASTS); - PROTECTED_SETTINGS.add(Manifest.permission_group.SMS); - - PROTECTED_SETTINGS.add(Manifest.permission.BIND_DEVICE_ADMIN); - // App ops - PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_BIND_ACCESSIBILITY_SERVICE); - PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_ACCESS_NOTIFICATIONS); - PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_SYSTEM_ALERT_WINDOW); - PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_GET_USAGE_STATS); - PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_LOADER_USAGE_STATS); - // Default application roles. - PROTECTED_SETTINGS.add(RoleManager.ROLE_DIALER); - PROTECTED_SETTINGS.add(RoleManager.ROLE_SMS); - - if (Flags.unknownCallPackageInstallBlockingEnabled()) { - // Requesting package installs, limited during phone calls - PROTECTED_SETTINGS.add(AppOpsManager.OPSTR_REQUEST_INSTALL_PACKAGES); - UNTRUSTED_CALL_RESTRICTED_SETTINGS.add( - AppOpsManager.OPSTR_REQUEST_INSTALL_PACKAGES); - } - } - private final @NonNull Context mContext; private final String mAttributionTag; private final AppOpsManager mAppOpsManager; - private final PackageManager mPackageManager; Stub() { Context context = getContext(); mContext = context; mAttributionTag = context.getAttributionTag(); mAppOpsManager = context.getSystemService(AppOpsManager.class); - mPackageManager = context.getPackageManager(); } public boolean isRestricted(@NonNull String packageName, @NonNull String settingIdentifier, @UserIdInt int userId) { + return getRestrictionReason(packageName, settingIdentifier, userId) != null; + } + + public String getRestrictionReason(@NonNull String packageName, + @NonNull String settingIdentifier, + @UserIdInt int userId) { enforcePermissions("isRestricted", userId); if (!UserUtils.isUserExistent(userId, getContext())) { Log.e(LOG_TAG, "user " + userId + " does not exist"); - return false; + return null; } Preconditions.checkStringNotEmpty(packageName, "packageName cannot be null or empty"); @@ -299,12 +272,17 @@ public class EnhancedConfirmationService extends SystemService { try { if (!isSettingEcmProtected(settingIdentifier)) { - return false; + return null; + } + if (isSettingEcmGuardedForPackage(settingIdentifier, packageName, userId)) { + return REASON_PACKAGE_RESTRICTED; } - if (isSettingProtectedGlobally(settingIdentifier)) { - return true; + String globalProtectionReason = + getGlobalProtectionReason(settingIdentifier, packageName, userId); + if (globalProtectionReason != null) { + return globalProtectionReason; } - return isPackageEcmGuarded(packageName, userId); + return null; } catch (NameNotFoundException e) { throw new IllegalArgumentException(e); } @@ -326,7 +304,7 @@ public class EnhancedConfirmationService extends SystemService { } setAppEcmState(packageName, EcmState.ECM_STATE_NOT_GUARDED, userId); EnhancedConfirmationStatsLogUtils.INSTANCE.logRestrictionCleared( - getPackageUid(packageName, userId)); + getPackageUid(mPackageManager, packageName, userId)); } catch (NameNotFoundException e) { throw new IllegalArgumentException(e); } @@ -367,18 +345,6 @@ public class EnhancedConfirmationService extends SystemService { } } - private boolean isUntrustedCallOngoing() { - if (!Flags.unknownCallPackageInstallBlockingEnabled()) { - return false; - } - - if (hasCallOfType(CALL_TYPE_EMERGENCY)) { - // If we have an emergency call, return false always. - return false; - } - return hasCallOfType(CALL_TYPE_UNTRUSTED); - } - private void enforcePermissions(@NonNull String methodName, @UserIdInt int userId) { UserUtils.enforceCrossUserPermission(userId, /* allowAll= */ false, /* enforceForProfileGroup= */ false, methodName, mContext); @@ -436,6 +402,14 @@ public class EnhancedConfirmationService extends SystemService { || isAllowlistedInstaller(installingPackageName)); } + private boolean isSettingEcmGuardedForPackage(@NonNull String settingIdentifier, + @NonNull String packageName, @UserIdInt int userId) throws NameNotFoundException { + if (!PER_PACKAGE_PROTECTED_SETTINGS.contains(settingIdentifier)) { + return false; + } + return isPackageEcmGuarded(packageName, userId); + } + private boolean isAllowlistedPackage(String packageName) { return isPackageSignedWithAnyOf(packageName, mTrustedPackageCertDigests.get(packageName)); @@ -478,7 +452,7 @@ public class EnhancedConfirmationService extends SystemService { @SuppressLint("WrongConstant") private void setAppEcmState(@NonNull String packageName, @EcmState int ecmState, @UserIdInt int userId) throws NameNotFoundException { - int packageUid = getPackageUid(packageName, userId); + int packageUid = getPackageUid(mPackageManager, packageName, userId); final long identityToken = Binder.clearCallingIdentity(); try { mAppOpsManager.setMode(AppOpsManager.OPSTR_ACCESS_RESTRICTED_SETTINGS, packageUid, @@ -490,7 +464,7 @@ public class EnhancedConfirmationService extends SystemService { private @EcmState int getAppEcmState(@NonNull String packageName, @UserIdInt int userId) throws NameNotFoundException { - int packageUid = getPackageUid(packageName, userId); + int packageUid = getPackageUid(mPackageManager, packageName, userId); final long identityToken = Binder.clearCallingIdentity(); try { return mAppOpsManager.noteOpNoThrow(AppOpsManager.OPSTR_ACCESS_RESTRICTED_SETTINGS, @@ -506,18 +480,62 @@ public class EnhancedConfirmationService extends SystemService { return false; } - if (PROTECTED_SETTINGS.contains(settingIdentifier)) { + if (PER_PACKAGE_PROTECTED_SETTINGS.contains(settingIdentifier)) { + return true; + } + if (UNTRUSTED_CALL_RESTRICTED_SETTINGS.contains(settingIdentifier)) { return true; } // TODO(b/310218979): Add role selections as protected settings return false; } - private boolean isSettingProtectedGlobally(@NonNull String settingIdentifier) { - if (UNTRUSTED_CALL_RESTRICTED_SETTINGS.contains(settingIdentifier)) { - return isUntrustedCallOngoing(); + // Generate a global protection reason for why the setting may be blocked. Note, this + // method will result in a metric being logged, representing a blocked/allowed setting + private String getGlobalProtectionReason(@NonNull String settingIdentifier, + @NonNull String packageName, @UserIdInt int userId) { + if (!UNTRUSTED_CALL_RESTRICTED_SETTINGS.contains(settingIdentifier)) { + return null; + } + if (mCallTracker == null) { + return null; + } + String reason = null; + if (mCallTracker.isUntrustedCallOngoing()) { + if (!AppOpsManager.OPSTR_BIND_ACCESSIBILITY_SERVICE.equals(settingIdentifier)) { + reason = REASON_PHONE_STATE; + } + if (!isAccessibilityTool(packageName, userId)) { + reason = REASON_PHONE_STATE; + } } + mCallTracker.onEcmInteraction(packageName, userId, settingIdentifier, reason == null); + return reason; + } + + private boolean isAccessibilityTool(@NonNull String packageName, @UserIdInt int userId) { + AccessibilityManager am; + synchronized (mUserAccessibilityManagers) { + if (!mUserAccessibilityManagers.containsKey(userId)) { + Context userContext = + getContext().createContextAsUser(UserHandle.of(userId), 0); + mUserAccessibilityManagers.put(userId, userContext.getSystemService( + AccessibilityManager.class)); + } + am = mUserAccessibilityManagers.get(userId); + } + List<AccessibilityServiceInfo> infos = am.getInstalledAccessibilityServiceList(); + for (int i = 0; i < infos.size(); i++) { + AccessibilityServiceInfo info = infos.get(i); + String servicePackageName = null; + if (info.getResolveInfo() != null && info.getResolveInfo().serviceInfo != null) { + servicePackageName = info.getResolveInfo().serviceInfo.packageName; + } + if (packageName.equals(servicePackageName)) { + return info.isAccessibilityTool(); + } + } return false; } @@ -536,11 +554,295 @@ public class EnhancedConfirmationService extends SystemService { return null; } } + } - private int getPackageUid(@NonNull String packageName, @UserIdInt int userId) - throws NameNotFoundException { - return mPackageManager.getApplicationInfoAsUser(packageName, /* flags */ 0, - UserHandle.of(userId)).uid; + private static class CallTracker { + // The time we will remember an untrusted call + private static final long UNTRUSTED_CALL_STORAGE_TIME_MS = TimeUnit.HOURS.toMillis(1); + // The minimum time that must pass between individual logs of the same call, uid, trusted + // status, and allowed setting. + private static final long MAX_LOGGING_FREQUENCY_MS = TimeUnit.SECONDS.toMillis(30); + // A map of call ID to ongoing or recently removed calls. Concurrent because + // additions/removals happen on background threads, but queries on main thread. + private final Map<String, TrackedCall> mCalls = new ConcurrentHashMap<>(); + + // A cache of hashed callers, uids, trusted status, and allowed status. Ensures that we + // do not log the same interaction too many times + private final Map<Integer, Long> mLogCache = new ConcurrentHashMap<>(); + + private class TrackedCall { + public @CallType Integer callType; + public String caller; + + public long startTime = SystemClock.elapsedRealtime(); + + public long endTime = -1; + + public boolean incoming; + + public boolean blockedDuringCall = false; + + public boolean ecmInteractionDuringCall = false; + + public boolean isFinished() { + return endTime > 0; + } + + TrackedCall(@NonNull Call call) { + caller = getPhoneNumber(call); + if (caller == null) { + caller = getDisplayName(call); + } + callType = getCallType(call); + incoming = call.getDetails().getCallDirection() == Call.Details.DIRECTION_INCOMING; + } + } + + private Context mContext; + private TelephonyManager mTelephonyManager; + private PackageManager mPackageManager; + + CallTracker(Context context) { + mContext = context; + mTelephonyManager = context.getSystemService(TelephonyManager.class); + mPackageManager = context.getPackageManager(); + } + + public void addCall(@NonNull Call call) { + if (call.getDetails() == null) { + return; + } + pruneOldFinishedCalls(); + pruneOldLogs(); + mCalls.put(call.getDetails().getId(), new TrackedCall(call)); + } + + public void endCall(@NonNull String callId) { + TrackedCall trackedCall = mCalls.get(callId); + if (trackedCall == null) { + // TODO b/379941144: Capture a bug report whenever this happens. + return; + } + if (trackedCall.isFinished()) { + return; + } + if (!Flags.unknownCallSettingBlockedLoggingEnabled()) { + mCalls.remove(callId); + return; + } + + trackedCall.endTime = SystemClock.elapsedRealtime(); + if (trackedCall.callType != CALL_TYPE_UNTRUSTED) { + // We only hang onto a finished call if the call was untrusted + mCalls.remove(callId); + } + + if (trackedCall.ecmInteractionDuringCall) { + long duration = TimeUnit.MILLISECONDS.toSeconds( + trackedCall.endTime - trackedCall.startTime); + int durationInt = (int) Math.min(duration, Integer.MAX_VALUE); + PermissionControllerStatsLog.write(CALL_WITH_ECM_INTERACTION_REPORTED, + trackedCall.blockedDuringCall, durationInt); + } + + pruneOldFinishedCalls(); + pruneOldLogs(); + } + + public void endAllCalls() { + for (String callId: mCalls.keySet()) { + endCall(callId); + } + } + + public void onEcmInteraction(@NonNull String packageName, int userId, + @NonNull String settingIdentifier, boolean allowed) { + if (!Flags.unknownCallSettingBlockedLoggingEnabled()) { + return; + } + + boolean hasOngoingCall = false; + for (TrackedCall current: mCalls.values()) { + if (current.isFinished()) { + // We only care about ongoing calls + continue; + } + hasOngoingCall = true; + // Mark that the current call had a setting interaction during it + current.ecmInteractionDuringCall = true; + current.blockedDuringCall = !allowed; + logInCallRestrictionEvent(packageName, userId, settingIdentifier, allowed, current); + } + if (!hasOngoingCall) { + logInCallRestrictionEvent(packageName, userId, settingIdentifier, allowed, null); + } + + } + + private @CallType int getCallType(@NonNull Call call) { + String number = getPhoneNumber(call); + try { + if (number != null && mTelephonyManager.isEmergencyNumber(number)) { + return CALL_TYPE_EMERGENCY; + } + } catch (RuntimeException e) { + // If either of these are thrown, the telephony service is not available on the + // current device, either because the device lacks telephony calling, or the + // telephony service is unavailable. + } + UserHandle user = mContext.getUser(); + Bundle extras = call.getDetails().getExtras(); + if (extras != null) { + user = extras.getParcelable(Intent.EXTRA_USER_HANDLE, UserHandle.class); + } + if (number != null) { + return hasContactWithPhoneNumber(number, user) + ? CALL_TYPE_TRUSTED : CALL_TYPE_UNTRUSTED; + } else { + return hasContactWithDisplayName(getDisplayName(call), user) + ? CALL_TYPE_TRUSTED : CALL_TYPE_UNTRUSTED; + } + } + + private static String getPhoneNumber(@NonNull Call call) { + Uri handle = call.getDetails().getHandle(); + if (handle == null || handle.getScheme() == null) { + return null; + } + if (!handle.getScheme().equals(PhoneAccount.SCHEME_TEL)) { + return null; + } + return handle.getSchemeSpecificPart(); + } + + private static String getDisplayName(@NonNull Call call) { + return call.getDetails().getCallerDisplayName(); + } + + private boolean hasContactWithPhoneNumber(@Nullable String phoneNumber, UserHandle user) { + if (phoneNumber == null) { + return false; + } + Uri uri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, + Uri.encode(phoneNumber)); + String[] projection = new String[]{ + PhoneLookup.DISPLAY_NAME, + ContactsContract.PhoneLookup._ID + }; + try (Cursor res = getUserContentResolver(user).query(uri, projection, null, null)) { + return res != null && res.getCount() > 0; + } + } + + private boolean hasContactWithDisplayName(@Nullable String displayName, UserHandle user) { + if (displayName == null) { + return false; + } + Uri uri = ContactsContract.Data.CONTENT_URI; + String[] projection = new String[]{PhoneLookup._ID}; + String selection = StructuredName.DISPLAY_NAME + " = ?"; + String[] selectionArgs = new String[]{displayName}; + try (Cursor res = getUserContentResolver(user) + .query(uri, projection, selection, selectionArgs, null)) { + return res != null && res.getCount() > 0; + } + } + + private ContentResolver getUserContentResolver(UserHandle user) { + return mContext.createContextAsUser(user, 0).getContentResolver(); + } + + private TrackedCall getOngoingCallOfType(@CallType int callType) { + for (TrackedCall call : mCalls.values()) { + if (!call.isFinished() && call.callType == callType) { + return call; + } + } + return null; + } + + public boolean isUntrustedCallOngoing() { + if (!Flags.unknownCallPackageInstallBlockingEnabled()) { + return false; + } + + if (getOngoingCallOfType(CALL_TYPE_EMERGENCY) != null) { + // If we have an emergency call, return false always. + return false; + } + return getOngoingCallOfType(CALL_TYPE_UNTRUSTED) != null; + } + + void pruneOldFinishedCalls() { + if (!Flags.unknownCallSettingBlockedLoggingEnabled()) { + return; + } + long cutoff = SystemClock.elapsedRealtime() - UNTRUSTED_CALL_STORAGE_TIME_MS; + mCalls.entrySet().removeIf( + e -> e.getValue().isFinished() && e.getValue().endTime < cutoff); + } + + void pruneOldLogs() { + if (!Flags.unknownCallSettingBlockedLoggingEnabled()) { + return; + } + long cutoff = SystemClock.elapsedRealtime() - MAX_LOGGING_FREQUENCY_MS; + mLogCache.entrySet().removeIf(e -> e.getValue() < cutoff); + } + + private void logInCallRestrictionEvent(@NonNull String packageName, int userId, + @NonNull String settingIdentifier, boolean allowed, @Nullable TrackedCall call) { + if (!Flags.unknownCallSettingBlockedLoggingEnabled()) { + return; + } + + if (!UNTRUSTED_CALL_RESTRICTED_SETTINGS.contains(settingIdentifier)) { + return; + } + + int uid; + try { + uid = mPackageManager.getPackageUid(packageName, userId); + } catch (NameNotFoundException e) { + return; + } + + boolean callInProgress = call != null && !call.isFinished(); + boolean trusted = true; + boolean incoming = false; + boolean callBackAfterBlock = false; + if (callInProgress) { + trusted = call.callType != CALL_TYPE_UNTRUSTED; + incoming = call.incoming; + + // Look for a previous call from the same caller, that had a blocked ecm interaction + for (TrackedCall otherCall : mCalls.values()) { + if (!otherCall.isFinished()) { + continue; + } + if (!Objects.equals(otherCall.caller, call.caller)) { + continue; + } + if (!otherCall.blockedDuringCall) { + continue; + } + callBackAfterBlock = true; + } + } + + String caller = callInProgress ? call.caller : null; + int logHash = Objects.hash(caller, uid, settingIdentifier, allowed, trusted); + Long lastLogTime = mLogCache.get(logHash); + long now = SystemClock.elapsedRealtime(); + long cutoff = now - MAX_LOGGING_FREQUENCY_MS; + if (lastLogTime != null && lastLogTime > cutoff) { + return; + } + mLogCache.put(logHash, now); + + PermissionControllerStatsLog.write(ECM_RESTRICTION_QUERY_IN_CALL_REPORTED, uid, + settingIdentifier, allowed, callInProgress, incoming, trusted, + callBackAfterBlock); } } } diff --git a/service/java/com/android/permission/util/UserUtils.java b/service/java/com/android/permission/util/UserUtils.java index c69afb199..ae8e794b6 100644 --- a/service/java/com/android/permission/util/UserUtils.java +++ b/service/java/com/android/permission/util/UserUtils.java @@ -65,13 +65,12 @@ public final class UserUtils { DevicePolicyManager devicePolicyManager = context.getSystemService(DevicePolicyManager.class); if (!devicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile()) { - // For profileGroup exclusive roles users on BYOD are free to choose personal o + // For profileGroup exclusive roles users on BYOD are free to choose personal or // work profile app regardless of DISALLOW_DEBUGGING_FEATURES return; } - Context userContext = UserUtils.getUserContext(userId, context); - List<UserHandle> profiles = getUserProfiles(userContext, true); + List<UserHandle> profiles = getUserProfiles(userId, context, true); final int profilesSize = profiles.size(); for (int i = 0; i < profilesSize; i++) { int profileId = profiles.get(i).getIdentifier(); @@ -112,26 +111,29 @@ public final class UserUtils { } } - /** Returns all the enabled user profiles on the device. */ + /** Returns all the enabled user profiles on the device for a specified user. */ @NonNull - public static List<UserHandle> getUserProfiles(@NonNull Context context) { - return getUserProfiles(context, false); + public static List<UserHandle> getUserProfiles(@UserIdInt int userId, + @NonNull Context context) { + return getUserProfiles(userId, context, false); } /** - * Returns all the enabled user profiles on the device + * Returns all the enabled user profiles on the device for a specified user * + * @param userId the user id to check * @param context the {@link Context} * @param excludePrivate {@code true} to exclude private profiles from returned list of users */ @NonNull - public static List<UserHandle> getUserProfiles(@NonNull Context context, + public static List<UserHandle> getUserProfiles(@UserIdInt int userId, @NonNull Context context, boolean excludePrivate) { - UserManager userManager = context.getSystemService(UserManager.class); // This call requires the QUERY_USERS permission. final long identity = Binder.clearCallingIdentity(); try { - List<UserHandle> profiles = userManager.getUserProfiles(); + Context userContext = getUserContext(userId, context); + UserManager userUserManager = userContext.getSystemService(UserManager.class); + List<UserHandle> profiles = userUserManager.getUserProfiles(); if (!excludePrivate) { return profiles; } @@ -139,7 +141,7 @@ public final class UserUtils { final int profilesSize = profiles.size(); for (int i = 0; i < profilesSize; i++) { UserHandle user = profiles.get(i); - if (!isPrivateProfile(user.getIdentifier(), context)) { + if (!isPrivateProfile(user.getIdentifier(), userContext)) { filteredProfiles.add(user); } } @@ -164,11 +166,11 @@ public final class UserUtils { @Nullable private static UserHandle getProfileParent(@UserIdInt int userId, @NonNull Context context) { Context userContext = getUserContext(userId, context); - UserManager userManager = userContext.getSystemService(UserManager.class); + UserManager userUserManager = userContext.getSystemService(UserManager.class); // This call requires the INTERACT_ACROSS_USERS permission. final long identity = Binder.clearCallingIdentity(); try { - return userManager.getProfileParent(UserHandle.of(userId)); + return userUserManager.getProfileParent(UserHandle.of(userId)); } finally { Binder.restoreCallingIdentity(identity); } @@ -201,8 +203,8 @@ public final class UserUtils { final long identity = Binder.clearCallingIdentity(); try { Context userContext = getUserContext(userId, context); - UserManager userManager = userContext.getSystemService(UserManager.class); - return userManager != null && userManager.isPrivateProfile(); + UserManager userUserManager = userContext.getSystemService(UserManager.class); + return userUserManager != null && userUserManager.isPrivateProfile(); } finally { Binder.restoreCallingIdentity(identity); } diff --git a/service/java/com/android/role/RoleService.java b/service/java/com/android/role/RoleService.java index 0fea33899..529b0cbdf 100644 --- a/service/java/com/android/role/RoleService.java +++ b/service/java/com/android/role/RoleService.java @@ -16,8 +16,6 @@ package com.android.role; -import static android.app.role.RoleManager.ROLE_RESERVED_FOR_TESTING_PROFILE_GROUP_EXCLUSIVITY; - import android.Manifest; import android.annotation.AnyThread; import android.annotation.MainThread; @@ -42,6 +40,7 @@ import android.os.Binder; import android.os.Build; import android.os.Handler; import android.os.ParcelFileDescriptor; +import android.os.Process; import android.os.RemoteCallback; import android.os.RemoteCallbackList; import android.os.RemoteException; @@ -52,7 +51,6 @@ import android.permission.flags.Flags; import android.permission.internal.compat.UserHandleCompat; import android.provider.Settings; import android.text.TextUtils; -import android.util.ArrayMap; import android.util.ArraySet; import android.util.IndentingPrintWriter; import android.util.Log; @@ -125,7 +123,8 @@ public class RoleService extends SystemService implements RoleUserState.Callback defaultApplicationRoles.add(RoleManager.ROLE_WALLET); } if (RoleFlags.isProfileGroupExclusivityAvailable()) { - defaultApplicationRoles.add(ROLE_RESERVED_FOR_TESTING_PROFILE_GROUP_EXCLUSIVITY); + defaultApplicationRoles.add( + RoleManager.ROLE_RESERVED_FOR_TESTING_PROFILE_GROUP_EXCLUSIVITY); } DEFAULT_APPLICATION_ROLES = defaultApplicationRoles.toArray(new String[0]); } @@ -134,7 +133,8 @@ public class RoleService extends SystemService implements RoleUserState.Callback static { if (RoleFlags.isProfileGroupExclusivityAvailable()) { - TEST_ROLES = new String[] {ROLE_RESERVED_FOR_TESTING_PROFILE_GROUP_EXCLUSIVITY}; + TEST_ROLES = + new String[] {RoleManager.ROLE_RESERVED_FOR_TESTING_PROFILE_GROUP_EXCLUSIVITY}; } else { TEST_ROLES = new String[0]; } @@ -185,14 +185,6 @@ public class RoleService extends SystemService implements RoleUserState.Callback private final SparseArray<ThrottledRunnable> mGrantDefaultRolesThrottledRunnables = new SparseArray<>(); - @GuardedBy("mLock") - @NonNull - private final Map<String, List<String>> mDefaultHoldersForTest = new ArrayMap<>(); - - @GuardedBy("mLock") - @NonNull - private final Set<String> mRolesVisibleForTest = new ArraySet<>(); - public RoleService(@NonNull Context context) { super(context); @@ -228,7 +220,6 @@ public class RoleService extends SystemService implements RoleUserState.Callback }, intentFilter, null, null); } - // TODO(b/375029649): enforce single active user for all cross-user roles @Override public void onStart() { publishBinderService(Context.ROLE_SERVICE, new Stub()); @@ -449,6 +440,9 @@ public class RoleService extends SystemService implements RoleUserState.Callback private void onRemoveUser(@UserIdInt int userId) { RemoteCallbackList<IOnRoleHoldersChangedListener> listeners; RoleUserState userState; + // UserManager still knows the user until ACTION_USER_REMOVED broadcasts are processed + int profileParentId = UserUtils.getProfileParentIdOrSelf(userId, getContext()); + List<String> activeRoleNames = null; synchronized (mLock) { mGrantDefaultRolesThrottledRunnables.remove(userId); listeners = mListeners.get(userId); @@ -456,7 +450,29 @@ public class RoleService extends SystemService implements RoleUserState.Callback mControllers.remove(userId); userState = mUserStates.get(userId); mUserStates.remove(userId); + + if (RoleFlags.isProfileGroupExclusivityAvailable() && userId != profileParentId) { + RoleUserState profileParentState = mUserStates.get(profileParentId); + activeRoleNames = profileParentState.getActiveRolesForUser(userId); + } } + if (RoleFlags.isProfileGroupExclusivityAvailable() && userId != profileParentId + && !CollectionUtils.isEmpty(activeRoleNames)) { + int activeRoleNamesSize = activeRoleNames.size(); + for (int i = 0; i < activeRoleNamesSize; i++) { + String roleName = activeRoleNames.get(i); + + // If the previous active user had a set role holder, attempt to fallback for + // the profile parent. + Log.i(LOG_TAG, "User " + userId + " removed, falling back to profile parent " + + profileParentId + " for role " + roleName); + // Use profileParentId instead of userId here, since userId is in a state of removal + // and might be excluded from UserManager#getUserHandles with excludeDying=true + setActiveUserForRoleAsUserInternal(roleName, profileParentId, 0, true, + profileParentId); + } + } + if (listeners != null) { listeners.kill(); } @@ -549,8 +565,7 @@ public class RoleService extends SystemService implements RoleUserState.Callback + " for role"); return; } - Context userContext = UserUtils.getUserContext(userId, getContext()); - List<UserHandle> profiles = UserUtils.getUserProfiles(userContext, true); + List<UserHandle> profiles = UserUtils.getUserProfiles(userId, getContext(), true); if (!profiles.contains(UserHandle.of(activeUserId))) { Log.e(LOG_TAG, "User " + activeUserId + " is not in the same profile-group as " + userId); @@ -712,12 +727,44 @@ public class RoleService extends SystemService implements RoleUserState.Callback Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); Objects.requireNonNull(callback, "callback cannot be null"); + // Work around VoiceInteractionManagerService resetting default assistant upon force + // stop on pre-V platforms (b/191743558). + if (!SdkLevel.isAtLeastV() && Objects.equals(roleName, RoleManager.ROLE_ASSISTANT) + && Binder.getCallingUid() == Process.myUid()) { + StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace(); + boolean isCallFromForceStop = false; + for (StackTraceElement stackTraceElement : stackTraceElements) { + if (stackTraceElement.getClassName().contains( + "com.android.server.voiceinteraction.VoiceInteractionManagerService") + && stackTraceElement.getMethodName().equals("onHandleForceStop")) { + isCallFromForceStop = true; + break; + } + } + if (isCallFromForceStop) { + Log.i(LOG_TAG, "Ignoring clearRoleHoldersAsUser() call from" + + " VoiceInteractionManagerService due to force stopping the current" + + " assistant"); + ForegroundThread.getHandler().post(() -> { + // Notify the callback as if this call has failed for some reason. + callback.sendResult(null); + // Announce a role holder change to trigger the default assistant to be + // re-configured in VoiceInteractionManagerService. + onRoleHoldersChanged(roleName, userId); + }); + return; + } + } + getOrCreateController(userId).onClearRoleHolders(roleName, flags, callback); } @Override @Nullable public String getDefaultApplicationAsUser(@NonNull String roleName, @UserIdInt int userId) { + // The MANAGE_DEFAULT_APPLICATIONS permission is only available on U+ + Preconditions.checkState(SdkLevel.isAtLeastU(), + "This API is only available on Android 34 and above"); UserUtils.enforceCrossUserPermission(userId, /* allowAll= */ false, /* enforceForProfileGroup= */ false, "getDefaultApplicationAsUser", getContext()); @@ -744,6 +791,9 @@ public class RoleService extends SystemService implements RoleUserState.Callback public void setDefaultApplicationAsUser(@NonNull String roleName, @Nullable String packageName, @RoleManager.ManageHoldersFlags int flags, @UserIdInt int userId, @NonNull RemoteCallback callback) { + // The MANAGE_DEFAULT_APPLICATIONS permission is only available on U+ + Preconditions.checkState(SdkLevel.isAtLeastU(), + "This API is only available on Android 34 and above"); boolean enforceForProfileGroup = isProfileGroupExclusiveRole(roleName, getContext()); UserUtils.enforceCrossUserPermission(userId, /* allowAll= */ false, enforceForProfileGroup, "setDefaultApplicationAsUser", getContext()); @@ -1192,8 +1242,10 @@ public class RoleService extends SystemService implements RoleUserState.Callback return getOrCreateController(userId).isApplicationVisibleForRole(roleName, packageName); } + @NonNull @Override - public List<String> getDefaultHoldersForTest(String roleName) { + public List<String> getDefaultHoldersForTestAsUser(@NonNull String roleName, + @UserIdInt int userId) { Preconditions.checkState(RoleFlags.isProfileGroupExclusivityAvailable(), "getDefaultHoldersForTest not available"); getContext().enforceCallingOrSelfPermission(Manifest.permission.MANAGE_ROLE_HOLDERS, @@ -1201,31 +1253,25 @@ public class RoleService extends SystemService implements RoleUserState.Callback Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); Preconditions.checkArgumentIsSupported(TEST_ROLES, roleName); - synchronized (mLock) { - return mDefaultHoldersForTest.getOrDefault(roleName, Collections.emptyList()); - } + return getOrCreateUserState(userId).getDefaultHoldersForTest(roleName); } @Override - public void setDefaultHoldersForTest(String roleName, List<String> packageNames) { + public void setDefaultHoldersForTestAsUser(@NonNull String roleName, + @NonNull List<String> packageNames, @UserIdInt int userId) { Preconditions.checkState(RoleFlags.isProfileGroupExclusivityAvailable(), "setDefaultHoldersForTest not available"); getContext().enforceCallingOrSelfPermission(Manifest.permission.MANAGE_ROLE_HOLDERS, "setDefaultHoldersForTest"); Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); Preconditions.checkArgumentIsSupported(TEST_ROLES, roleName); + Objects.requireNonNull(packageNames, "packageNames cannot be null"); - synchronized (mLock) { - if (packageNames == null || packageNames.isEmpty()) { - mDefaultHoldersForTest.remove(roleName); - } else { - mDefaultHoldersForTest.put(roleName, packageNames); - } - } + getOrCreateUserState(userId).setDefaultHoldersForTest(roleName, packageNames); } @Override - public boolean isRoleVisibleForTest(String roleName) { + public boolean isRoleVisibleForTestAsUser(@NonNull String roleName, @UserIdInt int userId) { Preconditions.checkState(RoleFlags.isProfileGroupExclusivityAvailable(), "isRoleVisibleForTest not available"); getContext().enforceCallingOrSelfPermission(Manifest.permission.MANAGE_ROLE_HOLDERS, @@ -1233,13 +1279,12 @@ public class RoleService extends SystemService implements RoleUserState.Callback Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); Preconditions.checkArgumentIsSupported(TEST_ROLES, roleName); - synchronized (mLock) { - return mRolesVisibleForTest.contains(roleName); - } + return getOrCreateUserState(userId).isRoleVisibleForTest(roleName); } @Override - public void setRoleVisibleForTest(String roleName, boolean visible) { + public void setRoleVisibleForTestAsUser(@NonNull String roleName, boolean visible, + @UserIdInt int userId) { Preconditions.checkState(RoleFlags.isProfileGroupExclusivityAvailable(), "setRoleVisibleForTest not available"); getContext().enforceCallingOrSelfPermission(Manifest.permission.MANAGE_ROLE_HOLDERS, @@ -1247,13 +1292,7 @@ public class RoleService extends SystemService implements RoleUserState.Callback Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty"); Preconditions.checkArgumentIsSupported(TEST_ROLES, roleName); - synchronized (mLock) { - if (visible) { - mRolesVisibleForTest.add(roleName); - } else { - mRolesVisibleForTest.remove(roleName); - } - } + getOrCreateUserState(userId).setRoleVisibleForTest(roleName, visible); } @Override diff --git a/service/java/com/android/role/RoleUserState.java b/service/java/com/android/role/RoleUserState.java index c94b58826..18574a6fc 100644 --- a/service/java/com/android/role/RoleUserState.java +++ b/service/java/com/android/role/RoleUserState.java @@ -102,6 +102,14 @@ class RoleUserState { private ArrayMap<String, Integer> mActiveUserIds = new ArrayMap<>(); @GuardedBy("mLock") + @NonNull + private final Map<String, List<String>> mDefaultHoldersForTest = new ArrayMap<>(); + + @GuardedBy("mLock") + @NonNull + private final Set<String> mRolesVisibleForTest = new ArraySet<>(); + + @GuardedBy("mLock") private boolean mWriteScheduled; @GuardedBy("mLock") @@ -439,6 +447,22 @@ class RoleUserState { } } + @NonNull + public List<String> getActiveRolesForUser(@UserIdInt int userId) { + synchronized (mLock) { + List<String> activeRoleNames = new ArrayList<>(); + int activeUserIdsSize = mActiveUserIds.size(); + for (int i = 0; i < activeUserIdsSize; i++) { + int activeUserId = mActiveUserIds.valueAt(i); + if (activeUserId == userId) { + String roleName = mActiveUserIds.keyAt(i); + activeRoleNames.add(roleName); + } + } + return activeRoleNames; + } + } + /** * Set the active user for the role * @@ -464,6 +488,36 @@ class RoleUserState { } } + @NonNull + public List<String> getDefaultHoldersForTest(@NonNull String roleName) { + synchronized (mLock) { + return mDefaultHoldersForTest.getOrDefault(roleName, Collections.emptyList()); + } + } + + public void setDefaultHoldersForTest(@NonNull String roleName, + @NonNull List<String> packageNames) { + synchronized (mLock) { + mDefaultHoldersForTest.put(roleName, packageNames); + } + } + + public boolean isRoleVisibleForTest(@NonNull String roleName) { + synchronized (mLock) { + return mRolesVisibleForTest.contains(roleName); + } + } + + public void setRoleVisibleForTest(@NonNull String roleName, boolean visible) { + synchronized (mLock) { + if (visible) { + mRolesVisibleForTest.add(roleName); + } else { + mRolesVisibleForTest.remove(roleName); + } + } + } + /** * Schedule writing the state to file. */ diff --git a/service/java/com/android/role/TEST_MAPPING b/service/java/com/android/role/TEST_MAPPING index e0e1160d8..720330f82 100644 --- a/service/java/com/android/role/TEST_MAPPING +++ b/service/java/com/android/role/TEST_MAPPING @@ -15,6 +15,9 @@ "exclude-annotation": "androidx.test.filters.FlakyTest" } ] + }, + { + "name": "CtsRoleMultiUserTestCases" } ], "mainline-presubmit": [ @@ -32,6 +35,9 @@ "exclude-annotation": "androidx.test.filters.FlakyTest" } ] + }, + { + "name": "CtsRoleMultiUserTestCases[com.google.android.permission.apex]" } ], "permission-mainline-presubmit": [ @@ -49,6 +55,9 @@ "exclude-annotation": "androidx.test.filters.FlakyTest" } ] + }, + { + "name": "CtsRoleMultiUserTestCases" } ], "postsubmit": [ diff --git a/service/java/com/android/safetycenter/UserProfileGroup.java b/service/java/com/android/safetycenter/UserProfileGroup.java index 1f5258437..44cb8d3d6 100644 --- a/service/java/com/android/safetycenter/UserProfileGroup.java +++ b/service/java/com/android/safetycenter/UserProfileGroup.java @@ -129,9 +129,8 @@ public final class UserProfileGroup { * is disabled. */ public static UserProfileGroup fromUser(Context context, @UserIdInt int userId) { - Context userContext = UserUtils.getUserContext(userId, context); - List<UserHandle> userProfiles = UserUtils.getUserProfiles(userContext); - int profileParentUserId = UserUtils.getProfileParentIdOrSelf(userId, userContext); + List<UserHandle> userProfiles = UserUtils.getUserProfiles(userId, context); + int profileParentUserId = UserUtils.getProfileParentIdOrSelf(userId, context); int[] managedProfilesUserIds = new int[userProfiles.size()]; int[] managedRunningProfilesUserIds = new int[userProfiles.size()]; diff --git a/tests/cts/permission/AndroidManifest.xml b/tests/cts/permission/AndroidManifest.xml index bb027b5f2..43fd97bb2 100644 --- a/tests/cts/permission/AndroidManifest.xml +++ b/tests/cts/permission/AndroidManifest.xml @@ -51,9 +51,6 @@ android:label="@string/perm_group_c" android:name="android.permission.cts.groupC"/> - <!-- for android.permission.cts.DevicePermissionsTest --> - <uses-permission android:name="android.permission.CREATE_VIRTUAL_DEVICE"/> - <uses-permission android:name="android.permission.INJECT_EVENTS"/> <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/> <application> diff --git a/tests/cts/permission/permissionTestUtilLib/src/android/permission/cts/PermissionUtils.java b/tests/cts/permission/permissionTestUtilLib/src/android/permission/cts/PermissionUtils.java index aabdd8565..55c2d9f31 100644 --- a/tests/cts/permission/permissionTestUtilLib/src/android/permission/cts/PermissionUtils.java +++ b/tests/cts/permission/permissionTestUtilLib/src/android/permission/cts/PermissionUtils.java @@ -384,7 +384,7 @@ public class PermissionUtils { simulateReboot(packageName, intentAction, broadcastReceiver); while ((System.currentTimeMillis() - startTime) < timeout - && !jobStatus.contains("waiting")) { + && !isJobScheduled(jobStatus)) { String cmd = "cmd jobscheduler get-job-state -u " + Process.myUserHandle().getIdentifier() + " " + packageName + " " + jobId; @@ -396,11 +396,16 @@ public class PermissionUtils { // ignore interrupt } } - if (!jobStatus.contains("waiting")) { + if (!isJobScheduled(jobStatus)) { throw new IllegalStateException("The job didn't get scheduled in time."); } } + private static boolean isJobScheduled(String jobStatus) throws Exception { + return jobStatus.contains("waiting") || jobStatus.contains("pending") + || jobStatus.contains("ready") || jobStatus.contains("active"); + } + private static void simulateReboot(@NonNull String packageName, @NonNull String intentAction, @NonNull String broadcastReceiver) { Intent jobSetupReceiverIntent = new Intent(intentAction); diff --git a/tests/cts/permission/permissionTestUtilLib/src/android/permission/cts/TestUtils.java b/tests/cts/permission/permissionTestUtilLib/src/android/permission/cts/TestUtils.java index 48ccbe79f..96b3c4cc4 100644 --- a/tests/cts/permission/permissionTestUtilLib/src/android/permission/cts/TestUtils.java +++ b/tests/cts/permission/permissionTestUtilLib/src/android/permission/cts/TestUtils.java @@ -19,7 +19,10 @@ package android.permission.cts; import static com.android.compatibility.common.util.SystemUtil.runShellCommand; import android.app.UiAutomation; +import android.content.res.Configuration; +import android.content.res.Resources; import android.os.Process; +import android.util.DisplayMetrics; import android.util.Log; import androidx.annotation.NonNull; @@ -202,4 +205,47 @@ public class TestUtils { throw new RuntimeException(e); } } + + /** + * This method checks for the minimum screen size described in <a href="https://source.android.com/docs/compatibility/14/android-14-cdd#7111_screen_size_and_shape">CDD</a> + */ + public static boolean isCddCompliantScreenSize() { + if ((Resources.getSystem().getConfiguration().uiMode & Configuration.UI_MODE_TYPE_MASK) + == Configuration.UI_MODE_TYPE_WATCH) { + Log.d(LOG_TAG, "UI mode is UI_MODE_TYPE_WATCH, skipping the min dp check"); + return true; + } + + int screenSize = Resources.getSystem().getConfiguration().screenLayout + & Configuration.SCREENLAYOUT_SIZE_MASK; + return switch (screenSize) { + case Configuration.SCREENLAYOUT_SIZE_SMALL -> hasMinScreenSize(426, 320); + case Configuration.SCREENLAYOUT_SIZE_NORMAL -> hasMinScreenSize(480, 320); + case Configuration.SCREENLAYOUT_SIZE_LARGE -> hasMinScreenSize(640, 480); + case Configuration.SCREENLAYOUT_SIZE_XLARGE -> hasMinScreenSize(960, 720); + default -> { + Log.e(LOG_TAG, "Unknown screen size: " + screenSize); + yield true; + } + }; + } + + private static boolean hasMinScreenSize(int minWidthDp, int minHeightDp) { + DisplayMetrics metrics = Resources.getSystem().getDisplayMetrics(); + float widthDp = (160f / metrics.densityDpi) * metrics.widthPixels; + float heightDp = (160f / metrics.densityDpi) * metrics.heightPixels; + + // CDD does not seem to follow width & height convention correctly, hence checking both ways + boolean hasMinScreenSize = (widthDp >= minWidthDp && heightDp >= minHeightDp) + || (widthDp >= minHeightDp && heightDp >= minWidthDp); + if (!hasMinScreenSize) { + Log.d(LOG_TAG, + "Does not meet min screen size criteria, actual width/height = " + + metrics.widthPixels + "/" + metrics.heightPixels + + " expected minimum width/height = " + minWidthDp + "/" + minHeightDp + + " dpi=" + + metrics.densityDpi); + } + return hasMinScreenSize; + } } diff --git a/tests/cts/permission/src/android/permission/cts/DevicePermissionsTest.kt b/tests/cts/permission/src/android/permission/cts/DevicePermissionsTest.kt index ff333c6a0..145936382 100644 --- a/tests/cts/permission/src/android/permission/cts/DevicePermissionsTest.kt +++ b/tests/cts/permission/src/android/permission/cts/DevicePermissionsTest.kt @@ -22,6 +22,10 @@ import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_S import android.app.Instrumentation import android.companion.virtual.VirtualDeviceManager.PERSISTENT_DEVICE_ID_DEFAULT import android.companion.virtual.VirtualDeviceManager.VirtualDevice +import android.companion.virtual.VirtualDeviceParams +import android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_CUSTOM +import android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT +import android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_AUDIO import android.content.Context import android.content.Intent import android.content.pm.PackageManager.FLAG_PERMISSION_ONE_TIME @@ -33,10 +37,7 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED import android.os.Build import android.os.UserHandle import android.permission.PermissionManager -import android.permission.flags.Flags import android.platform.test.annotations.AppModeFull -import android.platform.test.annotations.RequiresFlagsDisabled -import android.platform.test.annotations.RequiresFlagsEnabled import android.platform.test.flag.junit.DeviceFlagsValueProvider import android.virtualdevice.cts.common.VirtualDeviceRule import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -66,18 +67,25 @@ class DevicePermissionsTest { private lateinit var permissionManager: PermissionManager @get:Rule - var mVirtualDeviceRule = VirtualDeviceRule.withAdditionalPermissions( + var mVirtualDeviceRule = + VirtualDeviceRule.withAdditionalPermissions( Manifest.permission.GRANT_RUNTIME_PERMISSIONS, Manifest.permission.MANAGE_ONE_TIME_PERMISSION_SESSIONS, Manifest.permission.REVOKE_RUNTIME_PERMISSIONS, - Manifest.permission.GET_RUNTIME_PERMISSIONS + Manifest.permission.GET_RUNTIME_PERMISSIONS, ) @Rule @JvmField val mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() @Before fun setup() { - virtualDevice = mVirtualDeviceRule.createManagedVirtualDevice() + virtualDevice = + mVirtualDeviceRule.createManagedVirtualDevice( + // Without custom audio policy, the RECORD_AUDIO permission won't be device aware. + VirtualDeviceParams.Builder() + .setDevicePolicy(POLICY_TYPE_AUDIO, DEVICE_POLICY_CUSTOM) + .build() + ) virtualDeviceContext = defaultDeviceContext.createDeviceContext(virtualDevice.deviceId) permissionManager = virtualDeviceContext.getSystemService(PermissionManager::class.java)!! persistentDeviceId = virtualDevice.persistentDeviceId!! @@ -89,43 +97,47 @@ class DevicePermissionsTest { runShellCommandOrThrow("pm uninstall $TEST_PACKAGE_NAME") } - @RequiresFlagsEnabled( - Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED - ) @Test - fun testDeviceAwareRuntimePermissionIsGranted() { - grantPermissionAndAssertGranted(Manifest.permission.CAMERA, virtualDeviceContext) + fun virtualDeviceDefaultPolicy_deviceAwarePermissionFallsBackToDefaultDevice() { + virtualDevice = + mVirtualDeviceRule.createManagedVirtualDevice( + // With default audio policy, the RECORD_AUDIO permission won't be device aware. + VirtualDeviceParams.Builder() + .setDevicePolicy(POLICY_TYPE_AUDIO, DEVICE_POLICY_DEFAULT) + .build() + ) + virtualDeviceContext = defaultDeviceContext.createDeviceContext(virtualDevice.deviceId) + + grantPermissionAndAssertGranted(DEVICE_AWARE_PERMISSION, defaultDeviceContext) + assertPermission(DEVICE_AWARE_PERMISSION, PERMISSION_GRANTED, virtualDeviceContext) } - @RequiresFlagsDisabled(Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED) @Test - fun testDeviceAwareRuntimePermissionGrantIsInherited() { - grantPermissionAndAssertGranted(Manifest.permission.CAMERA, defaultDeviceContext) + fun virtualDeviceCustomPolicy_deviceAwarePermissionGrantedOnVirtualDevice() { + // When a device aware permission is granted on the default device, it's not automatically + // granted on the virtual device. + grantPermissionAndAssertGranted(DEVICE_AWARE_PERMISSION, defaultDeviceContext) + assertPermission(DEVICE_AWARE_PERMISSION, PERMISSION_DENIED, virtualDeviceContext) - assertPermission(Manifest.permission.CAMERA, PERMISSION_GRANTED, virtualDeviceContext) + grantPermissionAndAssertGranted(DEVICE_AWARE_PERMISSION, virtualDeviceContext) } @Test - fun testNonDeviceAwareRuntimePermissionGrantIsInherited() { + fun normalPermissionGrantedOnDefaultDevice_isGrantedOnVirtualDevice() { grantPermissionAndAssertGranted(NON_DEVICE_AWARE_PERMISSION, defaultDeviceContext) assertPermission(NON_DEVICE_AWARE_PERMISSION, PERMISSION_GRANTED, virtualDeviceContext) } - @RequiresFlagsEnabled( - Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED - ) @Test - fun testDeviceAwareRuntimePermissionIsRevoked() { + fun virtualDeviceCustomPolicy_deviceAwarePermissionIsRevoked() { grantPermissionAndAssertGranted(DEVICE_AWARE_PERMISSION, virtualDeviceContext) revokePermissionAndAssertDenied(DEVICE_AWARE_PERMISSION, virtualDeviceContext) } @Test - fun testNonDeviceAwareRuntimePermissionIsRevokedForDefaultDevice() { + fun normalPermissionRevokedFromVirtualDevice_isAlsoRevokedOnDefaultDevice() { grantPermissionAndAssertGranted(NON_DEVICE_AWARE_PERMISSION, defaultDeviceContext) assertPermission(NON_DEVICE_AWARE_PERMISSION, PERMISSION_GRANTED, virtualDeviceContext) // Revoke call from virtualDeviceContext should revoke for default device as well. @@ -134,24 +146,24 @@ class DevicePermissionsTest { } @Test - fun testNormalPermissionGrantIsInherited() { + fun normalPermission_isInheritedOnVirtualDevice() { assertPermission(Manifest.permission.INTERNET, PERMISSION_GRANTED, virtualDeviceContext) } @Test - fun testSignaturePermissionGrantIsInherited() { + fun signaturePermission_isInheritedOnVirtualDevice() { assertPermission(CUSTOM_SIGNATURE_PERMISSION, PERMISSION_GRANTED, virtualDeviceContext) } @Test - fun testOneTimePermissionIsRevoked() { + fun virtualDeviceCustomPolicy_oneTimePermissionIsRevoked() { grantPermissionAndAssertGranted(DEVICE_AWARE_PERMISSION, virtualDeviceContext) virtualDeviceContext.packageManager.updatePermissionFlags( DEVICE_AWARE_PERMISSION, TEST_PACKAGE_NAME, FLAG_PERMISSION_ONE_TIME, FLAG_PERMISSION_ONE_TIME, - UserHandle.of(virtualDeviceContext.userId) + UserHandle.of(virtualDeviceContext.userId), ) permissionManager.startOneTimePermissionSession( @@ -159,19 +171,15 @@ class DevicePermissionsTest { 0, 0, IMPORTANCE_FOREGROUND, - IMPORTANCE_FOREGROUND_SERVICE + IMPORTANCE_FOREGROUND_SERVICE, ) eventually { assertPermission(DEVICE_AWARE_PERMISSION, PERMISSION_DENIED, virtualDeviceContext) } } - @RequiresFlagsEnabled( - Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED - ) @Test - fun testRevokeSelfPermissionOnKill() { + fun virtualDeviceCustomPolicy_revokeSelfPermissionOnKill_permissionIsRevoked() { grantPermissionAndAssertGranted(DEVICE_AWARE_PERMISSION, virtualDeviceContext) revokeSelfPermission(DEVICE_AWARE_PERMISSION, virtualDeviceContext) @@ -180,105 +188,90 @@ class DevicePermissionsTest { } } - @RequiresFlagsEnabled( - Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED - ) @Test - fun testGrantAndRevokeDeviceAwarePermissionByPersistentDeviceId() { - val deviceAwarePermission = DEVICE_AWARE_PERMISSION - + fun usePersistentDeviceIdToRevokeDeviceAwarePermission_permissionIsRevoked() { permissionManager.grantRuntimePermission( TEST_PACKAGE_NAME, - deviceAwarePermission, - persistentDeviceId + DEVICE_AWARE_PERMISSION, + persistentDeviceId, ) assertThat( permissionManager.checkPermission( - deviceAwarePermission, + DEVICE_AWARE_PERMISSION, TEST_PACKAGE_NAME, - virtualDevice.persistentDeviceId!! + virtualDevice.persistentDeviceId!!, ) ) .isEqualTo(PERMISSION_GRANTED) assertThat( permissionManager.checkPermission( - deviceAwarePermission, + DEVICE_AWARE_PERMISSION, TEST_PACKAGE_NAME, - PERSISTENT_DEVICE_ID_DEFAULT + PERSISTENT_DEVICE_ID_DEFAULT, ) ) .isEqualTo(PERMISSION_DENIED) permissionManager.revokeRuntimePermission( TEST_PACKAGE_NAME, - deviceAwarePermission, + DEVICE_AWARE_PERMISSION, persistentDeviceId, - "test" + "test", ) assertThat( permissionManager.checkPermission( - deviceAwarePermission, + DEVICE_AWARE_PERMISSION, TEST_PACKAGE_NAME, - virtualDevice.persistentDeviceId!! + virtualDevice.persistentDeviceId!!, ) ) .isEqualTo(PERMISSION_DENIED) } - @RequiresFlagsEnabled( - Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED - ) @Test - fun testUpdateAndGetPermissionFlagsByPersistentDeviceId() { - val deviceAwarePermission = DEVICE_AWARE_PERMISSION + fun updateAndGetPermissionFlagsByPersistentDeviceId() { val flagMask = FLAG_PERMISSION_USER_SET or FLAG_PERMISSION_USER_FIXED val flag = FLAG_PERMISSION_USER_SET assertThat( permissionManager.getPermissionFlags( TEST_PACKAGE_NAME, - deviceAwarePermission, - persistentDeviceId + DEVICE_AWARE_PERMISSION, + persistentDeviceId, ) ) .isEqualTo(0) permissionManager.updatePermissionFlags( TEST_PACKAGE_NAME, - deviceAwarePermission, + DEVICE_AWARE_PERMISSION, persistentDeviceId, flagMask, - flag + flag, ) assertThat( permissionManager.getPermissionFlags( TEST_PACKAGE_NAME, - deviceAwarePermission, - persistentDeviceId + DEVICE_AWARE_PERMISSION, + persistentDeviceId, ) ) .isEqualTo(FLAG_PERMISSION_USER_SET) } - @RequiresFlagsEnabled( - Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED - ) @Test - fun testAllPermissionStatesApiGrantForVirtualDevice() { + fun permissionGrantedOnVirtualDevice_reflectedInGetAllPermissionStatesApi() { // Setting a flag explicitly so that the permission consistently stays in the state permissionManager.updatePermissionFlags( TEST_PACKAGE_NAME, DEVICE_AWARE_PERMISSION, PERSISTENT_DEVICE_ID_DEFAULT, FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED, - FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED + FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED, ) assertThat( @@ -291,7 +284,7 @@ class DevicePermissionsTest { permissionManager.grantRuntimePermission( TEST_PACKAGE_NAME, DEVICE_AWARE_PERMISSION, - persistentDeviceId + persistentDeviceId, ) val permissionStateMap = @@ -312,7 +305,7 @@ class DevicePermissionsTest { TEST_PACKAGE_NAME, DEVICE_AWARE_PERMISSION, persistentDeviceId, - "test" + "test", ) assertThat( @@ -323,12 +316,8 @@ class DevicePermissionsTest { .isFalse() } - @RequiresFlagsEnabled( - Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED - ) @Test - fun testAllPermissionStatesApiFlagsForVirtualDevice() { + fun setPermissionFlagOnVirtualDevice_reflectedInGetAllPermissionStatesApi() { val flagMask = FLAG_PERMISSION_USER_SET or FLAG_PERMISSION_USER_FIXED val flag = FLAG_PERMISSION_USER_SET @@ -340,7 +329,7 @@ class DevicePermissionsTest { DEVICE_AWARE_PERMISSION, persistentDeviceId, flagMask, - flag + flag, ) assertThat( @@ -349,7 +338,7 @@ class DevicePermissionsTest { .getAllPermissionStates(TEST_PACKAGE_NAME, persistentDeviceId)[ DEVICE_AWARE_PERMISSION]!! .flags, - flag + flag, ) ) .isTrue() @@ -360,15 +349,14 @@ class DevicePermissionsTest { .getAllPermissionStates(TEST_PACKAGE_NAME, persistentDeviceId)[ DEVICE_AWARE_PERMISSION]!! .flags, - FLAG_PERMISSION_USER_FIXED + FLAG_PERMISSION_USER_FIXED, ) ) .isFalse() } - @RequiresFlagsEnabled(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED) @Test - fun testAllPermissionStatesApiGrantForDefaultDevice() { + fun permissionGrantedOnDefaultDevice_reflectedInGetAllPermissionStatesApi() { // Setting a flag explicitly so that the permission consistently stays in the state upon // revoke permissionManager.updatePermissionFlags( @@ -376,13 +364,13 @@ class DevicePermissionsTest { DEVICE_AWARE_PERMISSION, PERSISTENT_DEVICE_ID_DEFAULT, FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED, - FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED + FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED, ) permissionManager.grantRuntimePermission( TEST_PACKAGE_NAME, DEVICE_AWARE_PERMISSION, - PERSISTENT_DEVICE_ID_DEFAULT + PERSISTENT_DEVICE_ID_DEFAULT, ) assertThat( @@ -404,7 +392,7 @@ class DevicePermissionsTest { TEST_PACKAGE_NAME, DEVICE_AWARE_PERMISSION, PERSISTENT_DEVICE_ID_DEFAULT, - "test" + "test", ) assertThat( @@ -416,9 +404,8 @@ class DevicePermissionsTest { .isFalse() } - @RequiresFlagsEnabled(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED) @Test - fun testAllPermissionStatesApiFlagsForDefaultDevice() { + fun setPermissionFlagOnDefaultDevice_reflectedInGetAllPermissionStatesApi() { val flagMask = FLAG_PERMISSION_USER_SET or FLAG_PERMISSION_USER_FIXED val flag = FLAG_PERMISSION_USER_SET @@ -434,7 +421,7 @@ class DevicePermissionsTest { DEVICE_AWARE_PERMISSION, PERSISTENT_DEVICE_ID_DEFAULT, flagMask, - flag + flag, ) assertThat( @@ -443,7 +430,7 @@ class DevicePermissionsTest { .getAllPermissionStates(TEST_PACKAGE_NAME, PERSISTENT_DEVICE_ID_DEFAULT)[ DEVICE_AWARE_PERMISSION]!! .flags, - flag + flag, ) ) .isTrue() @@ -454,19 +441,18 @@ class DevicePermissionsTest { .getAllPermissionStates(TEST_PACKAGE_NAME, PERSISTENT_DEVICE_ID_DEFAULT)[ DEVICE_AWARE_PERMISSION]!! .flags, - FLAG_PERMISSION_USER_FIXED + FLAG_PERMISSION_USER_FIXED, ) ) .isFalse() } - @RequiresFlagsEnabled(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED) @Test - fun testAllPermissionStatesApiThatNonDeviceAwareRuntimePermissionGrantIsNotInherited() { + fun getAllPermissionStates_normalPermissionIsNotInherited() { permissionManager.grantRuntimePermission( TEST_PACKAGE_NAME, NON_DEVICE_AWARE_PERMISSION, - PERSISTENT_DEVICE_ID_DEFAULT + PERSISTENT_DEVICE_ID_DEFAULT, ) assertThat( @@ -501,7 +487,7 @@ class DevicePermissionsTest { context.packageManager.grantRuntimePermission( TEST_PACKAGE_NAME, permissionName, - UserHandle.of(context.userId) + UserHandle.of(context.userId), ) assertPermission(permissionName, PERMISSION_GRANTED, context) } @@ -510,18 +496,14 @@ class DevicePermissionsTest { context.packageManager.revokeRuntimePermission( TEST_PACKAGE_NAME, permissionName, - UserHandle.of(context.userId) + UserHandle.of(context.userId), ) assertPermission(permissionName, PERMISSION_DENIED, context) } - private fun assertPermission( - permissionName: String, - permissionState: Int, - context: Context, - ) { - assertThat(context.packageManager.checkPermission(permissionName, TEST_PACKAGE_NAME)) - .isEqualTo(permissionState) + private fun assertPermission(permissionName: String, permissionState: Int, context: Context) { + val uid = defaultDeviceContext.packageManager.getApplicationInfo(TEST_PACKAGE_NAME, 0).uid + assertThat(context.checkPermission(permissionName, -1, uid)).isEqualTo(permissionState) } companion object { diff --git a/tests/cts/permission/src/android/permission/cts/NoSystemFunctionPermissionTest.java b/tests/cts/permission/src/android/permission/cts/NoSystemFunctionPermissionTest.java index 437aa19c4..ce724b13e 100644 --- a/tests/cts/permission/src/android/permission/cts/NoSystemFunctionPermissionTest.java +++ b/tests/cts/permission/src/android/permission/cts/NoSystemFunctionPermissionTest.java @@ -166,7 +166,8 @@ public class NoSystemFunctionPermissionTest extends AndroidTestCase { */ @SmallTest public void testSendSms() { - if (!getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) { + if (!getContext().getPackageManager().hasSystemFeature( + PackageManager.FEATURE_TELEPHONY_MESSAGING)) { return; } diff --git a/tests/cts/permission/src/android/permission/cts/PermissionUpdateListenerTest.java b/tests/cts/permission/src/android/permission/cts/PermissionUpdateListenerTest.java index 4325ace79..86b8fa895 100644 --- a/tests/cts/permission/src/android/permission/cts/PermissionUpdateListenerTest.java +++ b/tests/cts/permission/src/android/permission/cts/PermissionUpdateListenerTest.java @@ -18,10 +18,10 @@ package android.permission.cts; import static com.android.compatibility.common.util.ShellUtils.runShellCommand; import static com.android.compatibility.common.util.SystemUtil.runShellCommandOrThrow; -import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity; import static com.google.common.truth.Truth.assertThat; +import android.Manifest; import android.companion.virtual.VirtualDeviceManager; import android.companion.virtual.VirtualDeviceManager.VirtualDevice; import android.content.Context; @@ -30,8 +30,6 @@ import android.content.pm.PackageManager.OnPermissionsChangedListener; import android.permission.flags.Flags; import android.platform.test.annotations.AppModeFull; import android.platform.test.annotations.RequiresFlagsEnabled; -import android.platform.test.flag.junit.CheckFlagsRule; -import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.virtualdevice.cts.common.VirtualDeviceRule; import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner; @@ -69,10 +67,10 @@ public class PermissionUpdateListenerTest { private int mTestAppUid; @Rule - public VirtualDeviceRule mVirtualDeviceRule = VirtualDeviceRule.createDefault(); - - @Rule - public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); + public VirtualDeviceRule mVirtualDeviceRule = VirtualDeviceRule.withAdditionalPermissions( + "android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS", + Manifest.permission.GRANT_RUNTIME_PERMISSIONS, + Manifest.permission.REVOKE_RUNTIME_PERMISSIONS); @Before public void setup() throws PackageManager.NameNotFoundException, InterruptedException { @@ -99,15 +97,11 @@ public class PermissionUpdateListenerTest { } }; - runWithShellPermissionIdentity(() -> { - mPackageManager.addOnPermissionsChangeListener(permissionsChangedListener); - mPackageManager.grantRuntimePermission(PACKAGE_NAME, PERMISSION_NAME, - mDefaultContext.getUser()); - }); + mPackageManager.addOnPermissionsChangeListener(permissionsChangedListener); + mPackageManager.grantRuntimePermission(PACKAGE_NAME, PERMISSION_NAME, + mDefaultContext.getUser()); countDownLatch.await(TIMEOUT, TimeUnit.MILLISECONDS); - runWithShellPermissionIdentity(() -> { - mPackageManager.removeOnPermissionsChangeListener(permissionsChangedListener); - }); + mPackageManager.removeOnPermissionsChangeListener(permissionsChangedListener); assertThat(countDownLatch.getCount()).isEqualTo(0); } @@ -132,16 +126,12 @@ public class PermissionUpdateListenerTest { final PackageManager packageManager = context.getPackageManager(); TestOnPermissionsChangedListener permissionsChangedListener = new TestOnPermissionsChangedListener(1); - runWithShellPermissionIdentity(() -> { - packageManager.addOnPermissionsChangeListener(permissionsChangedListener); - packageManager.grantRuntimePermission(PACKAGE_NAME, PERMISSION_NAME, - mDefaultContext.getUser()); - }); + packageManager.addOnPermissionsChangeListener(permissionsChangedListener); + packageManager.grantRuntimePermission(PACKAGE_NAME, PERMISSION_NAME, + mDefaultContext.getUser()); permissionsChangedListener.waitForPermissionChangedCallbacks(); - runWithShellPermissionIdentity(() -> { - packageManager.removeOnPermissionsChangeListener(permissionsChangedListener); - }); + packageManager.removeOnPermissionsChangeListener(permissionsChangedListener); String deviceId = permissionsChangedListener.getNotifiedDeviceId(mTestAppUid); assertThat(deviceId).isEqualTo(expectedDeviceId); @@ -168,17 +158,14 @@ public class PermissionUpdateListenerTest { final PackageManager packageManager = context.getPackageManager(); TestOnPermissionsChangedListener permissionsChangedListener = new TestOnPermissionsChangedListener(1); - runWithShellPermissionIdentity(() -> { - packageManager.grantRuntimePermission(PACKAGE_NAME, PERMISSION_NAME, - mDefaultContext.getUser()); - packageManager.addOnPermissionsChangeListener(permissionsChangedListener); - packageManager.revokeRuntimePermission(PACKAGE_NAME, PERMISSION_NAME, - mDefaultContext.getUser()); - }); + packageManager.grantRuntimePermission(PACKAGE_NAME, PERMISSION_NAME, + mDefaultContext.getUser()); + packageManager.addOnPermissionsChangeListener(permissionsChangedListener); + packageManager.revokeRuntimePermission(PACKAGE_NAME, PERMISSION_NAME, + mDefaultContext.getUser()); + permissionsChangedListener.waitForPermissionChangedCallbacks(); - runWithShellPermissionIdentity(() -> { - packageManager.removeOnPermissionsChangeListener(permissionsChangedListener); - }); + packageManager.removeOnPermissionsChangeListener(permissionsChangedListener); String deviceId = permissionsChangedListener.getNotifiedDeviceId(mTestAppUid); assertThat(deviceId).isEqualTo(expectedDeviceId); @@ -205,16 +192,12 @@ public class PermissionUpdateListenerTest { TestOnPermissionsChangedListener permissionsChangedListener = new TestOnPermissionsChangedListener(1); final PackageManager packageManager = context.getPackageManager(); - runWithShellPermissionIdentity(() -> { - packageManager.addOnPermissionsChangeListener(permissionsChangedListener); - int flag = PackageManager.FLAG_PERMISSION_USER_SET; - packageManager.updatePermissionFlags(PERMISSION_NAME, PACKAGE_NAME, flag, flag, - mDefaultContext.getUser()); - }); + packageManager.addOnPermissionsChangeListener(permissionsChangedListener); + int flag = PackageManager.FLAG_PERMISSION_USER_SET; + packageManager.updatePermissionFlags(PERMISSION_NAME, PACKAGE_NAME, flag, flag, + mDefaultContext.getUser()); permissionsChangedListener.waitForPermissionChangedCallbacks(); - runWithShellPermissionIdentity(() -> { - packageManager.removeOnPermissionsChangeListener(permissionsChangedListener); - }); + packageManager.removeOnPermissionsChangeListener(permissionsChangedListener); String deviceId = permissionsChangedListener.getNotifiedDeviceId(mTestAppUid); assertThat(deviceId).isEqualTo(expectedDeviceId); diff --git a/tests/cts/permissionmultidevice/AccessRemoteDeviceCameraApp/AndroidManifest.xml b/tests/cts/permissionmultidevice/AccessRemoteDeviceCameraApp/AndroidManifest.xml index 211e415bd..c31bfdaf3 100644 --- a/tests/cts/permissionmultidevice/AccessRemoteDeviceCameraApp/AndroidManifest.xml +++ b/tests/cts/permissionmultidevice/AccessRemoteDeviceCameraApp/AndroidManifest.xml @@ -21,6 +21,7 @@ package="android.permissionmultidevice.cts.accessremotedevicecamera"> <uses-permission android:name="android.permission.CAMERA" /> + <uses-permission android:name="android.permission.READ_CONTACTS" /> <application> <activity android:name=".RequestPermissionActivity" android:exported="true" /> diff --git a/tests/cts/permissionmultidevice/AccessRemoteDeviceCameraApp/src/android/permissionmultidevice/cts/accessremotedevicecamera/RequestPermissionActivity.kt b/tests/cts/permissionmultidevice/AccessRemoteDeviceCameraApp/src/android/permissionmultidevice/cts/accessremotedevicecamera/RequestPermissionActivity.kt index fa1d1f83c..33daa1253 100644 --- a/tests/cts/permissionmultidevice/AccessRemoteDeviceCameraApp/src/android/permissionmultidevice/cts/accessremotedevicecamera/RequestPermissionActivity.kt +++ b/tests/cts/permissionmultidevice/AccessRemoteDeviceCameraApp/src/android/permissionmultidevice/cts/accessremotedevicecamera/RequestPermissionActivity.kt @@ -16,7 +16,6 @@ package android.permissionmultidevice.cts.accessremotedevicecamera -import android.Manifest import android.app.Activity import android.content.Context import android.content.Intent @@ -33,17 +32,24 @@ class RequestPermissionActivity : Activity() { val deviceId = intent.getIntExtra( PackageManager.EXTRA_REQUEST_PERMISSIONS_DEVICE_ID, - Context.DEVICE_ID_DEFAULT + Context.DEVICE_ID_INVALID, ) - requestPermissions(DEVICE_AWARE_PERMISSIONS, 1001, deviceId) + val permissions = + intent.getStringArrayExtra(PackageManager.EXTRA_REQUEST_PERMISSIONS_NAMES)!! + + if (deviceId != Context.DEVICE_ID_INVALID) { + requestPermissions(permissions, 1001, deviceId) + } else { + requestPermissions(permissions, 1001) + } } override fun onRequestPermissionsResult( requestCode: Int, permissions: Array<out String>, grantResults: IntArray, - deviceId: Int + deviceId: Int, ) { val resultReceiver = intent.getParcelableExtra(Intent.EXTRA_RESULT_RECEIVER, RemoteCallback::class.java) @@ -57,8 +63,4 @@ class RequestPermissionActivity : Activity() { resultReceiver?.sendResult(result) finish() } - - companion object { - private val DEVICE_AWARE_PERMISSIONS = arrayOf(Manifest.permission.CAMERA) - } } diff --git a/tests/cts/permissionmultidevice/AndroidManifest.xml b/tests/cts/permissionmultidevice/AndroidManifest.xml index 7d04d140e..9bad85813 100644 --- a/tests/cts/permissionmultidevice/AndroidManifest.xml +++ b/tests/cts/permissionmultidevice/AndroidManifest.xml @@ -24,8 +24,6 @@ <uses-permission android:name="android.permission.DISABLE_KEYGUARD" /> <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> - <uses-permission android:name="android.permission.CREATE_VIRTUAL_DEVICE" /> - <uses-permission android:name="android.permission.ADD_TRUSTED_DISPLAY" /> <application> <uses-library android:name="android.test.runner" /> diff --git a/tests/cts/permissionmultidevice/TestUtils/src/android/permissionmultidevice/cts/PermissionUtils.kt b/tests/cts/permissionmultidevice/TestUtils/src/android/permissionmultidevice/cts/PermissionUtils.kt index 8a6290212..dd2d3e645 100644 --- a/tests/cts/permissionmultidevice/TestUtils/src/android/permissionmultidevice/cts/PermissionUtils.kt +++ b/tests/cts/permissionmultidevice/TestUtils/src/android/permissionmultidevice/cts/PermissionUtils.kt @@ -18,9 +18,6 @@ package android.permissionmultidevice.cts import android.content.Context import android.content.pm.PackageManager -import android.content.res.Configuration -import android.content.res.Resources -import android.util.Log object PermissionUtils { private val TAG = PermissionUtils::class.java.getSimpleName() @@ -33,42 +30,4 @@ object PermissionUtils { fun isWatch(context: Context): Boolean = context.packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH) - - /** - * This method checks for the minimum screen size described in CDD {@see - * https://source.android.com/docs/compatibility/14/android-14-cdd#7111_screen_size_and_shape} - */ - fun isCddCompliantScreenSize(): Boolean { - if ( - Resources.getSystem().configuration.uiMode and Configuration.UI_MODE_TYPE_MASK == - Configuration.UI_MODE_TYPE_WATCH - ) { - Log.d(TAG, "UI mode is UI_MODE_TYPE_WATCH, skipping the min dp check") - return true - } - - val screenSize = - Resources.getSystem().configuration.screenLayout and - Configuration.SCREENLAYOUT_SIZE_MASK - return when (screenSize) { - Configuration.SCREENLAYOUT_SIZE_SMALL -> hasMinScreenSize(426, 320) - Configuration.SCREENLAYOUT_SIZE_NORMAL -> hasMinScreenSize(480, 320) - Configuration.SCREENLAYOUT_SIZE_LARGE -> hasMinScreenSize(640, 480) - Configuration.SCREENLAYOUT_SIZE_XLARGE -> hasMinScreenSize(960, 720) - else -> { - Log.e(TAG, "Unknown screen size: $screenSize") - true - } - } - } - - private fun hasMinScreenSize(minWidthDp: Int, minHeightDp: Int): Boolean { - val dpi = Resources.getSystem().displayMetrics.densityDpi - val widthDp = (160f / dpi) * Resources.getSystem().displayMetrics.widthPixels - val heightDp = (160f / dpi) * Resources.getSystem().displayMetrics.heightPixels - - // CDD does seem to follow width & height convention correctly, hence checking both ways - return (widthDp >= minWidthDp && heightDp >= minHeightDp) || - (widthDp >= minHeightDp && heightDp >= minWidthDp) - } } diff --git a/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/AppPermissionsTest.kt b/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/AppPermissionsTest.kt index ac5564e37..76c86df76 100644 --- a/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/AppPermissionsTest.kt +++ b/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/AppPermissionsTest.kt @@ -26,8 +26,8 @@ import android.content.Intent import android.content.pm.PackageManager import android.os.Build import android.permission.PermissionManager +import android.permission.cts.TestUtils import android.permission.flags.Flags -import android.permissionmultidevice.cts.PermissionUtils.isCddCompliantScreenSize import android.platform.test.annotations.RequiresFlagsEnabled import android.virtualdevice.cts.common.VirtualDeviceRule import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -79,7 +79,7 @@ class AppPermissionsTest { assumeFalse(PermissionUtils.isAutomotive(defaultDeviceContext)) assumeFalse(PermissionUtils.isTv(defaultDeviceContext)) assumeFalse(PermissionUtils.isWatch(defaultDeviceContext)) - assumeTrue(isCddCompliantScreenSize()) + assumeTrue(TestUtils.isCddCompliantScreenSize()) PackageManagementUtils.installPackage(APP_APK_PATH_STREAMING) @@ -108,7 +108,7 @@ class AppPermissionsTest { @RequiresFlagsEnabled( Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED + Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED, ) @Test fun externalDevicePermissionGrantTest() { @@ -123,7 +123,7 @@ class AppPermissionsTest { verifyRadioButtonStates( allowForegroundChecked = true, askChecked = false, - denyChecked = false + denyChecked = false, ) UiAutomatorUtils2.getUiDevice().pressBack() @@ -131,14 +131,14 @@ class AppPermissionsTest { mapOf( "Allowed" to listOf(externalDeviceCameraText), "Ask every time" to emptyList(), - "Not allowed" to listOf("Camera") + "Not allowed" to listOf("Camera", "Contacts"), ) assertEquals(expectedGrantInfoMap, getGrantInfoMap()) } @RequiresFlagsEnabled( Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED + Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED, ) @Test fun externalDevicePermissionChangeToAskTest() { @@ -153,7 +153,7 @@ class AppPermissionsTest { @RequiresFlagsEnabled( Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED + Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED, ) @Test fun externalDevicePermissionChangeToDenyTest() { @@ -168,7 +168,7 @@ class AppPermissionsTest { @RequiresFlagsEnabled( Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED + Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED, ) @Test fun externalDevicePermissionChangeToAllowTest() { @@ -180,7 +180,7 @@ class AppPermissionsTest { verifyRadioButtonStates( allowForegroundChecked = false, askChecked = true, - denyChecked = false + denyChecked = false, ) clickAllowForegroundButton() @@ -189,7 +189,7 @@ class AppPermissionsTest { @RequiresFlagsEnabled( Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED + Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED, ) @Test fun externalDevicePermissionNotDisplayedInitiallyTest() { @@ -200,14 +200,14 @@ class AppPermissionsTest { mapOf( "Allowed" to emptyList(), "Ask every time" to emptyList(), - "Not allowed" to listOf("Camera") + "Not allowed" to listOf("Camera", "Contacts"), ) assertEquals(expectedGrantInfoMap, getGrantInfoMap()) } @RequiresFlagsEnabled( Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED + Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED, ) @Test fun externalDevicePermissionStickyOnGrantTest() { @@ -219,7 +219,7 @@ class AppPermissionsTest { verifyRadioButtonStates( allowForegroundChecked = true, askChecked = false, - denyChecked = false + denyChecked = false, ) clickDenyButton() @@ -232,7 +232,7 @@ class AppPermissionsTest { mapOf( "Allowed" to emptyList(), "Ask every time" to emptyList(), - "Not allowed" to listOf("Camera", externalDeviceCameraText) + "Not allowed" to listOf("Camera", externalDeviceCameraText, "Contacts"), ) assertEquals(expectedGrantInfoMap, getGrantInfoMap()) } @@ -243,7 +243,7 @@ class AppPermissionsTest { verifyRadioButtonStates( allowForegroundChecked = false, askChecked = true, - denyChecked = false + denyChecked = false, ) UiAutomatorUtils2.getUiDevice().pressBack() @@ -252,7 +252,7 @@ class AppPermissionsTest { mapOf( "Allowed" to emptyList(), "Ask every time" to listOf(externalDeviceCameraText), - "Not allowed" to listOf("Camera") + "Not allowed" to listOf("Camera", "Contacts"), ) assertEquals(expectedGrantInfoMap, getGrantInfoMap()) @@ -270,7 +270,7 @@ class AppPermissionsTest { verifyRadioButtonStates( allowForegroundChecked = false, askChecked = false, - denyChecked = true + denyChecked = true, ) UiAutomatorUtils2.getUiDevice().pressBack() @@ -279,7 +279,7 @@ class AppPermissionsTest { mapOf( "Allowed" to emptyList(), "Ask every time" to emptyList(), - "Not allowed" to listOf("Camera", externalDeviceCameraText) + "Not allowed" to listOf("Camera", externalDeviceCameraText, "Contacts"), ) assertEquals(expectedGrantInfoMap, getGrantInfoMap()) @@ -297,7 +297,7 @@ class AppPermissionsTest { verifyRadioButtonStates( allowForegroundChecked = true, askChecked = false, - denyChecked = false + denyChecked = false, ) UiAutomatorUtils2.getUiDevice().pressBack() @@ -306,7 +306,7 @@ class AppPermissionsTest { mapOf( "Allowed" to listOf(externalDeviceCameraText), "Ask every time" to emptyList(), - "Not allowed" to listOf("Camera") + "Not allowed" to listOf("Camera", "Contacts"), ) assertEquals(expectedGrantInfoMap, getGrantInfoMap()) @@ -327,7 +327,7 @@ class AppPermissionsTest { mapOf( "Allowed" to mutableListOf<String>(), "Ask every time" to mutableListOf(), - "Not allowed" to mutableListOf() + "Not allowed" to mutableListOf(), ) val outOfScopeTitles = setOf("Unused app settings", "Manage app if unused") @@ -360,21 +360,21 @@ class AppPermissionsTest { private fun verifyRadioButtonStates( allowForegroundChecked: Boolean, askChecked: Boolean, - denyChecked: Boolean + denyChecked: Boolean, ) { eventually { assertEquals( allowForegroundChecked, UiAutomatorUtils2.waitFindObject(By.res(ALLOW_FOREGROUND_ONLY_RADIO_BUTTON)) - .isChecked + .isChecked, ) assertEquals( askChecked, - UiAutomatorUtils2.waitFindObject(By.res(ASK_RADIO_BUTTON)).isChecked + UiAutomatorUtils2.waitFindObject(By.res(ASK_RADIO_BUTTON)).isChecked, ) assertEquals( denyChecked, - UiAutomatorUtils2.waitFindObject(By.res(DENY_RADIO_BUTTON)).isChecked + UiAutomatorUtils2.waitFindObject(By.res(DENY_RADIO_BUTTON)).isChecked, ) } } @@ -392,7 +392,7 @@ class AppPermissionsTest { ) }, Until.newWindow(), - NEW_WINDOW_TIMEOUT_MILLIS + NEW_WINDOW_TIMEOUT_MILLIS, ) } @@ -418,7 +418,7 @@ class AppPermissionsTest { permissionManager.grantRuntimePermission( APP_PACKAGE_NAME, DEVICE_AWARE_PERMISSION, - persistentDeviceId + persistentDeviceId, ) private fun getPermState(): Map<String, PermissionManager.PermissionState> = diff --git a/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt b/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt index 687234582..0f6504502 100644 --- a/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt +++ b/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt @@ -24,15 +24,16 @@ import android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_CUSTOM import android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT import android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_CAMERA import android.content.ComponentName +import android.content.Context import android.content.Intent import android.content.Intent.EXTRA_RESULT_RECEIVER import android.content.pm.PackageManager import android.content.pm.PackageManager.ACTION_REQUEST_PERMISSIONS -import android.hardware.display.DisplayManager import android.hardware.display.VirtualDisplay import android.os.Build import android.os.Bundle import android.os.RemoteCallback +import android.permission.PermissionManager import android.permission.flags.Flags import android.permissionmultidevice.cts.PackageManagementUtils.installPackage import android.permissionmultidevice.cts.PackageManagementUtils.uninstallPackage @@ -40,7 +41,6 @@ import android.permissionmultidevice.cts.UiAutomatorUtils.click import android.permissionmultidevice.cts.UiAutomatorUtils.findTextForView import android.permissionmultidevice.cts.UiAutomatorUtils.waitFindObject import android.platform.test.annotations.AppModeFull -import android.platform.test.annotations.RequiresFlagsDisabled import android.platform.test.annotations.RequiresFlagsEnabled import android.provider.Settings import android.view.Display @@ -62,17 +62,22 @@ import org.junit.Test import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, codeName = "VanillaIceCream") +@SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") @AppModeFull(reason = "VirtualDeviceManager cannot be accessed by instant apps") -class DeviceAwarePermissionGrantTest { +open class DeviceAwarePermissionGrantTest { private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation() private val defaultDeviceContext = instrumentation.targetContext + private lateinit var defaultDeviceName: String private lateinit var virtualDeviceManager: VirtualDeviceManager private lateinit var virtualDevice: VirtualDeviceManager.VirtualDevice private lateinit var virtualDisplay: VirtualDisplay - private lateinit var deviceDisplayName: String + private lateinit var virtualDeviceName: String + private val permissionManager = + defaultDeviceContext.getSystemService(PermissionManager::class.java)!! - @get:Rule var virtualDeviceRule = VirtualDeviceRule.createDefault() + @get:Rule + var virtualDeviceRule: VirtualDeviceRule = + VirtualDeviceRule.withAdditionalPermissions(Manifest.permission.GRANT_RUNTIME_PERMISSIONS) @Before fun setup() { @@ -83,143 +88,458 @@ class DeviceAwarePermissionGrantTest { installPackage(APP_APK_PATH_STREAMING) virtualDeviceManager = defaultDeviceContext.getSystemService(VirtualDeviceManager::class.java)!! + + defaultDeviceName = + Settings.Global.getString( + defaultDeviceContext.contentResolver, + Settings.Global.DEVICE_NAME, + ) + } + + @After + fun cleanup() { + uninstallPackage(APP_PACKAGE_NAME, requireSuccess = false) + Thread.sleep(2000) + } + + private fun createVirtualDevice(cameraPolicy: Int = DEVICE_POLICY_DEFAULT) { virtualDevice = virtualDeviceRule.createManagedVirtualDevice( VirtualDeviceParams.Builder() - .setDevicePolicy(POLICY_TYPE_CAMERA, DEVICE_POLICY_CUSTOM) + .setDevicePolicy(POLICY_TYPE_CAMERA, cameraPolicy) .build() ) - - val displayConfigBuilder = - VirtualDeviceRule.createDefaultVirtualDisplayConfigBuilder( - DISPLAY_WIDTH, - DISPLAY_HEIGHT - ) - .setFlags( - DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC or - DisplayManager.VIRTUAL_DISPLAY_FLAG_TRUSTED or - DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY - ) - virtualDisplay = - virtualDeviceRule.createManagedVirtualDisplay(virtualDevice, displayConfigBuilder)!! - deviceDisplayName = + virtualDeviceRule.createManagedVirtualDisplay( + virtualDevice, + VirtualDeviceRule.createTrustedVirtualDisplayConfigBuilder(), + )!! + virtualDeviceName = virtualDeviceManager.getVirtualDevice(virtualDevice.deviceId)!!.displayName.toString() } - @After - fun cleanup() { - uninstallPackage(APP_PACKAGE_NAME, requireSuccess = false) + @Test + fun deviceAwarePermission_onHost_requestHostPermission() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = DEVICE_ID_DEFAULT, + requestingForDevice = DEVICE_ID_DEFAULT, + dialogDeviceName = DEVICE_ID_INVALID, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = false, + ) } - @RequiresFlagsEnabled( - Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED - ) @Test - fun onHostDevice_requestPermissionForHostDevice_shouldGrantPermission() { - testGrantPermissionForDevice( - Display.DEFAULT_DISPLAY, - DEVICE_ID_DEFAULT, - false, - "", + fun deviceAwarePermission_onHost_withRemotePermission_requestHostPermission() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = true, + requestingFromDevice = DEVICE_ID_DEFAULT, + requestingForDevice = DEVICE_ID_DEFAULT, + dialogDeviceName = DEVICE_ID_INVALID, expectPermissionGrantedOnDefaultDevice = true, - expectPermissionGrantedOnRemoteDevice = false + expectPermissionGrantedOnVirtualDevice = true, ) } - @RequiresFlagsEnabled( - Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED - ) @Test - fun onHostDevice_requestPermissionForRemoteDevice_shouldGrantPermission() { - testGrantPermissionForDevice( - Display.DEFAULT_DISPLAY, - virtualDevice.deviceId, - true, - deviceDisplayName, + fun deviceAwarePermission_onHost_requestPermissionWithoutDeviceId() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = DEVICE_ID_DEFAULT, + requestingForDevice = DEVICE_ID_INVALID, + dialogDeviceName = DEVICE_ID_INVALID, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = false, + ) + } + + @Test + fun deviceAwarePermission_onHost_withRemotePermission_requestPermissionWithoutDeviceId() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = true, + requestingFromDevice = DEVICE_ID_DEFAULT, + requestingForDevice = DEVICE_ID_INVALID, + dialogDeviceName = DEVICE_ID_INVALID, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @Test + fun deviceAwarePermission_onHost_requestRemotePermission() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = DEVICE_ID_DEFAULT, + requestingForDevice = virtualDevice.deviceId, + dialogDeviceName = virtualDevice.deviceId, expectPermissionGrantedOnDefaultDevice = false, - expectPermissionGrantedOnRemoteDevice = true + expectPermissionGrantedOnVirtualDevice = true, ) } - @RequiresFlagsEnabled( - Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED - ) - @RequiresFlagsDisabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES) @Test - fun onRemoteDevice_requestPermissionForHostDevice_shouldShowWarningDialog() { - requestPermissionOnDevice(virtualDisplay.display.displayId, DEVICE_ID_DEFAULT) + fun deviceAwarePermission_onHost_withHostPermission_requestRemotePermission() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = true, + initialVirtualDevicePermission = false, + requestingFromDevice = DEVICE_ID_DEFAULT, + requestingForDevice = virtualDevice.deviceId, + dialogDeviceName = virtualDevice.deviceId, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } - val displayId = virtualDisplay.display.displayId - waitFindObject(By.displayId(displayId).textContains("Permission request suppressed")) + @Test + fun deviceAwarePermission_onRemote_requestRemotePermission() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = virtualDevice.deviceId, + requestingForDevice = virtualDevice.deviceId, + dialogDeviceName = virtualDevice.deviceId, + expectPermissionGrantedOnDefaultDevice = false, + expectPermissionGrantedOnVirtualDevice = true, + ) } - @RequiresFlagsEnabled( - Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED, - Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES - ) @Test - fun onRemoteDevice_requestPermissionForHostDevice_shouldGrantPermission() { - // Create a virtual device with default policy, so that camera permission request will - // correspond to default device camera access. - virtualDevice = - virtualDeviceRule.createManagedVirtualDevice( - VirtualDeviceParams.Builder() - .setDevicePolicy(POLICY_TYPE_CAMERA, DEVICE_POLICY_DEFAULT) - .build() - ) - testGrantPermissionForDevice( - virtualDisplay.display.displayId, - virtualDevice.deviceId, - true, - Settings.Global.getString(defaultDeviceContext.contentResolver, - Settings.Global.DEVICE_NAME), + fun deviceAwarePermission_onRemote_withHostPermission_requestRemotePermission() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = true, + initialVirtualDevicePermission = false, + requestingFromDevice = virtualDevice.deviceId, + requestingForDevice = virtualDevice.deviceId, + dialogDeviceName = virtualDevice.deviceId, expectPermissionGrantedOnDefaultDevice = true, - expectPermissionGrantedOnRemoteDevice = false + expectPermissionGrantedOnVirtualDevice = true, ) } - @RequiresFlagsEnabled( - Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED, - Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED - ) @Test - fun onRemoteDevice_requestPermissionForRemoteDevice_shouldGrantPermission() { - testGrantPermissionForDevice( - virtualDisplay.display.displayId, - virtualDevice.deviceId, - true, - deviceDisplayName, + fun deviceAwarePermission_onRemote_requestPermissionWithoutDeviceId() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = virtualDevice.deviceId, + requestingForDevice = DEVICE_ID_INVALID, + dialogDeviceName = virtualDevice.deviceId, expectPermissionGrantedOnDefaultDevice = false, - expectPermissionGrantedOnRemoteDevice = true + expectPermissionGrantedOnVirtualDevice = true, ) } - private fun testGrantPermissionForDevice( - displayId: Int, - targetDeviceId: Int, - showDeviceName: Boolean, - expectedDeviceNameInDialog: String, + @Test + fun deviceAwarePermission_onRemote_withHostPermission_requestPermissionWithoutDeviceId() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = true, + initialVirtualDevicePermission = false, + requestingFromDevice = virtualDevice.deviceId, + requestingForDevice = DEVICE_ID_INVALID, + dialogDeviceName = virtualDevice.deviceId, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES) + @Test + fun deviceAwarePermission_onRemote_requestHostPermission() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = virtualDevice.deviceId, + requestingForDevice = DEVICE_ID_DEFAULT, + dialogDeviceName = DEVICE_ID_DEFAULT, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = false, + ) + } + + @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES) + @Test + fun deviceAwarePermission_onRemote_withRemotePermission_requestHostPermission() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = true, + requestingFromDevice = virtualDevice.deviceId, + requestingForDevice = DEVICE_ID_DEFAULT, + dialogDeviceName = DEVICE_ID_DEFAULT, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @Test + fun deviceAwarePermissionWithoutCapability_onHost_requestHostPermission() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_DEFAULT) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = DEVICE_ID_DEFAULT, + requestingForDevice = DEVICE_ID_DEFAULT, + dialogDeviceName = DEVICE_ID_INVALID, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @Test + fun deviceAwarePermissionWithoutCapability_onHost_requestPermissionWithoutDeviceId() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_DEFAULT) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = DEVICE_ID_DEFAULT, + requestingForDevice = DEVICE_ID_INVALID, + dialogDeviceName = DEVICE_ID_INVALID, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES) + @Test + fun deviceAwarePermissionWithoutCapability_onHost_requestRemotePermission() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_DEFAULT) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = DEVICE_ID_DEFAULT, + requestingForDevice = virtualDevice.deviceId, + dialogDeviceName = DEVICE_ID_INVALID, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES) + @Test + fun deviceAwarePermissionWithoutCapability_onRemote_requestRemotePermission() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_DEFAULT) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = virtualDevice.deviceId, + requestingForDevice = virtualDevice.deviceId, + dialogDeviceName = DEVICE_ID_DEFAULT, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES) + @Test + fun deviceAwarePermissionWithoutCapability_onRemote_requestPermissionWithoutDeviceId() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_DEFAULT) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = virtualDevice.deviceId, + requestingForDevice = DEVICE_ID_INVALID, + dialogDeviceName = DEVICE_ID_DEFAULT, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES) + @Test + fun deviceAwarePermissionWithoutCapability_onRemote_requestHostPermission() { + createVirtualDevice(cameraPolicy = DEVICE_POLICY_DEFAULT) + testMultiDevicePermissionGrant( + permission = Manifest.permission.CAMERA, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = virtualDevice.deviceId, + requestingForDevice = DEVICE_ID_DEFAULT, + dialogDeviceName = DEVICE_ID_DEFAULT, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @Test + fun nonDeviceAwarePermission_onHost_requestHostPermission() { + createVirtualDevice() + testMultiDevicePermissionGrant( + permission = Manifest.permission.READ_CONTACTS, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = DEVICE_ID_DEFAULT, + requestingForDevice = DEVICE_ID_DEFAULT, + dialogDeviceName = DEVICE_ID_INVALID, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @Test + fun nonDeviceAwarePermission_onHost_requestPermissionWithoutDeviceId() { + createVirtualDevice() + testMultiDevicePermissionGrant( + permission = Manifest.permission.READ_CONTACTS, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = DEVICE_ID_DEFAULT, + requestingForDevice = DEVICE_ID_INVALID, + dialogDeviceName = DEVICE_ID_INVALID, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES) + @Test + fun nonDeviceAwarePermission_onHost_requestRemotePermission() { + createVirtualDevice() + testMultiDevicePermissionGrant( + permission = Manifest.permission.READ_CONTACTS, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = DEVICE_ID_DEFAULT, + requestingForDevice = virtualDevice.deviceId, + dialogDeviceName = DEVICE_ID_INVALID, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES) + @Test + fun nonDeviceAwarePermission_onRemote_requestRemotePermission() { + createVirtualDevice() + testMultiDevicePermissionGrant( + permission = Manifest.permission.READ_CONTACTS, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = virtualDevice.deviceId, + requestingForDevice = virtualDevice.deviceId, + dialogDeviceName = DEVICE_ID_DEFAULT, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES) + @Test + fun nonDeviceAwarePermission_onRemote_requestPermissionWithoutDeviceId() { + createVirtualDevice() + testMultiDevicePermissionGrant( + permission = Manifest.permission.READ_CONTACTS, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = virtualDevice.deviceId, + requestingForDevice = DEVICE_ID_INVALID, + dialogDeviceName = DEVICE_ID_DEFAULT, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES) + @Test + fun nonDeviceAwarePermission_onRemote_requestHostPermission() { + createVirtualDevice() + testMultiDevicePermissionGrant( + permission = Manifest.permission.READ_CONTACTS, + initialDefaultDevicePermission = false, + initialVirtualDevicePermission = false, + requestingFromDevice = virtualDevice.deviceId, + requestingForDevice = DEVICE_ID_DEFAULT, + dialogDeviceName = DEVICE_ID_DEFAULT, + expectPermissionGrantedOnDefaultDevice = true, + expectPermissionGrantedOnVirtualDevice = true, + ) + } + + private fun testMultiDevicePermissionGrant( + permission: String, + initialDefaultDevicePermission: Boolean, + initialVirtualDevicePermission: Boolean, + requestingFromDevice: Int, + requestingForDevice: Int, + dialogDeviceName: Int, expectPermissionGrantedOnDefaultDevice: Boolean, - expectPermissionGrantedOnRemoteDevice: Boolean + expectPermissionGrantedOnVirtualDevice: Boolean, ) { - // Assert no permission granted to either default device or virtual device at the beginning - assertAppHasPermissionForDevice(DEVICE_ID_DEFAULT, false) - assertAppHasPermissionForDevice(virtualDevice.deviceId, false) + if (initialDefaultDevicePermission) { + instrumentation.uiAutomation.grantRuntimePermission(APP_PACKAGE_NAME, permission) + } + if (initialVirtualDevicePermission) { + grantRuntimePermissionOnVirtualDevice(permission) + } + assertAppHasPermissionForDevice( + DEVICE_ID_DEFAULT, + permission, + initialDefaultDevicePermission, + ) + assertAppHasPermissionForDevice( + virtualDevice.deviceId, + permission, + initialVirtualDevicePermission, + ) - val future = requestPermissionOnDevice(displayId, targetDeviceId) - virtualDeviceRule.waitAndAssertActivityResumed(getPermissionDialogComponentName()) + val displayId = + if (requestingFromDevice == DEVICE_ID_DEFAULT) { + Display.DEFAULT_DISPLAY + } else { + virtualDisplay.display.displayId + } + + val future = requestPermissionOnDevice(displayId, requestingForDevice, permission) - if (showDeviceName) { + if (dialogDeviceName != DEVICE_ID_INVALID) { + val expectedDeviceNameInDialog = + if (dialogDeviceName == DEVICE_ID_DEFAULT) { + defaultDeviceName + } else { + virtualDeviceName + } assertPermissionMessageContainsDeviceName(displayId, expectedDeviceNameInDialog) + } else { + assertPermissionMessageDoesNotContainDeviceName(displayId) } // Click the allow button in the dialog to grant permission - SystemUtil.eventually { click(By.displayId(displayId).res(ALLOW_BUTTON)) } + val allowButton = + if (permission == Manifest.permission.CAMERA) ALLOW_BUTTON_FOREGROUND else ALLOW_BUTTON + SystemUtil.eventually { click(By.displayId(displayId).res(allowButton)) } // Validate permission grant result returned from callback val grantPermissionResult = future.get(TIMEOUT, TimeUnit.MILLISECONDS) @@ -228,37 +548,54 @@ class DeviceAwarePermissionGrantTest { TestConstants.PERMISSION_RESULT_KEY_PERMISSIONS ) ) - .isEqualTo(arrayOf(PERMISSION)) + .isEqualTo(arrayOf(permission)) assertThat( grantPermissionResult.getIntArray(TestConstants.PERMISSION_RESULT_KEY_GRANT_RESULTS) ) .isEqualTo(arrayOf(PackageManager.PERMISSION_GRANTED).toIntArray()) + + val expectedPermissionResultDeviceId = + if (requestingForDevice == DEVICE_ID_INVALID) { + requestingFromDevice + } else { + requestingForDevice + } assertThat(grantPermissionResult.getInt(TestConstants.PERMISSION_RESULT_KEY_DEVICE_ID)) - .isEqualTo(targetDeviceId) + .isEqualTo(expectedPermissionResultDeviceId) // Validate whether permission is granted as expected - assertAppHasPermissionForDevice(DEVICE_ID_DEFAULT, expectPermissionGrantedOnDefaultDevice) + assertAppHasPermissionForDevice( + DEVICE_ID_DEFAULT, + permission, + expectPermissionGrantedOnDefaultDevice, + ) assertAppHasPermissionForDevice( virtualDevice.deviceId, - expectPermissionGrantedOnRemoteDevice + permission, + expectPermissionGrantedOnVirtualDevice, ) } private fun requestPermissionOnDevice( displayId: Int, - targetDeviceId: Int + targetDeviceId: Int, + permission: String, ): CompletableFuture<Bundle> { val future = CompletableFuture<Bundle>() val callback = RemoteCallback { result: Bundle? -> future.complete(result) } + val permissions = mutableListOf(permission).toTypedArray() val intent = Intent() .setComponent( ComponentName(APP_PACKAGE_NAME, "$APP_PACKAGE_NAME.RequestPermissionActivity") ) .putExtra(PackageManager.EXTRA_REQUEST_PERMISSIONS_DEVICE_ID, targetDeviceId) + .putExtra(PackageManager.EXTRA_REQUEST_PERMISSIONS_NAMES, permissions) .putExtra(EXTRA_RESULT_RECEIVER, callback) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + virtualDeviceRule.sendIntentToDisplay(intent, displayId) + virtualDeviceRule.waitAndAssertActivityResumed(getPermissionDialogComponentName()) return future } @@ -269,12 +606,23 @@ class DeviceAwarePermissionGrantTest { assertThat(text).contains(deviceName) } - private fun assertAppHasPermissionForDevice(deviceId: Int, expectPermissionGranted: Boolean) { + private fun assertPermissionMessageDoesNotContainDeviceName(displayId: Int) { + waitFindObject(By.displayId(displayId).res(PERMISSION_MESSAGE_ID)) + val text = findTextForView(By.displayId(displayId).res(PERMISSION_MESSAGE_ID)) + assertThat(text).doesNotContain(virtualDeviceName) + assertThat(text).doesNotContain(defaultDeviceName) + } + + private fun assertAppHasPermissionForDevice( + deviceId: Int, + permission: String, + expectPermissionGranted: Boolean, + ) { val checkPermissionResult = defaultDeviceContext .createDeviceContext(deviceId) .packageManager - .checkPermission(PERMISSION, APP_PACKAGE_NAME) + .checkPermission(permission, APP_PACKAGE_NAME) if (expectPermissionGranted) { Assert.assertEquals(PackageManager.PERMISSION_GRANTED, checkPermissionResult) @@ -289,18 +637,25 @@ class DeviceAwarePermissionGrantTest { return intent.resolveActivity(defaultDeviceContext.packageManager) } + private fun grantRuntimePermissionOnVirtualDevice(permission: String) { + permissionManager.grantRuntimePermission( + APP_PACKAGE_NAME, + permission, + virtualDevice.persistentDeviceId!!, + ) + } + companion object { const val APK_DIRECTORY = "/data/local/tmp/cts-permissionmultidevice" const val APP_APK_PATH_STREAMING = "${APK_DIRECTORY}/CtsAccessRemoteDeviceCamera.apk" const val APP_PACKAGE_NAME = "android.permissionmultidevice.cts.accessremotedevicecamera" const val PERMISSION_MESSAGE_ID = "com.android.permissioncontroller:id/permission_message" - const val ALLOW_BUTTON = + const val ALLOW_BUTTON_FOREGROUND = "com.android.permissioncontroller:id/permission_allow_foreground_only_button" - const val DEVICE_ID_DEFAULT = 0 + const val ALLOW_BUTTON = "com.android.permissioncontroller:id/permission_allow_button" + const val DEVICE_ID_DEFAULT = Context.DEVICE_ID_DEFAULT + const val DEVICE_ID_INVALID = Context.DEVICE_ID_INVALID const val PERSISTENT_DEVICE_ID_DEFAULT = VirtualDeviceManager.PERSISTENT_DEVICE_ID_DEFAULT - const val PERMISSION = Manifest.permission.CAMERA const val TIMEOUT = 5000L - private const val DISPLAY_HEIGHT = 1920 - private const val DISPLAY_WIDTH = 1080 } } diff --git a/tests/cts/permissionpolicy/res/raw/android_manifest.xml b/tests/cts/permissionpolicy/res/raw/android_manifest.xml index bdcb11865..200e3cf42 100644 --- a/tests/cts/permissionpolicy/res/raw/android_manifest.xml +++ b/tests/cts/permissionpolicy/res/raw/android_manifest.xml @@ -154,6 +154,8 @@ <protected-broadcast android:name="android.app.backup.intent.INIT" /> <protected-broadcast android:name="android.bluetooth.intent.DISCOVERABLE_TIMEOUT" /> + <protected-broadcast android:name="android.bluetooth.action.AUTO_ON_STATE_CHANGED" /> + <protected-broadcast android:name="android.bluetooth.action.CONNECTION_STATE_CHANGED" /> <protected-broadcast android:name="android.bluetooth.adapter.action.STATE_CHANGED" /> <protected-broadcast android:name="android.bluetooth.adapter.action.SCAN_MODE_CHANGED" /> <protected-broadcast android:name="android.bluetooth.adapter.action.DISCOVERY_STARTED" /> @@ -177,6 +179,8 @@ <protected-broadcast android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REPLY" /> <protected-broadcast android:name="android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL" /> <protected-broadcast android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" /> + <protected-broadcast android:name="android.bluetooth.device.action.KEY_MISSING" /> + <protected-broadcast android:name="android.bluetooth.device.action.ENCRYPTION_CHANGE" /> <protected-broadcast android:name="android.bluetooth.device.action.SDP_RECORD" /> <protected-broadcast android:name="android.bluetooth.device.action.BATTERY_LEVEL_CHANGED" /> <protected-broadcast android:name="android.bluetooth.device.action.REMOTE_ISSUE_OCCURRED" /> @@ -238,6 +242,8 @@ <protected-broadcast android:name="android.bluetooth.avrcp-controller.profile.action.FOLDER_LIST" /> <protected-broadcast + android:name="android.bluetooth.avrcp-controller.profile.action.PLAYER_SETTING" /> + <protected-broadcast android:name="android.bluetooth.avrcp-controller.profile.action.TRACK_EVENT" /> <protected-broadcast android:name="android.bluetooth.input.profile.action.CONNECTION_STATE_CHANGED" /> @@ -264,6 +270,7 @@ <protected-broadcast android:name="android.bluetooth.pan.profile.action.CONNECTION_STATE_CHANGED" /> <protected-broadcast android:name="android.bluetooth.action.HAP_CONNECTION_STATE_CHANGED" /> + <protected-broadcast android:name="android.bluetooth.action.HAP_DEVICE_AVAILABLE" /> <protected-broadcast android:name="android.bluetooth.action.LE_AUDIO_CONNECTION_STATE_CHANGED" /> <protected-broadcast android:name="android.bluetooth.action.LE_AUDIO_ACTIVE_DEVICE_CHANGED" /> <protected-broadcast android:name="android.bluetooth.action.LE_AUDIO_CONF_CHANGED" /> @@ -297,6 +304,9 @@ <protected-broadcast android:name="android.hardware.display.action.WIFI_DISPLAY_STATUS_CHANGED" /> + <protected-broadcast android:name="android.hardware.hdmi.action.OSD_MESSAGE" /> + <protected-broadcast android:name="android.hardware.hdmi.action.ON_ACTIVE_SOURCE_RECOVERED_DISMISS_UI" /> + <protected-broadcast android:name="android.hardware.usb.action.USB_STATE" /> <protected-broadcast android:name="android.hardware.usb.action.USB_PORT_CHANGED" /> <protected-broadcast android:name="android.hardware.usb.action.USB_PORT_COMPLIANCE_CHANGED" /> @@ -787,6 +797,7 @@ <protected-broadcast android:name="com.android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO" /> <protected-broadcast android:name="com.android.internal.telephony.ACTION_CARRIER_CERTIFICATE_DOWNLOAD" /> <protected-broadcast android:name="com.android.internal.telephony.action.COUNTRY_OVERRIDE" /> + <protected-broadcast android:name="com.android.internal.telephony.action.SILENCE_WIFI_CALLING_NOTIFICATION"/> <protected-broadcast android:name="com.android.internal.telephony.OPEN_DEFAULT_SMS_APP" /> <protected-broadcast android:name="com.android.internal.telephony.ACTION_TEST_OVERRIDE_CARRIER_ID" /> <protected-broadcast android:name="android.telephony.action.SIM_CARD_STATE_CHANGED" /> @@ -837,6 +848,12 @@ <protected-broadcast android:name="android.intent.action.PROFILE_UNAVAILABLE" /> <protected-broadcast android:name="android.app.action.CONSOLIDATED_NOTIFICATION_POLICY_CHANGED" /> <protected-broadcast android:name="android.intent.action.MAIN_USER_LOCKSCREEN_KNOWLEDGE_FACTOR_CHANGED" /> + <protected-broadcast android:name="com.android.uwb.uwbcountrycode.GEOCODE_RETRY" /> + <protected-broadcast android:name="android.telephony.satellite.action.SATELLITE_SUBSCRIBER_ID_LIST_CHANGED" /> + <protected-broadcast android:name="android.service.ondeviceintelligence.MODEL_LOADED" /> + <protected-broadcast android:name="android.service.ondeviceintelligence.MODEL_UNLOADED" /> + <protected-broadcast android:name="android.telephony.satellite.action.SATELLITE_START_NON_EMERGENCY_SESSION" /> + <!-- ====================================================================== --> <!-- RUNTIME PERMISSIONS --> @@ -1077,6 +1094,62 @@ <permission android:name="android.permission.SATELLITE_COMMUNICATION" android:protectionLevel="role|signature|privileged" /> + <!-- ================================== --> + <!-- Permissions associated with picture and sound profiles --> + <!-- ================================== --> + <eat-comment /> + + <!-- @FlaggedApi(android.media.tv.flags.Flags.FLAG_APPLY_PICTURE_PROFILES) + Allows an app to apply a {@link MediaQualityManager.PictureProfile} to a layer via + {@link MediaCodec.PARAMETER_KEY_PICTURE_PROFILE} and, additionally, system apps via + {@link SurfaceControl.Transaction#setPictureProfileHandle}. + --> + <permission android:name="android.permission.APPLY_PICTURE_PROFILE" + android:protectionLevel="normal" + android:featureFlag="android.media.tv.flags.apply_picture_profiles"/> + + <!-- @hide + Allows MediaQualityService to observe any {@link MediaQualityManager.PictureProfile} + applied to any layer in the system by apps via + {@link MediaCodec.PARAMETER_KEY_PICTURE_PROFILE} and by system apps via + {@link SurfaceControl.Transaction#setPictureProfileHandle}. + --> + <permission android:name="android.permission.OBSERVE_PICTURE_PROFILES" + android:protectionLevel="signature|privileged" + android:featureFlag="android.media.tv.flags.apply_picture_profiles"/> + + <!-- + @SystemApi + @FlaggedApi("android.media.tv.flags.media_quality_fw") + Allows an application to access its picture profile from the media quality database. + <p> Protection level: signature|privileged|vendor privileged + @hide + --> + <permission android:name="android.permission.MANAGE_GLOBAL_PICTURE_QUALITY_SERVICE" + android:protectionLevel="signature|privileged|vendorPrivileged" + android:featureFlag="android.media.tv.flags.media_quality_fw"/> + + <!-- + @SystemApi + @FlaggedApi("android.media.tv.flags.media_quality_fw") + Allows an application to access its sound profile from the media quality database. + <p> Protection level: signature|privileged|vendor privileged + @hide + --> + <permission android:name="android.permission.MANAGE_GLOBAL_SOUND_QUALITY_SERVICE" + android:protectionLevel="signature|privileged|vendorPrivileged" + android:featureFlag="android.media.tv.flags.media_quality_fw"/> + + <!-- + @FlaggedApi(android.media.tv.flags.Flags.FLAG_MEDIA_QUALITY_FW) + Allows an application to read the aggregated color zones on the screen for use cases like + TV ambient backlight usages. + <p> Protection level: normal + --> + <permission android:name="android.permission.READ_COLOR_ZONES" + android:protectionLevel="normal" + android:featureFlag="android.media.tv.flags.media_quality_fw"/> + <!-- ====================================================================== --> <!-- Permissions for accessing external storage --> <!-- ====================================================================== --> @@ -1492,8 +1565,8 @@ android:description="@string/permdesc_readBasicPhoneState" android:protectionLevel="normal" /> - <!-- Allows read access to the device's phone number(s). This is a subset of the capabilities - granted by {@link #READ_PHONE_STATE} but is exposed to instant applications. + <!-- Allows read access to the device's phone number(s), + which is exposed to instant applications. <p>Protection level: dangerous--> <permission android:name="android.permission.READ_PHONE_NUMBERS" android:permissionGroup="android.permission-group.UNDEFINED" @@ -2424,7 +2497,7 @@ android:label="@string/permlab_nearby_wifi_devices" android:protectionLevel="dangerous" /> - <!-- Required to be able to range to devices using any ranging technology. + <!-- Required to be able to range to devices using generic ranging module. @FlaggedApi("android.permission.flags.ranging_permission_enabled") <p>Protection level: dangerous --> <permission android:name="android.permission.RANGING" @@ -2432,7 +2505,7 @@ android:description="@string/permdesc_ranging" android:label="@string/permlab_ranging" android:protectionLevel="dangerous" - android:featureFlag="android.permission.flags.ranging_permission_enabled" /> + android:featureFlag="android.permission.flags.ranging_permission_enabled"/> <!-- @SystemApi @TestApi Allows an application to suspend other apps, which will prevent the user from using them until they are unsuspended. @@ -2603,7 +2676,7 @@ <uses-permission android:name="android.permission.GET_ACCOUNTS"/> <!-- @SystemApi Allows access to remove an account. - @FlaggedApi("android.app.admin.flags.split_create_managed_profile_enabled") + @FlaggedApi(android.app.admin.flags.Flags.FLAG_SPLIT_CREATE_MANAGED_PROFILE_ENABLED) <p>Not for use by third-party applications. @hide --> <permission android:name="android.permission.REMOVE_ACCOUNTS" @@ -2611,7 +2684,7 @@ android:featureFlag="android.app.admin.flags.split_create_managed_profile_enabled" /> <!-- @SystemApi Allows access to copy an account to another user. - @FlaggedApi("android.app.admin.flags.split_create_managed_profile_enabled") + @FlaggedApi(android.app.admin.flags.Flags.FLAG_SPLIT_CREATE_MANAGED_PROFILE_ENABLED) <p>Not for use by third-party applications. @hide --> <permission android:name="android.permission.COPY_ACCOUNTS" @@ -2660,7 +2733,7 @@ <!-- @SystemApi Allows access to perform vendor effects in the vibrator. <p>Protection level: signature - @FlaggedApi("android.os.vibrator.vendor_vibration_effects") + @FlaggedApi(android.os.vibrator.Flags.FLAG_VENDOR_VIBRATION_EFFECTS) @hide --> <permission android:name="android.permission.VIBRATE_VENDOR_EFFECTS" @@ -2669,8 +2742,8 @@ <!-- @SystemApi Allows access to start a vendor vibration session. <p>Protection level: signature - @FlaggedApi("android.os.vibrator.vendor_vibration_effects") - @hide + @FlaggedApi(android.os.vibrator.Flags.FLAG_VENDOR_VIBRATION_EFFECTS) + @hide --> <permission android:name="android.permission.START_VIBRATION_SESSIONS" android:protectionLevel="signature|privileged" @@ -3315,16 +3388,20 @@ <permission android:name="android.permission.INTERACT_ACROSS_PROFILES" android:protectionLevel="signature|appop" /> - <!-- Allows applications to access profiles with ACCESS_HIDDEN_PROFILES user property - <p>Protection level: normal - @FlaggedApi("android.multiuser.enable_permission_to_access_hidden_profiles") --> + <!-- Allows applications to access profiles with + {@code android.content.pm.UserProperties#PROFILE_API_VISIBILITY_HIDDEN} user property, e.g. + {@link android.os.UserManager#USER_TYPE_PROFILE_PRIVATE}. + <p>Protection level: normal + @FlaggedApi("android.multiuser.enable_permission_to_access_hidden_profiles") --> <permission android:name="android.permission.ACCESS_HIDDEN_PROFILES" android:label="@string/permlab_accessHiddenProfile" android:description="@string/permdesc_accessHiddenProfile" android:protectionLevel="normal" /> - <!-- @SystemApi @hide Allows privileged applications to get details about hidden profile - users. + <!-- @SystemApi @hide Allows privileged applications to get details about profiles with + {@code android.content.pm.UserProperties#PROFILE_API_VISIBILITY_HIDDEN} user property, e.g. + {@link android.os.UserManager#USER_TYPE_PROFILE_PRIVATE}. Removes extra requirements such + as having {@link android.app.role.RoleManager#ROLE_HOME} role for LauncherApps APIs. @FlaggedApi("android.multiuser.enable_permission_to_access_hidden_profiles") --> <permission android:name="android.permission.ACCESS_HIDDEN_PROFILES_FULL" @@ -3388,13 +3465,18 @@ <!-- Allows an application to manage device policy relating to time. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call - APIs protected by this permission on users different to the calling user.--> + APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. + --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_TIME" android:protectionLevel="internal|role" /> <!-- Allows an application to set the grant state of runtime permissions on packages. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_RUNTIME_PERMISSIONS" android:protectionLevel="internal|role" /> @@ -3402,6 +3484,8 @@ <!-- Allows an application to manage the identity of the managing organization. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_ORGANIZATION_IDENTITY" android:protectionLevel="internal|role" /> @@ -3410,6 +3494,8 @@ active policy. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE" android:protectionLevel="internal|role" /> @@ -3417,6 +3503,8 @@ <!-- Allows an application to manage backup service policy. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_BACKUP_SERVICE" android:protectionLevel="internal|role" /> @@ -3424,6 +3512,8 @@ <!-- Allows an application to manage lock task policy. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_LOCK_TASK" android:protectionLevel="internal|role" /> @@ -3431,6 +3521,8 @@ <!-- Allows an application to manage policy regarding modifying applications. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_APPS_CONTROL" android:protectionLevel="internal|role" /> @@ -3438,6 +3530,8 @@ <!-- Allows an application to manage installing from unknown sources policy. <p>MANAGE_SECURITY_CRITICAL_DEVICE_POLICY_ACROSS_USERS is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_INSTALL_UNKNOWN_SOURCES" android:protectionLevel="internal|role" /> @@ -3445,6 +3539,8 @@ <!-- Allows an application to manage application restrictions. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_APP_RESTRICTIONS" android:protectionLevel="internal|role" /> @@ -3452,6 +3548,8 @@ <!-- Allows an application to manage calling policy. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_CALLS" android:protectionLevel="internal|role" /> @@ -3459,6 +3557,8 @@ <!-- Allows an application to manage debugging features policy. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_DEBUGGING_FEATURES" android:protectionLevel="internal|role" /> @@ -3466,6 +3566,8 @@ <!-- Allows an application to manage policy preventing users from modifying users. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_MODIFY_USERS" android:protectionLevel="internal|role" /> @@ -3473,6 +3575,8 @@ <!-- Allows an application to manage safe boot policy. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_SAFE_BOOT" android:protectionLevel="internal|role" /> @@ -3481,6 +3585,8 @@ enable and disable the microphone. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_MICROPHONE" android:protectionLevel="internal|role" /> @@ -3489,6 +3595,8 @@ enable and disable the camera. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_CAMERA" android:protectionLevel="internal|role" /> @@ -3496,6 +3604,8 @@ <!-- Allows an application to manage policy related to keyguard. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_KEYGUARD" android:protectionLevel="internal|role" /> @@ -3503,6 +3613,8 @@ <!-- Allows an application to set policy related to account management. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_ACCOUNT_MANAGEMENT" android:protectionLevel="internal|role" /> @@ -3510,6 +3622,8 @@ <!-- Allows an application to set policy related to hiding and suspending packages. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_PACKAGE_STATE" android:protectionLevel="internal|role" /> @@ -3518,17 +3632,24 @@ challenge on current user. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_RESET_PASSWORD" android:protectionLevel="internal|role" /> - <!-- Allows an application to set policy related to the status bar.--> + <!-- Allows an application to set policy related to the status bar. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. + --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_STATUS_BAR" android:protectionLevel="internal|role" /> <!-- Allows an application to set policy related to bluetooth. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_BLUETOOTH" android:protectionLevel="internal|role" /> @@ -3536,6 +3657,8 @@ <!-- Allows an application to set policy related to fun. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_FUN" android:protectionLevel="internal|role" /> @@ -3543,6 +3666,8 @@ <!-- Allows an application to set policy related to airplane mode. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_AIRPLANE_MODE" android:protectionLevel="internal|role" /> @@ -3550,6 +3675,8 @@ <!-- Allows an application to set policy related to mobile networks. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_MOBILE_NETWORK" android:protectionLevel="internal|role" /> @@ -3557,6 +3684,8 @@ <!-- Allows an application to set policy related to physical media. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_PHYSICAL_MEDIA" android:protectionLevel="internal|role" /> @@ -3564,6 +3693,8 @@ <!-- Allows an application to set policy related to sms. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_SMS" android:protectionLevel="internal|role" /> @@ -3571,6 +3702,8 @@ <!-- Allows an application to set policy related to usb file transfers. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER" android:protectionLevel="internal|role" /> @@ -3578,6 +3711,8 @@ <!-- Allows an application to set policy related to lock credentials. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS" android:protectionLevel="internal|role" /> @@ -3585,6 +3720,8 @@ <!-- Allows an application to set policy related to Wifi. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_WIFI" android:protectionLevel="internal|role" /> @@ -3592,6 +3729,8 @@ <!-- Allows an application to set policy related to screen capture. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_SCREEN_CAPTURE" android:protectionLevel="internal|role" /> @@ -3599,6 +3738,8 @@ <!-- Allows an application to set policy related to input methods. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_INPUT_METHODS" android:protectionLevel="internal|role" /> @@ -3607,6 +3748,8 @@ private DNS. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_RESTRICT_PRIVATE_DNS" android:protectionLevel="internal|role" /> @@ -3614,6 +3757,8 @@ <!-- Allows an application to set policy related to the default sms application. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_DEFAULT_SMS" android:protectionLevel="internal|role" /> @@ -3621,6 +3766,8 @@ <!-- Allows an application to set policy related to profiles. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_PROFILES" android:protectionLevel="internal|role" /> @@ -3629,6 +3776,8 @@ cross-profile copy and paste). <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_PROFILE_INTERACTION" android:protectionLevel="internal|role" /> @@ -3636,6 +3785,8 @@ <!-- Allows an application to set policy related to VPNs. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_VPN" android:protectionLevel="internal|role" /> @@ -3643,6 +3794,8 @@ <!-- Allows an application to set policy related to audio output. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_AUDIO_OUTPUT" android:protectionLevel="internal|role" /> @@ -3650,6 +3803,8 @@ <!-- Allows an application to set policy related to the display. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_DISPLAY" android:protectionLevel="internal|role" /> @@ -3657,6 +3812,8 @@ <!-- Allows an application to set policy related to location. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_LOCATION" android:protectionLevel="internal|role" /> @@ -3664,6 +3821,8 @@ <!-- Allows an application to set policy related to factory reset. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_FACTORY_RESET" android:protectionLevel="internal|role" /> @@ -3671,6 +3830,8 @@ <!-- Allows an application to set policy related to the wallpaper. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_WALLPAPER" android:protectionLevel="internal|role" /> @@ -3678,6 +3839,8 @@ <!-- Allows an application to set policy related to the usage of the contents of the screen. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_SCREEN_CONTENT" android:protectionLevel="internal|role" /> @@ -3685,6 +3848,8 @@ <!-- Allows an application to set policy related to system dialogs. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_SYSTEM_DIALOGS" android:protectionLevel="internal|role" /> @@ -3692,6 +3857,8 @@ <!-- Allows an application to set policy related to users running in the background. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_RUN_IN_BACKGROUND" android:protectionLevel="internal|role" /> @@ -3699,6 +3866,8 @@ <!-- Allows an application to set policy related to printing. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_PRINTING" android:protectionLevel="internal|role" /> @@ -3707,12 +3876,16 @@ nearby streaming). <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION" android:protectionLevel="internal|role" /> <!-- Allows an application to set policy related to <a href="https://www.threadgroup.org">Thread</a> network. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. @FlaggedApi("com.android.net.thread.platform.flags.thread_user_restriction_enabled") --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_THREAD_NETWORK" @@ -3720,6 +3893,8 @@ <!-- Allows an application to set policy related to sending assist content to a privileged app such as the Assistant app. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_ASSIST_CONTENT" android:protectionLevel="internal|role" /> @@ -3727,6 +3902,8 @@ <!-- Allows an application to set policy related to windows. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_WINDOWS" android:protectionLevel="internal|role" /> @@ -3734,6 +3911,8 @@ <!-- Allows an application to set policy related to locale. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_LOCALE" android:protectionLevel="internal|role" /> @@ -3741,6 +3920,8 @@ <!-- Allows an application to set policy related to autofill. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_AUTOFILL" android:protectionLevel="internal|role" /> @@ -3748,6 +3929,8 @@ <!-- Allows an application to set policy related to users. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_USERS" android:protectionLevel="internal|role" /> @@ -3755,6 +3938,8 @@ <!-- Allows an application to set policy related to certificates. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_CERTIFICATES" android:protectionLevel="internal|role" /> @@ -3762,6 +3947,8 @@ <!-- Allows an application to set policy related to override APNs. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_OVERRIDE_APN" android:protectionLevel="internal|role" /> @@ -3769,6 +3956,8 @@ <!-- Allows an application to set policy related to security logging. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_SECURITY_LOGGING" android:protectionLevel="internal|role" /> @@ -3783,6 +3972,8 @@ <!-- Allows an application to set policy related to system updates. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_SYSTEM_UPDATES" android:protectionLevel="internal|role" /> @@ -3790,6 +3981,8 @@ <!-- Allows an application query system updates. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_QUERY_SYSTEM_UPDATES" android:protectionLevel="internal|role" /> @@ -3797,6 +3990,8 @@ <!-- Allows an application to set policy related to private DNS. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_PRIVATE_DNS" android:protectionLevel="internal|role" /> @@ -3804,6 +3999,8 @@ <!-- Allows an application to set policy related to settings. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_SETTINGS" android:protectionLevel="internal|role" /> @@ -3811,17 +4008,24 @@ <!-- Allows an application to set policy related to network logging. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_NETWORK_LOGGING" android:protectionLevel="internal|role" /> - <!-- Allows an application to set policy related to usb data signalling.--> + <!-- Allows an application to set policy related to usb data signalling. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. + --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING" android:protectionLevel="internal|role" /> <!-- Allows an application to set policy related to suspending personal apps. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_SUSPEND_PERSONAL_APPS" android:protectionLevel="internal|role" /> @@ -3829,13 +4033,17 @@ <!-- Allows an application to set policy related to keeping uninstalled packages. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_KEEP_UNINSTALLED_PACKAGES" android:protectionLevel="internal|role" /> <!-- Allows an application to manage policy related to accessibility. - <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call - APIs protected by this permission on users different to the calling user. + <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to + call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_ACCESSIBILITY" android:protectionLevel="internal|role" /> @@ -3843,6 +4051,8 @@ <!-- Allows an application to manage policy related to common criteria mode. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_COMMON_CRITERIA_MODE" android:protectionLevel="internal|role" /> @@ -3850,6 +4060,8 @@ <!-- Allows an application to manage policy related to metered data. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_METERED_DATA" android:protectionLevel="internal|role" /> @@ -3857,6 +4069,8 @@ <!-- Allows an application to set a network-independent global HTTP proxy. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_PROXY" android:protectionLevel="internal|role" /> @@ -3864,6 +4078,8 @@ <!-- Allows an application to request bugreports with user consent. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_BUGREPORT" android:protectionLevel="internal|role" /> @@ -3871,6 +4087,8 @@ <!-- Allows an application to manage policy related to application user data. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_APP_USER_DATA" android:protectionLevel="internal|role" /> @@ -3879,6 +4097,8 @@ permission. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_LOCK" android:protectionLevel="internal|role" /> @@ -3894,6 +4114,8 @@ <!-- Allows an application to manage policy related to system apps. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_SYSTEM_APPS" android:protectionLevel="internal|role" /> @@ -3901,16 +4123,23 @@ <!-- Allows an application to manage policy related to wiping data. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS} is required to call APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_WIPE_DATA" android:protectionLevel="internal|role" /> <!-- Allows an application to manage policy related to the Memory Tagging Extension (MTE). + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_MTE" android:protectionLevel="internal|role" /> - <!-- Allows an application to manage policy related to device identifiers. --> + <!-- Allows an application to manage policy related to device identifiers. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. + --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_DEVICE_IDENTIFIERS" android:protectionLevel="internal|role" /> @@ -3921,46 +4150,62 @@ <permission android:name="android.permission.MANAGE_DEVICE_POLICY_CONTENT_PROTECTION" android:protectionLevel="internal|role" /> - <!-- Allows an application to manage policy related to executing app functions. + <!-- Allows an application to manage policy related to AppFunctions. <p>Protection level: internal|role @FlaggedApi(android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER) --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_APP_FUNCTIONS" - android:protectionLevel="internal|role" - android:featureFlag="android.app.appfunctions.flags.enable_app_function_manager" /> + android:featureFlag="android.app.appfunctions.flags.enable_app_function_manager" + android:protectionLevel="internal|role" /> <!-- Allows an application to set policy related to subscriptions downloaded by an admin. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call - APIs protected by this permission on users different to the calling user. + APIs protected by this permission on users different to the calling user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_MANAGED_SUBSCRIPTIONS" android:protectionLevel="internal|role" /> - <!-- Allows an application to manage policy related to block package uninstallation. --> + <!-- Allows an application to manage policy related to block package uninstallation. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. + --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_BLOCK_UNINSTALL" android:protectionLevel="internal|role" /> - <!-- Allows an application to manage policy related to camera toggle. --> + <!-- Allows an application to manage policy related to camera toggle. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. + --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_CAMERA_TOGGLE" android:protectionLevel="internal|role" /> - <!-- Allows an application to manage policy related to microphone toggle. --> + <!-- Allows an application to manage policy related to microphone toggle. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. + --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_MICROPHONE_TOGGLE" android:protectionLevel="internal|role" /> <!-- Allows an application to set device policies outside the current user that are critical for securing data within the current user. <p>Holding this permission allows the use of other held MANAGE_DEVICE_POLICY_* - permissions across all users on the device provided they are required for securing data - within the current user.--> + permissions across all users on the device provided they are required for securing data + within the current user. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. + --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL" android:protectionLevel="internal|role" /> <!-- Allows an application to set device policies outside the current user that are required for securing device ownership without accessing user data. <p>Holding this permission allows the use of other held MANAGE_DEVICE_POLICY_* - permissions across all users on the device provided they do not grant access to user - data. --> + permissions across all users on the device provided they do not grant access to user data. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. + --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_ACROSS_USERS" android:protectionLevel="internal|role" /> @@ -3968,7 +4213,10 @@ <p>Fuller form of {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS} that removes the restriction on accessing user data. <p>Holding this permission allows the use of any other held MANAGE_DEVICE_POLICY_* - permissions across all users on the device.--> + permissions across all users on the device. + <p>Protection level: internal|role + <p>Intended for use by the DEVICE_POLICY_MANAGEMENT role only. + --> <permission android:name="android.permission.MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL" android:protectionLevel="internal|role" /> @@ -3987,19 +4235,24 @@ android:protectionLevel="signature|installer" /> <uses-permission android:name="android.permission.MANAGE_ENHANCED_CONFIRMATION_STATES" /> - <!-- Allows an application to toggle the device's advanced protection mode status. - @FlaggedApi("android.security.aapm_api") + <!-- Allows an application to modify the device's advanced protection mode status, and query + the list of enabled features + @FlaggedApi(android.security.Flags.FLAG_AAPM_API) @SystemApi @hide --> <permission android:name="android.permission.MANAGE_ADVANCED_PROTECTION_MODE" android:protectionLevel="signature|privileged" android:featureFlag="android.security.aapm_api"/> + <uses-permission android:name="android.permission.MANAGE_ADVANCED_PROTECTION_MODE" + android:featureFlag="android.security.aapm_api"/> <!-- Allows an application to query the device's advanced protection mode status. - @FlaggedApi("android.security.aapm_api") --> + @FlaggedApi(android.security.Flags.FLAG_AAPM_API) --> <permission android:name="android.permission.QUERY_ADVANCED_PROTECTION_MODE" android:protectionLevel="normal" android:featureFlag="android.security.aapm_api"/> + <uses-permission android:name="android.permission.QUERY_ADVANCED_PROTECTION_MODE" + android:featureFlag="android.security.aapm_api"/> <!-- Allows an application to read the state of the IntrusionDetectionService @FlaggedApi(android.security.Flags.FLAG_AFL_API) @@ -4175,62 +4428,6 @@ android:protectionLevel="signature" /> <!-- ================================== --> - <!-- Permissions associated with picture profiles and processing --> - <!-- ================================== --> - <eat-comment /> - - <!-- @FlaggedApi(android.media.tv.flags.Flags.apply_picture_profiles) - Allows an app to apply a {@link MediaQualityManager.PictureProfile} to a layer via - {@link MediaCodec.PARAMETER_KEY_PICTURE_PROFILE} and, additionally, system apps via - {@link SurfaceControl.Transaction#setPictureProfileHandle}. - --> - <permission android:name="android.permission.APPLY_PICTURE_PROFILE" - android:protectionLevel="normal" - android:featureFlag="android.media.tv.flags.apply_picture_profiles"/> - - <!-- @hide - Allows MediaQualityManager to observe any {@link MediaQualityManager.PictureProfile} - applied to any layer in the system by apps via - {@link MediaCodec.PARAMETER_KEY_PICTURE_PROFILE} and by system apps via - {@link SurfaceControl.Transaction#setPictureProfileHandle}. - --> - <permission android:name="android.permission.OBSERVE_PICTURE_PROFILES" - android:protectionLevel="signature|privileged" - android:featureFlag="android.media.tv.flags.apply_picture_profiles"/> - - <!-- - @SystemApi - @FlaggedApi("android.media.tv.flags.media_quality_fw") - Allows an application to access its picture profile from the media quality database. - <p> Protection level: signature|privileged|vendor privileged - @hide - --> - <permission android:name="android.permission.MANAGE_GLOBAL_PICTURE_QUALITY_SERVICE" - android:protectionLevel="signature|privileged|vendorPrivileged" - android:featureFlag="android.media.tv.flags.media_quality_fw"/> - - <!-- - @SystemApi - @FlaggedApi("android.media.tv.flags.media_quality_fw") - Allows an application to access its sound profile from the media quality database. - <p> Protection level: signature|privileged|vendor privileged - @hide - --> - <permission android:name="android.permission.MANAGE_GLOBAL_SOUND_QUALITY_SERVICE" - android:protectionLevel="signature|privileged|vendorPrivileged" - android:featureFlag="android.media.tv.flags.media_quality_fw"/> - - <!-- - @FlaggedApi(android.media.tv.flags.Flags.FLAG_MEDIA_QUALITY_FW) - Allows an application to read the aggregated color zones on the screen for use cases like - TV ambient backlight usages. - <p> Protection level: normal - --> - <permission android:name="android.permission.READ_COLOR_ZONES" - android:protectionLevel="normal" - android:featureFlag="android.media.tv.flags.media_quality_fw"/> - - <!-- ================================== --> <!-- Permissions affecting the display of other applications --> <!-- ================================== --> <eat-comment /> @@ -4339,11 +4536,11 @@ <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_GLASSES" android:protectionLevel="normal" /> - <!-- Allows application to request to be associated with a virtual display capable of streaming + <!-- Allows application to request to be associated with a virtual device capable of streaming Android applications ({@link android.companion.AssociationRequest#DEVICE_PROFILE_APP_STREAMING}) by {@link android.companion.CompanionDeviceManager}. - <p>Not for use by third-party applications. + <p>Not for use by third-party applications. --> <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING" android:protectionLevel="signature|privileged" /> @@ -4351,16 +4548,26 @@ <!-- Allows application to request to stream content from an Android host to a nearby device ({@link android.companion.AssociationRequest#DEVICE_PROFILE_NEARBY_DEVICE_STREAMING}) by {@link android.companion.CompanionDeviceManager}. - <p>Not for use by third-party applications. + <p>Not for use by third-party applications. --> <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_NEARBY_DEVICE_STREAMING" android:protectionLevel="signature|privileged" /> + <!-- Allows application to request to stream content from an Android host to a nearby device + ({@link android.companion.AssociationRequest#DEVICE_PROFILE_VIRTUAL_DEVICE}) + by {@link android.companion.CompanionDeviceManager}. + <p>Not for use by third-party applications. + @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_ENABLE_LIMITED_VDM_ROLE) + --> + <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_VIRTUAL_DEVICE" + android:protectionLevel="signature|privileged" + android:featureFlag="android.companion.virtualdevice.flags.enable_limited_vdm_role" /> + <!-- Allows application to request to be associated with a vehicle head unit capable of automotive projection ({@link android.companion.AssociationRequest#DEVICE_PROFILE_AUTOMOTIVE_PROJECTION}) by {@link android.companion.CompanionDeviceManager}. - <p>Not for use by third-party applications. + <p>Not for use by third-party applications. --> <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION" android:protectionLevel="internal|role" /> @@ -4369,7 +4576,7 @@ and/or data with other devices, such as notifications, photos and media ({@link android.companion.AssociationRequest#DEVICE_PROFILE_COMPUTER}) by {@link android.companion.CompanionDeviceManager}. - <p>Not for use by third-party applications. + <p>Not for use by third-party applications. --> <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_COMPUTER" android:protectionLevel="signature|privileged" /> @@ -4413,7 +4620,7 @@ to enter PiP when the user leaves the app. This permission should only be used for certain PiP <a href="{@docRoot}training/tv/get-started/multitasking#usage-types">usage types</a>. - @FlaggedApi("android.app.enable_tv_implicit_enter_pip_restriction") + @FlaggedApi(android.app.Flags.FLAG_ENABLE_TV_IMPLICIT_ENTER_PIP_RESTRICTION) --> <permission android:name="android.permission.TV_IMPLICIT_ENTER_PIP" android:protectionLevel="normal" @@ -4881,7 +5088,7 @@ <permission android:name="android.permission.REQUEST_UNIQUE_ID_ATTESTATION" android:protectionLevel="signature" /> - <!-- Allows the caller to bind with Remote Key Provisioning service. + <!-- Allows an application to use the RemoteKeyProvisioningService. @hide --> <permission android:name="android.permission.BIND_RKP_SERVICE" android:protectionLevel="signature" /> @@ -5023,6 +5230,182 @@ android:protectionLevel="signature|privileged" /> <!-- ==================================== --> + <!-- Permissions for XR perception data --> + <!-- ==================================== --> + <eat-comment /> + + <!-- Used for permissions that are associated with accessing XR + tracked information about the person using the device and the + environment around them. + + @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) --> + <permission-group android:name="android.permission-group.XR_TRACKING" + android:label="@string/permgrouplab_xr_tracking" + android:description="@string/permgroupdesc_xr_tracking" + android:priority="100" + android:featureFlag="android.xr.xr_manifest_entries" /> + + <!-- Allows an application to get approximate eye gaze. + + <p>Protection level: dangerous + + @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) --> + <permission android:name="android.permission.EYE_TRACKING_COARSE" + android:protectionLevel="dangerous" + android:permissionGroup="android.permission-group.UNDEFINED" + android:label="@string/permlab_eye_tracking_coarse" + android:description="@string/permdesc_eye_tracking_coarse" + android:featureFlag="android.xr.xr_manifest_entries" /> + + <!-- Allows an application to get face tracking data. + + <p>Protection level: dangerous + + @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) --> + <permission android:name="android.permission.FACE_TRACKING" + android:protectionLevel="dangerous" + android:permissionGroup="android.permission-group.UNDEFINED" + android:label="@string/permlab_face_tracking" + android:description="@string/permdesc_face_tracking" + android:featureFlag="android.xr.xr_manifest_entries" /> + + <!-- Allows an application to get hand tracking data. + + <p>Protection level: dangerous + + @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) --> + <permission android:name="android.permission.HAND_TRACKING" + android:protectionLevel="dangerous" + android:permissionGroup="android.permission-group.UNDEFINED" + android:label="@string/permlab_hand_tracking" + android:description="@string/permdesc_hand_tracking" + android:featureFlag="android.xr.xr_manifest_entries" /> + + <!-- Allows an application to get data derived by sensing the + user's environment. + + <p>Protection level: dangerous + + @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) --> + <permission android:name="android.permission.SCENE_UNDERSTANDING_COARSE" + android:protectionLevel="dangerous" + android:permissionGroup="android.permission-group.UNDEFINED" + android:description="@string/permdesc_scene_understanding_coarse" + android:label="@string/permlab_scene_understanding_coarse" + android:featureFlag="android.xr.xr_manifest_entries" /> + + <!-- Used for permissions that are associated with accessing + particularly sensitive XR tracking data. + + @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) --> + <permission-group android:name="android.permission-group.XR_TRACKING_SENSITIVE" + android:label="@string/permgrouplab_xr_tracking_sensitive" + android:description="@string/permgroupdesc_xr_tracking_sensitive" + android:priority="100" + android:featureFlag="android.xr.xr_manifest_entries" /> + + <!-- Allows an application to get precise eye gaze data. + + <p>Protection level: dangerous + + @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) --> + <permission android:name="android.permission.EYE_TRACKING_FINE" + android:protectionLevel="dangerous" + android:permissionGroup="android.permission-group.UNDEFINED" + android:label="@string/permlab_eye_tracking_fine" + android:description="@string/permdesc_eye_tracking_fine" + android:featureFlag="android.xr.xr_manifest_entries" /> + + <!-- Allows an application to get head tracking data. Unmanaged + activities (OpenXR activities with the manifest property + "android.window.PROPERTY_XR_ACTIVITY_START_MODE" set to + "XR_ACTIVITY_START_MODE_FULL_SPACE_UNMANAGED") do not require + this permission to get head tracking data. + + {@see https://developer.android.com/develop/xr/get-started#property_activity_xr_start_mode_property} + + <p>Protection level: dangerous + + @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) --> + <permission android:name="android.permission.HEAD_TRACKING" + android:protectionLevel="dangerous" + android:permissionGroup="android.permission-group.UNDEFINED" + android:label="@string/permlab_head_tracking" + android:description="@string/permdesc_head_tracking" + android:featureFlag="android.xr.xr_manifest_entries" /> + + <!-- Allows an application to get highly precise data derived by sensing the + user's environment, such as a depth map. + + <p>Protection level: dangerous + + @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) --> + <permission android:name="android.permission.SCENE_UNDERSTANDING_FINE" + android:protectionLevel="dangerous" + android:permissionGroup="android.permission-group.UNDEFINED" + android:description="@string/permdesc_scene_understanding_fine" + android:label="@string/permlab_scene_understanding_fine" + android:featureFlag="android.xr.xr_manifest_entries" /> + + <!-- Allows an application to trigger Eye Calibration, which + calibrates for IPD (inter-pupillary distance) adjustment and + eye tracking. + + <p>Protection level: signature|privileged + + @SystemApi + @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) + @hide --> + <permission android:name="android.permission.EYE_CALIBRATION" + android:protectionLevel="signature|privileged" + android:featureFlag="android.xr.xr_manifest_entries" /> + + <!-- Allows an application to trigger Face Tracking Calibration. + + <p>Protection level: signature|privileged + + @SystemApi + @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) + @hide --> + <permission android:name="android.permission.FACE_TRACKING_CALIBRATION" + android:protectionLevel="signature|privileged" + android:featureFlag="android.xr.xr_manifest_entries" /> + + <!-- Allows an application to import an anchor created and + exported by another application. + + <p>Protection level: signature|privileged + + @SystemApi + @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) + @hide --> + <permission android:name="android.permission.IMPORT_XR_ANCHOR" + android:protectionLevel="signature|privileged" + android:featureFlag="android.xr.xr_manifest_entries" /> + + <!-- Allows an application to access XR tracking data while in the + background. Without this permission, XR tracking data such as + head tracking, hand tracking, eye tracking, or face tracking + is only available to an activity it is in the + foreground. With this permission, such data is also available + to services and to activities that are in the background. + + <p>This permission must be granted in addition to the + corresponding permission such as {@link #HEAD_TRACKING} or + {@link #FACE_TRACKING} for the data being accessed. + + <p>Protection level: signature|privileged + + @SystemApi + @FlaggedApi(android.xr.Flags.FLAG_XR_MANIFEST_ENTRIES) + @hide --> + <permission android:name="android.permission.XR_TRACKING_IN_BACKGROUND" + android:protectionLevel="signature|privileged" + android:description="@string/permdesc_xr_tracking_in_background" + android:label="@string/permlab_xr_tracking_in_background" + android:featureFlag="android.xr.xr_manifest_entries" /> + + <!-- ==================================== --> <!-- Private permissions --> <!-- ==================================== --> <eat-comment /> @@ -5199,10 +5582,9 @@ <permission android:name="android.permission.CHANGE_ACCESSIBILITY_VOLUME" android:protectionLevel="signature" /> - <!-- @FlaggedApi("com.android.server.accessibility.motion_event_observing") - @hide - @TestApi - Allows an accessibility service to observe motion events without consuming them. --> + <!-- @TestApi Allows an accessibility service to observe motion events + without consuming them. + @hide --> <permission android:name="android.permission.ACCESSIBILITY_MOTION_EVENT_OBSERVING" android:protectionLevel="signature" /> @@ -5441,12 +5823,23 @@ <permission android:name="android.permission.BIND_VISUAL_QUERY_DETECTION_SERVICE" android:protectionLevel="signature" /> - <!-- Allows an application to subscribe to keyguard locked (i.e., showing) state. - <p>Protection level: signature|role - <p>Intended for use by ROLE_ASSISTANT and signature apps only. + <!-- Allows an application to subscribe to device locked and keyguard locked (i.e., showing) + state. + <p>Protection level: signature|module|role + <p>Intended for use by ROLE_ASSISTANT, VDM, and signature apps only. --> <permission android:name="android.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE" - android:protectionLevel="signature|module|role"/> + android:protectionLevel="signature|module|role" + android:featureFlag="!android.security.subscribe_to_keyguard_locked_state_perm_priv_flag"/> + + <!-- Allows an application to subscribe to device locked and keyguard locked (i.e., showing) + state. + <p>Protection level: signature|privileged|module|role + <p>Intended for use by ROLE_ASSISTANT, VDM, and signature / privileged apps only. + --> + <permission android:name="android.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE" + android:protectionLevel="signature|privileged|module|role" + android:featureFlag="android.security.subscribe_to_keyguard_locked_state_perm_priv_flag"/> <!-- Must be required by a {@link android.service.autofill.AutofillService}, to ensure that only the system can bind to it. @@ -5620,6 +6013,17 @@ <permission android:name="android.permission.BIND_TV_INPUT" android:protectionLevel="signature|privileged" /> + <!-- This permission is required among systems services to always keep the + binding with TvInputManagerService. + <p>This should only be used by the OEM TvInputService. + @FlaggedApi("android.media.tv.flags.tif_unbind_inactive_tis") + <p>Protection level: signature|privileged|vendorPrivileged + @hide + --> + <permission android:name="android.permission.ALWAYS_BOUND_TV_INPUT" + android:protectionLevel="signature|privileged|vendorPrivileged" + android:featureFlag="android.media.tv.flags.tif_unbind_inactive_tis"/> + <!-- Must be required by a {@link android.media.tv.interactive.TvInteractiveAppService} to ensure that only the system can bind to it. <p>Protection level: signature|privileged @@ -5677,15 +6081,6 @@ <permission android:name="android.permission.TUNER_RESOURCE_ACCESS" android:protectionLevel="signature|privileged|vendorPrivileged" /> - <!-- This permission is required among systems services to always keep the - binding with TvInputManagerService. - <p>Protection level: signature|privileged|vendorPrivileged - <p>This should only be used by the OEM TvInputService. - @hide --> - <permission android:name="android.permission.ALWAYS_BOUND_TV_INPUT" - android:protectionLevel="signature|privileged|vendorPrivileged" - android:featureFlag="android.media.tv.flags.tif_unbind_inactive_tis"/> - <!-- @SystemApi This permission is required by Media Resource Manager Service when system services create MediaCodecs on behalf of other processes and apps. <p>Protection level: signature|privileged|vendorPrivileged @@ -5734,17 +6129,6 @@ <permission android:name="android.permission.LOCK_DEVICE" android:protectionLevel="signature|privileged" /> - <!-- @SystemApi - @FlaggedApi(android.security.Flags.FLAG_SECURE_LOCKDOWN) - Allows an application to lock down the device into an enhanced security state. - <p>Not for use by third-party applications. - <p>Protection level: signature|privileged - @hide - --> - <permission android:name="android.permission.MANAGE_SECURE_LOCK_DEVICE" - android:protectionLevel="signature|privileged" - android:featureFlag="android.security.secure_lockdown" /> - <!-- @SystemApi Allows low-level access to setting the orientation (actually rotation) of the screen. <p>Not for use by third-party applications. @@ -6124,7 +6508,7 @@ <!-- Allows an application to subscribe to notifications about the nearby devices' presence status change base on the UUIDs. <p>Not for use by third-party applications.</p> - @FlaggedApi("android.companion.flags.device_presence") + @FlaggedApi("android.companion.device_presence") --> <permission android:name="android.permission.REQUEST_OBSERVE_DEVICE_UUID_PRESENCE" android:protectionLevel="signature|privileged" /> @@ -6137,8 +6521,7 @@ android:protectionLevel="normal" /> <!-- Allows an application to send and receive messages via CDM transports. - @hide - --> + @hide --> <permission android:name="android.permission.USE_COMPANION_TRANSPORTS" android:protectionLevel="signature" /> @@ -6356,10 +6739,10 @@ android:protectionLevel="signature|privileged|role" /> <!-- @SystemApi Allows an application to bypass concurrency restrictions while - recording audio. For example, apps with this permission can continue to record - while a voice call is active.</p> - @FlaggedApi(android.media.audio.Flags.FLAG_CONCURRENT_AUDIO_RECORD_BYPASS_PERMISSION) - @hide --> + recording audio. For example, apps with this permission can continue to record + while a voice call is active.</p> + @FlaggedApi(android.media.audio.Flags.FLAG_CONCURRENT_AUDIO_RECORD_BYPASS_PERMISSION) + @hide --> <permission android:name="android.permission.BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION" android:featureFlag="android.media.audio.concurrent_audio_record_bypass_permission" android:protectionLevel="signature|privileged" /> @@ -7050,9 +7433,8 @@ android:protectionLevel="signature" /> <!-- Allows an application to set the advanced features on BiometricDialog (SystemUI), including - logo, logo description. + logo, logo description, and content view with more options button. <p>Not for use by third-party applications. - @FlaggedApi("android.hardware.biometrics.custom_biometric_prompt") --> <permission android:name="android.permission.SET_BIOMETRIC_DIALOG_ADVANCED" android:protectionLevel="signature|privileged" /> @@ -7377,7 +7759,17 @@ @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") @hide --> <permission android:name="android.permission.READ_BLOCKED_NUMBERS" - android:protectionLevel="signature" /> + android:protectionLevel="signature" + android:featureFlag="!android.permission.flags.grant_read_blocked_numbers_to_system_ui_intelligence" /> + + <!-- Allows the holder to read blocked numbers. See + {@link android.provider.BlockedNumberContract}. + @SystemApi + @FlaggedApi("com.android.server.telecom.flags.telecom_resolve_hidden_dependencies") + @hide --> + <permission android:name="android.permission.READ_BLOCKED_NUMBERS" + android:protectionLevel="signature|role" + android:featureFlag="android.permission.flags.grant_read_blocked_numbers_to_system_ui_intelligence" /> <!-- Allows the holder to write blocked numbers. See {@link android.provider.BlockedNumberContract}. @@ -7482,9 +7874,9 @@ <permission android:name="android.permission.ACCESS_SMARTSPACE" android:protectionLevel="signature|privileged|development" /> - <!-- @SystemApi Allows an application to access the contextual search - service as a client. - @hide <p>Not for use by third-party applications.</p> --> + <!-- @SystemApi Allows an application to start a contextual search. + @FlaggedApi("android.app.contextualsearch.flags.enable_service") + @hide <p>Not for use by third-party applications.</p> --> <permission android:name="android.permission.ACCESS_CONTEXTUAL_SEARCH" android:protectionLevel="signature|privileged" android:featureFlag="android.app.contextualsearch.flags.enable_service"/> @@ -7701,7 +8093,8 @@ <permission android:name="android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE" android:protectionLevel="signature" /> - <!-- Must be required by an {@link android.service.watchdog.ExplicitHealthCheckService} to + <!-- @FlaggedApi(android.crashrecovery.flags.Flags.FLAG_ENABLE_CRASHRECOVERY) @SystemApi + Must be required by an {@link android.service.watchdog.ExplicitHealthCheckService} to ensure that only the system can bind to it. @hide This is not a third-party API (intended for OEMs and system apps). --> @@ -7827,7 +8220,7 @@ <!-- @SystemApi Allows an application to access shared libraries. @hide --> <permission android:name="android.permission.ACCESS_SHARED_LIBRARIES" - android:protectionLevel="signature|installer|role" + android:protectionLevel="signature|installer|role" android:featureFlag="android.content.pm.sdk_dependency_installer" /> <!-- @SystemApi Permission held by the system to allow binding to the dependency installer role @@ -7921,8 +8314,6 @@ android:protectionLevel="signature|role"/> <!-- Allows an application to create displays that mirror other displays' content. - <p>Not for use by third-party applications. - <p>Protection level: internal|role @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_ENABLE_LIMITED_VDM_ROLE) @hide @SystemApi --> <permission android:name="android.permission.ADD_MIRROR_DISPLAY" @@ -8103,32 +8494,14 @@ android:featureFlag="android.app.appfunctions.flags.enable_app_function_manager" android:protectionLevel="signature" /> - <!-- @SystemApi Allows a trusted application to perform actions on behalf of users inside of - applications with privacy guarantees from the system. - <p>This permission is currently only granted to system packages in the - {@link android.app.role.SYSTEM_UI_INTELLIGENCE} role which complies with privacy - requirements outlined in the Android CDD section "9.8.6 Content Capture". - <p>Apps are not able to opt-out from caller having this permission. - <p>Protection level: internal|role - @hide - @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") --> - <permission android:name="android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED" - android:featureFlag="android.app.appfunctions.flags.enable_app_function_manager" - android:protectionLevel="internal|role" /> - - <!-- @SystemApi Allows an application to perform actions on behalf of users inside of + <!-- Allows an application to perform actions on behalf of users inside of applications. - <p>This permission is currently only granted to preinstalled / system apps having the - {@link android.app.role.ASSISTANT} role. - <p>Apps contributing app functions can opt to disallow callers with this permission, - limiting to only callers with {@link android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED} - instead. - <p>Protection level: internal|role - @hide - @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") --> + <p>This permission is currently only granted to privileged system apps. + <p>Protection level: internal|privileged + @FlaggedApi(android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER) --> <permission android:name="android.permission.EXECUTE_APP_FUNCTIONS" android:featureFlag="android.app.appfunctions.flags.enable_app_function_manager" - android:protectionLevel="internal|role" /> + android:protectionLevel="internal|privileged" /> <!-- Allows an application to display its suggestions using the autofill framework. <p>For now, this permission is only granted to the Browser application. @@ -8252,13 +8625,21 @@ <permission android:name="android.permission.MONITOR_STICKY_MODIFIER_STATE" android:protectionLevel="signature" /> - <!-- Allows low-level access to manage key gestures + <!-- Allows low-level access to manage key gestures. <p>Not for use by third-party applications. @hide --> <permission android:name="android.permission.MANAGE_KEY_GESTURES" android:protectionLevel="signature" android:featureFlag="com.android.hardware.input.manage_key_gestures" /> + <!-- Allows applications to register listeners for key activeness through + InputManagerService. + <p>Protection level: signature + @hide --> + <permission android:name="android.permission.LISTEN_FOR_KEY_ACTIVITY" + android:protectionLevel="signature" + android:featureFlag="com.android.hardware.input.key_event_activity_detection" /> + <uses-permission android:name="android.permission.HANDLE_QUERY_PACKAGE_RESTART" /> <!-- Allows financed device kiosk apps to perform actions on the Device Lock service @@ -8479,16 +8860,8 @@ <permission android:name="android.permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW" android:protectionLevel="signature|privileged" /> - <!-- Allows internal applications to restrict display modes - <p>Protection level: signature - @FlaggedApi("com.android.server.display.feature.flags.enable_restrict_display_modes") - @hide - --> - <permission android:name="android.permission.RESTRICT_DISPLAY_MODES" - android:protectionLevel="signature" /> - <!-- @hide @SystemApi - @FlaggedApi("com.android.server.notification.flags.redact_otp_notifications_from_untrusted_listeners") + @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") Allows apps with a NotificationListenerService to receive notifications with sensitive information <p>Apps with a NotificationListenerService without this permission will not be able @@ -8528,6 +8901,14 @@ <permission android:name="android.permission.EMERGENCY_INSTALL_PACKAGES" android:protectionLevel="signature|privileged"/> + <!-- Allows internal applications to restrict display modes + <p>Not for use by third-party applications. + <p>Protection level: signature + @hide + --> + <permission android:name="android.permission.RESTRICT_DISPLAY_MODES" + android:protectionLevel="signature" /> + <!-- Allows internal applications to override screen timeout temporarily <p>Protection level: signature <p>Not for use by third-party applications. @@ -8546,24 +8927,24 @@ <permission android:name="android.permission.SETUP_FSVERITY" android:protectionLevel="signature|privileged"/> - <!-- - @TestApi - Signature permission reserved for testing. This should never be used to - gate any actual functionality. - <p> - Protection level: signature + <!-- @SystemApi + @FlaggedApi(android.security.Flags.FLAG_SECURE_LOCKDOWN) + Allows an application to lock down the device into an enhanced security state. + <p>Not for use by third-party applications. + <p>Protection level: signature|privileged @hide --> - <permission android:name="android.permission.RESERVED_FOR_TESTING_SIGNATURE" - android:protectionLevel="signature"/> + <permission android:name="android.permission.MANAGE_SECURE_LOCK_DEVICE" + android:protectionLevel="signature|privileged" + android:featureFlag="android.security.secure_lockdown" /> <!-- Allows app to enter trade-in-mode. - <p>Protection level: signature|privileged + <p>Protection level: signature @hide --> <permission android:name="android.permission.ENTER_TRADE_IN_MODE" - android:protectionLevel="signature|privileged" - android:featureFlag="com.android.tradeinmode.flags.enable_trade_in_mode" /> + android:protectionLevel="signature|privileged" + android:featureFlag="com.android.tradeinmode.flags.enable_trade_in_mode" /> <!-- @SystemApi @FlaggedApi(com.android.art.flags.Flags.FLAG_EXECUTABLE_METHOD_FILE_OFFSETS) @@ -8575,6 +8956,31 @@ android:protectionLevel="signature" android:featureFlag="com.android.art.flags.executable_method_file_offsets" /> + <!-- + @SystemApi + @FlaggedApi(android.content.pm.Flags.FLAG_UID_BASED_PROVIDER_LOOKUP) + Allows an app to resolve components (e.g ContentProviders) on behalf of + other UIDs + <p>Protection level: signature|privileged + @hide + --> + <permission + android:name="android.permission.RESOLVE_COMPONENT_FOR_UID" + android:protectionLevel="signature|privileged" + android:featureFlag="android.content.pm.uid_based_provider_lookup" /> + <uses-permission android:name="android.permission.RESOLVE_COMPONENT_FOR_UID" /> + + <!-- + @TestApi + Signature permission reserved for testing. This should never be used to + gate any actual functionality. + <p> + Protection level: signature + @hide + --> + <permission android:name="android.permission.RESERVED_FOR_TESTING_SIGNATURE" + android:protectionLevel="signature"/> + <!-- @SystemApi @FlaggedApi("android.media.tv.flags.kids_mode_tvdb_sharing") This permission is required when accessing information related to @@ -8589,31 +8995,15 @@ <!-- @SystemApi @FlaggedApi("android.permission.flags.text_classifier_choice_api_enabled") - This permission is required to access the specific text classifier you need from the + This permission is required to access the specific text classifier from the TextClassificationManager. - <p>Protection level: signature|role + <p>Protection level: signature|role|privileged @hide --> <permission android:name="android.permission.ACCESS_TEXT_CLASSIFIER_BY_TYPE" - android:protectionLevel="signature|role" + android:protectionLevel="signature|role|privileged" android:featureFlag="android.permission.flags.text_classifier_choice_api_enabled"/> - <!-- - This permission allows the system to receive PACKAGE_CHANGED broadcasts when the component - state of a non-exported component has been changed. - <p>Not for use by third-party applications. </p> - <p>Protection level: internal - @hide - --> - <permission - android:name="android.permission.INTERNAL_RECEIVE_PACKAGE_CHANGED_BROADCAST_ON_COMPONENT_STATE_CHANGED" - android:protectionLevel="internal" - android:featureFlag="android.content.pm.reduce_broadcasts_for_component_state_changes"/> - - <uses-permission - android:name="android.permission.INTERNAL_RECEIVE_PACKAGE_CHANGED_BROADCAST_ON_COMPONENT_STATE_CHANGED" - android:featureFlag="android.content.pm.reduce_broadcasts_for_component_state_changes"/> - <!-- Attribution for Geofencing service. --> <attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/> <!-- Attribution for Country Detector. --> @@ -8667,7 +9057,7 @@ </activity> <activity android:name="com.android.internal.accessibility.dialog.AccessibilityButtonChooserActivity" android:exported="false" - android:theme="@style/Theme.DeviceDefault.Resolver" + android:theme="@style/AccessibilityButtonChooserDialog" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true" android:documentLaunchMode="never" @@ -8771,7 +9161,7 @@ <activity android:name="android.accounts.GrantCredentialsPermissionActivity" android:excludeFromRecents="true" android:exported="true" - android:theme="@style/Theme.DeviceDefault.Light.DialogWhenLarge" + android:theme="@style/GrantCredentialsPermissionActivity" android:process=":ui" android:visibleToInstantApps="true"> </activity> @@ -8847,9 +9237,11 @@ android:process=":ui"> </activity> + <!-- BlockedAppStreamingActivity is launched as the system user. --> <activity android:name="com.android.internal.app.BlockedAppStreamingActivity" android:theme="@style/Theme.Dialog.Confirmation" android:excludeFromRecents="true" + android:showForAllUsers="true" android:process=":ui"> </activity> @@ -8947,15 +9339,6 @@ </intent-filter> </receiver> - <receiver android:name="com.android.server.updates.CertificateTransparencyLogInstallReceiver" - android:exported="true" - android:permission="android.permission.UPDATE_CONFIG"> - <intent-filter> - <action android:name="android.intent.action.UPDATE_CT_LOGS" /> - <data android:scheme="content" android:host="*" android:mimeType="*/*" /> - </intent-filter> - </receiver> - <receiver android:name="com.android.server.updates.LangIdInstallReceiver" android:exported="true" android:permission="android.permission.UPDATE_CONFIG"> @@ -9050,6 +9433,11 @@ android:permission="android.permission.BIND_JOB_SERVICE" > </service> + <service android:name="com.android.server.memory.ZramMaintenance" + android:exported="false" + android:permission="android.permission.BIND_JOB_SERVICE" > + </service> + <service android:name="com.android.server.ZramWriteback" android:exported="false" android:permission="android.permission.BIND_JOB_SERVICE" > @@ -9204,22 +9592,23 @@ android:permission="android.permission.BIND_JOB_SERVICE" > </service> - <service android:name="android.app.ecm.EnhancedConfirmationCallTrackerService" - android:permission="android.permission.BIND_INCALL_SERVICE" - android:featureFlag="android.permission.flags.enhanced_confirmation_in_call_apis_enabled" - android:exported="true"> + <service android:name="com.android.server.companion.datatransfer.contextsync.CallMetadataSyncInCallService" + android:permission="android.permission.BIND_INCALL_SERVICE" + android:enabled="@bool/config_enableContextSyncInCall" + android:exported="true"> <meta-data android:name="android.telecom.INCLUDE_SELF_MANAGED_CALLS" - android:value="true" /> + android:value="true" /> <intent-filter> <action android:name="android.telecom.InCallService"/> </intent-filter> </service> - <service android:name="com.android.server.companion.datatransfer.contextsync.CallMetadataSyncInCallService" - android:permission="android.permission.BIND_INCALL_SERVICE" - android:exported="true"> + <service android:name="com.android.ecm.EnhancedConfirmationCallTrackerService" + android:permission="android.permission.BIND_INCALL_SERVICE" + android:featureFlag="android.permission.flags.enhanced_confirmation_in_call_apis_enabled" + android:exported="true"> <meta-data android:name="android.telecom.INCLUDE_SELF_MANAGED_CALLS" - android:value="true" /> + android:value="true" /> <intent-filter> <action android:name="android.telecom.InCallService"/> </intent-filter> diff --git a/tests/cts/permissionpolicy/res/raw/automotive_android_manifest.xml b/tests/cts/permissionpolicy/res/raw/automotive_android_manifest.xml index 9114a1ecd..2b40d3ed7 100644 --- a/tests/cts/permissionpolicy/res/raw/automotive_android_manifest.xml +++ b/tests/cts/permissionpolicy/res/raw/automotive_android_manifest.xml @@ -80,6 +80,12 @@ android:protectionLevel="signature|privileged" android:label="@string/car_permission_label_control_car_seats" android:description="@string/car_permission_desc_control_car_seats"/> + <permission android:name="android.car.permission.READ_CAR_SEATS" + android:permissionGroup="android.car.permission-group.CAR_MONITORING" + android:protectionLevel="dangerous" + android:label="@string/car_permission_label_read_car_seats" + android:description="@string/car_permission_desc_read_car_seats" + android:featureFlag="android.car.feature.vehicle_property_25q2_3p_permissions"/> <permission android:name="android.car.permission.CONTROL_CAR_AIRBAGS" android:protectionLevel="signature|privileged" android:label="@string/car_permission_label_control_car_airbags" @@ -121,10 +127,22 @@ android:protectionLevel="signature|privileged" android:label="@string/car_permission_label_car_tires" android:description="@string/car_permission_desc_car_tires"/> + <permission android:name="android.car.permission.CAR_TIRES_3P" + android:permissionGroup="android.car.permission-group.CAR_MONITORING" + android:protectionLevel="dangerous" + android:label="@string/car_permission_label_car_tires_3p" + android:description="@string/car_permission_desc_car_tires_3p" + android:featureFlag="android.car.feature.vehicle_property_25q2_3p_permissions"/> <permission android:name="android.car.permission.READ_CAR_STEERING" android:protectionLevel="signature|privileged" android:label="@string/car_permission_label_car_steering" android:description="@string/car_permission_desc_car_steering"/> + <permission android:name="android.car.permission.READ_CAR_STEERING_3P" + android:permissionGroup="android.permission-group.LOCATION" + android:protectionLevel="dangerous" + android:label="@string/car_permission_label_read_car_steering_3p" + android:description="@string/car_permission_desc_read_car_steering_3p" + android:featureFlag="android.car.feature.vehicle_property_25q2_3p_permissions"/> <permission android:name="android.car.permission.READ_CAR_DISPLAY_UNITS" android:protectionLevel="normal" android:label="@string/car_permission_label_read_car_display_units" @@ -150,6 +168,12 @@ android:protectionLevel="signature|privileged" android:label="@string/car_permission_label_car_engine_detailed" android:description="@string/car_permission_desc_car_engine_detailed"/> + <permission android:name="android.car.permission.CAR_ENGINE_DETAILED_3P" + android:permissionGroup="android.car.permission-group.CAR_MONITORING" + android:protectionLevel="dangerous" + android:label="@string/car_permission_label_car_engine_detailed_3p" + android:description="@string/car_permission_desc_car_engine_detailed_3p" + android:featureFlag="android.car.feature.vehicle_property_25q2_3p_permissions"/> <permission android:name="android.car.permission.CAR_DYNAMICS_STATE" android:protectionLevel="signature|privileged" android:label="@string/car_permission_label_vehicle_dynamics_state" @@ -305,6 +329,12 @@ android:protectionLevel="signature|privileged" android:label="@string/car_permission_label_driving_state" android:description="@string/car_permission_desc_driving_state"/> + <permission android:name="android.car.permission.CAR_DRIVING_STATE_3P" + android:permissionGroup="android.car.permission-group.CAR_MONITORING" + android:protectionLevel="dangerous" + android:label="@string/car_permission_label_driving_state_3p" + android:description="@string/car_permission_desc_driving_state_3p" + android:featureFlag="android.car.feature.vehicle_property_25q2_3p_permissions"/> <permission android:name="android.car.permission.USE_CAR_TELEMETRY_SERVICE" android:protectionLevel="signature|privileged" android:label="@string/car_permission_label_use_telemetry_service" @@ -637,6 +667,12 @@ android:protectionLevel="signature|privileged" android:label="@string/car_permission_label_read_windshield_wipers" android:description="@string/car_permission_desc_read_windshield_wipers"/> + <permission android:name="android.car.permission.READ_WINDSHIELD_WIPERS_3P" + android:permissionGroup="android.car.permission-group.CAR_MONITORING" + android:protectionLevel="dangerous" + android:label="@string/car_permission_label_read_windshield_wipers_3p" + android:description="@string/car_permission_desc_read_windshield_wipers_3p" + android:featureFlag="android.car.feature.vehicle_property_25q2_3p_permissions"/> <permission android:name="android.car.permission.CONTROL_WINDSHIELD_WIPERS" android:protectionLevel="signature|privileged" android:label="@string/car_permission_label_control_windshield_wipers" diff --git a/tests/cts/permissionui/UsePermissionApp30WithBackground/AndroidManifest.xml b/tests/cts/permissionui/UsePermissionApp30WithBackground/AndroidManifest.xml index 5949d08f2..6b9b9f41f 100644 --- a/tests/cts/permissionui/UsePermissionApp30WithBackground/AndroidManifest.xml +++ b/tests/cts/permissionui/UsePermissionApp30WithBackground/AndroidManifest.xml @@ -24,6 +24,8 @@ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> + <uses-permission android:name="android.permission.BODY_SENSORS" /> + <uses-permission android:name="android.permission.BODY_SENSORS_BACKGROUND" /> <application> <activity android:name=".RequestPermissionsActivity" android:exported="true" /> diff --git a/tests/cts/permissionui/src/android/permissionui/cts/AppDataSharingUpdatesTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/AppDataSharingUpdatesTest.kt index 0db639d49..421e93e2d 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/AppDataSharingUpdatesTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/AppDataSharingUpdatesTest.kt @@ -311,6 +311,7 @@ class AppDataSharingUpdatesTest : BaseUsePermissionTest() { } @Test + @Ignore("b/381298073") fun clickUpdate_opensAppLocationPermissionPage() { installAndWaitTillPackageAdded( APP_APK_NAME_31, diff --git a/tests/cts/permissionui/src/android/permissionui/cts/AppPermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/AppPermissionTest.kt index f0c12171c..05c824072 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/AppPermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/AppPermissionTest.kt @@ -18,7 +18,9 @@ package android.permissionui.cts import android.Manifest.permission.ACCESS_COARSE_LOCATION import android.Manifest.permission_group.SMS +import android.app.AppOpsManager import android.os.Build +import android.os.Process import android.permission.flags.Flags import android.platform.test.annotations.RequiresFlagsEnabled import android.platform.test.flag.junit.CheckFlagsRule @@ -31,8 +33,11 @@ import androidx.test.filters.SdkSuppress import androidx.test.uiautomator.By import androidx.test.uiautomator.Until import com.android.compatibility.common.util.DeviceConfigStateChangerRule +import com.android.compatibility.common.util.SystemUtil.eventually +import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity import com.android.modules.utils.build.SdkLevel import com.google.common.truth.Truth +import org.junit.Assert.assertEquals import org.junit.Assume import org.junit.Before import org.junit.Rule @@ -296,6 +301,9 @@ class AppPermissionTest : BaseUsePermissionTest() { APP_APK_NAME_LATEST ) + // TODO: b/388960315 - Remove wait after addressing race condition + waitForModeDefault(APP_PACKAGE_NAME) + navigateToIndividualPermissionSetting(SMS) assertAllowButtonIsDisabledAndRestrictedSettingDialogPoppedUp() @@ -311,6 +319,8 @@ class AppPermissionTest : BaseUsePermissionTest() { @Test fun installFromLocalFile_disabledAllowRadioButtonAndIfClickedAndRestrictedSettingDialog_SMSPermGroup() { installPackageWithInstallSourceAndMetadataFromLocalFile(APP_APK_NAME_LATEST) + // TODO: b/388960315 - Remove wait after addressing race condition + waitForModeDefault(APP_PACKAGE_NAME) navigateToIndividualPermissionSetting(SMS) @@ -341,6 +351,28 @@ class AppPermissionTest : BaseUsePermissionTest() { ) } + private fun waitForModeDefault(packageName: String) { + val appOpsManager = context.getSystemService(AppOpsManager::class.java)!! + eventually { + val uid = context.packageManager.getApplicationInfoAsUser( + packageName, + /* flags */ 0, + Process.myUserHandle() + ).uid + runWithShellPermissionIdentity { + assertEquals( + "Timed out waiting for package mode to change to MODE_DEFAULT", + appOpsManager.checkOpNoThrow( + AppOpsManager.OPSTR_ACCESS_RESTRICTED_SETTINGS, + uid, + packageName, + ), + AppOpsManager.MODE_DEFAULT, + ) + } + } + } + companion object { private const val PERMISSION_RATIONALE_ENABLED = "permission_rationale_enabled" private val ENHANCED_CONFIRMATION_DIALOG_SELECTOR = By.res( diff --git a/tests/cts/permissionui/src/android/permissionui/cts/BasePermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/BasePermissionTest.kt index d8eb153bf..69528f83d 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/BasePermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/BasePermissionTest.kt @@ -37,6 +37,7 @@ import android.content.pm.PackageManager import android.content.res.Resources import android.os.PersistableBundle import android.os.SystemClock +import android.permission.cts.TestUtils import android.platform.test.rule.ScreenRecordRule import android.provider.DeviceConfig import android.provider.Settings @@ -72,6 +73,7 @@ import org.junit.After import org.junit.Assert import org.junit.Assert.assertEquals import org.junit.Assert.assertNotEquals +import org.junit.Assume.assumeTrue import org.junit.Before import org.junit.Rule @@ -121,7 +123,7 @@ abstract class BasePermissionTest { /* PackageManager.FEATURE_CAR_SPLITSCREEN_MULTITASKING */ "android.software.car.splitscreen_multitasking") @JvmStatic - private val isAutomotiveVisibleBackgroundUser = isAutomotive && + protected val isAutomotiveVisibleBackgroundUser = isAutomotive && UserHelper(context).isVisibleBackgroundUser() // TODO(b/382327037):find a way to avoid specifying the display ID for each UiSelector. @@ -157,6 +159,7 @@ abstract class BasePermissionTest { @Before fun setUp() { + assumeTrue(TestUtils.isCddCompliantScreenSize()) runWithShellPermissionIdentity { screenTimeoutBeforeTest = Settings.System.getLong(context.contentResolver, Settings.System.SCREEN_OFF_TIMEOUT) @@ -191,6 +194,9 @@ abstract class BasePermissionTest { @After fun tearDown() { + if (!TestUtils.isCddCompliantScreenSize()) { + return; + } runWithShellPermissionIdentity { Settings.System.putLong( context.contentResolver, diff --git a/tests/cts/permissionui/src/android/permissionui/cts/BaseUsePermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/BaseUsePermissionTest.kt index 92599b617..432d1efb1 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/BaseUsePermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/BaseUsePermissionTest.kt @@ -36,8 +36,10 @@ import android.os.Build import android.os.Process import android.provider.DeviceConfig import android.provider.Settings +import android.server.wm.WindowManagerStateHelper import android.text.Spanned import android.text.style.ClickableSpan +import android.util.Log import android.view.View import android.view.accessibility.AccessibilityNodeInfo import androidx.test.uiautomator.By @@ -51,9 +53,11 @@ import com.android.compatibility.common.util.SystemUtil import com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity import com.android.compatibility.common.util.SystemUtil.eventually import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity +import com.android.compatibility.common.util.UiDumpUtils import com.android.modules.utils.build.SdkLevel import java.util.concurrent.CompletableFuture import java.util.concurrent.TimeUnit +import java.util.concurrent.TimeoutException import java.util.regex.Pattern import org.junit.After import org.junit.Assert @@ -64,6 +68,7 @@ import org.junit.Before abstract class BaseUsePermissionTest : BasePermissionTest() { companion object { + const val LOG_TAG = "BaseUsePermissionTest" const val APP_APK_NAME_31 = "CtsUsePermissionApp31.apk" const val APP_APK_NAME_31_WITH_ASL = "CtsUsePermissionApp31WithAsl.apk" const val APP_APK_NAME_LATEST = "CtsUsePermissionAppLatest.apk" @@ -148,6 +153,9 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { const val APP_PERMISSION_RATIONALE_TITLE_TEXT = "app_location_permission_rationale_title" const val APP_PERMISSION_RATIONALE_SUBTITLE_TEXT = "app_location_permission_rationale_subtitle" + const val HEALTH_PERMISSION_SELECT_HEART_RATE_PLAIN_TEXT = "Heart rate" + const val HEALTH_PERMISSION_ALLOW_ALL_PLAIN_TEXT = "Allow all" + const val HEALTH_PERMISSION_ALLOW_ALWAYS_PLAIN_TEXT = "Allow all the time" const val GRANT_DIALOG_PERMISSION_RATIONALE_CONTAINER_VIEW = "com.android.permissioncontroller:id/permission_rationale_container" const val PERMISSION_RATIONALE_ACTIVITY_TITLE_VIEW = @@ -229,7 +237,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { DeviceConfig.getBoolean( DeviceConfig.NAMESPACE_PRIVACY, PICKER_ENABLED_SETTING, - true + true, ) } } @@ -238,9 +246,11 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { enum class PermissionState { ALLOWED, DENIED, - DENIED_WITH_PREJUDICE + DENIED_WITH_PREJUDICE, } + private val windowManagerStateHelper = WindowManagerStateHelper() + private val platformResources = context.createPackageContext("android", 0).resources private val permissionToLabelResNameMap = mapOf( @@ -301,7 +311,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { android.Manifest.permission.READ_MEDIA_IMAGES to "@android:string/permgrouplab_readMediaVisual", android.Manifest.permission.READ_MEDIA_VIDEO to - "@android:string/permgrouplab_readMediaVisual" + "@android:string/permgrouplab_readMediaVisual", ) @Before @@ -315,7 +325,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { reinstall: Boolean, grantRuntimePermissions: Boolean, expectSuccess: Boolean, - installSource: String? + installSource: String?, ) { installPackage( apkPath, @@ -323,7 +333,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { grantRuntimePermissions, expectSuccess, installSource, - false + false, ) } @@ -333,14 +343,14 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { grantRuntimePermissions: Boolean = false, expectSuccess: Boolean = true, installSource: String? = null, - skipClearLowSdkDialog: Boolean = false + skipClearLowSdkDialog: Boolean = false, ) { super.installPackage( apkPath, reinstall, grantRuntimePermissions, expectSuccess, - installSource + installSource, ) val targetSdk = getTargetSdk() @@ -387,9 +397,9 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { uiDevice.wait( Until.hasObject( By.textStartsWith("This app was built for an older version of Android") - .displayId(displayId) + .displayId(displayId) ), - timeoutMillis + timeoutMillis, ) if (targetSdkWarningVisible) { try { @@ -415,8 +425,8 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { if (isAutomotive || isWatch) { clickAndWaitForWindowTransition( By.text(getPermissionControllerString("review_button_continue")) - .displayId(displayId), - TIMEOUT_MILLIS * 2 + .displayId(displayId), + TIMEOUT_MILLIS * 2, ) } else { clickAndWaitForWindowTransition( @@ -442,7 +452,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { installPackageViaSession( apkName, AppMetadata.createDefaultAppMetadata(), - PACKAGE_SOURCE_STORE + PACKAGE_SOURCE_STORE, ) } @@ -450,7 +460,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { installPackageViaSession( apkName, AppMetadata.createDefaultAppMetadata(), - PACKAGE_SOURCE_LOCAL_FILE + PACKAGE_SOURCE_LOCAL_FILE, ) } @@ -458,7 +468,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { installPackageViaSession( apkName, AppMetadata.createDefaultAppMetadata(), - PACKAGE_SOURCE_DOWNLOADED_FILE + PACKAGE_SOURCE_DOWNLOADED_FILE, ) } @@ -469,7 +479,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { apkName, AppMetadata.createDefaultAppMetadata(), PACKAGE_SOURCE_DOWNLOADED_FILE, - allowlistedRestrictedPermissions = SessionParams.RESTRICTED_PERMISSIONS_ALL + allowlistedRestrictedPermissions = SessionParams.RESTRICTED_PERMISSIONS_ALL, ) } @@ -477,7 +487,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { installPackageViaSession( apkName, AppMetadata.createDefaultAppMetadata(), - PACKAGE_SOURCE_OTHER + PACKAGE_SOURCE_OTHER, ) } @@ -510,7 +520,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { ) { installPackageViaSession( apkName, - AppMetadata.createInvalidAppMetadataWithoutTopLevelVersion() + AppMetadata.createInvalidAppMetadataWithoutTopLevelVersion(), ) } @@ -519,7 +529,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { ) { installPackageViaSession( apkName, - AppMetadata.createInvalidAppMetadataWithInvalidTopLevelVersion() + AppMetadata.createInvalidAppMetadataWithInvalidTopLevelVersion(), ) } @@ -528,7 +538,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { ) { installPackageViaSession( apkName, - AppMetadata.createInvalidAppMetadataWithoutSafetyLabelVersion() + AppMetadata.createInvalidAppMetadataWithoutSafetyLabelVersion(), ) } @@ -537,7 +547,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { ) { installPackageViaSession( apkName, - AppMetadata.createInvalidAppMetadataWithInvalidSafetyLabelVersion() + AppMetadata.createInvalidAppMetadataWithInvalidSafetyLabelVersion(), ) } @@ -547,8 +557,10 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { } protected fun assertPermissionRationaleActivityTitleIsVisible(expected: Boolean) { - findView(By.res(PERMISSION_RATIONALE_ACTIVITY_TITLE_VIEW).displayId(displayId), - expected = expected) + findView( + By.res(PERMISSION_RATIONALE_ACTIVITY_TITLE_VIEW).displayId(displayId), + expected = expected, + ) } protected fun assertPermissionRationaleActivityDataSharingSourceSectionVisible( @@ -569,15 +581,17 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { } protected fun assertPermissionRationaleActivitySettingsSectionVisible(expected: Boolean) { - findView(By.res(PERMISSION_RATIONALE_SETTINGS_SECTION).displayId(displayId), - expected = expected) + findView( + By.res(PERMISSION_RATIONALE_SETTINGS_SECTION).displayId(displayId), + expected = expected, + ) findView(By.res(SETTINGS_TITLE_ID).displayId(displayId), expected = expected) findView(By.res(SETTINGS_MESSAGE_ID).displayId(displayId), expected = expected) } protected fun assertPermissionRationaleDialogIsVisible( expected: Boolean, - showSettingsSection: Boolean = true + showSettingsSection: Boolean = true, ) { assertPermissionRationaleActivityTitleIsVisible(expected) assertPermissionRationaleActivityDataSharingSourceSectionVisible(expected) @@ -589,8 +603,10 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { } protected fun assertPermissionRationaleContainerOnGrantDialogIsVisible(expected: Boolean) { - findView(By.res(GRANT_DIALOG_PERMISSION_RATIONALE_CONTAINER_VIEW).displayId(displayId), - expected = expected) + findView( + By.res(GRANT_DIALOG_PERMISSION_RATIONALE_CONTAINER_VIEW).displayId(displayId), + expected = expected, + ) } protected fun clickPermissionReviewCancel() { @@ -623,7 +639,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { protected inline fun startAppActivityAndAssertResultCode( expectedResultCode: Int, - block: () -> Unit + block: () -> Unit, ) { val future = startActivityForFuture( @@ -635,13 +651,13 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { block() assertEquals( expectedResultCode, - future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS).resultCode + future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS).resultCode, ) } protected inline fun requestAppPermissionsForNoResult( vararg permissions: String?, - crossinline block: () -> Unit + crossinline block: () -> Unit, ) { // Request the permissions doAndWaitForWindowTransition { @@ -650,7 +666,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { component = ComponentName( APP_PACKAGE_NAME, - "$APP_PACKAGE_NAME.RequestPermissionsActivity" + "$APP_PACKAGE_NAME.RequestPermissionsActivity", ) putExtra("$APP_PACKAGE_NAME.PERMISSIONS", permissions) addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK) @@ -665,23 +681,18 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { vararg permissions: String?, askTwice: Boolean = false, waitForWindowTransition: Boolean = !isWatch, - crossinline block: () -> Unit + crossinline block: () -> Unit, ): Instrumentation.ActivityResult { // Request the permissions lateinit var future: CompletableFuture<Instrumentation.ActivityResult> - doAndWaitForWindowTransition { - future = - startActivityForFuture( - Intent().apply { - component = - ComponentName( - APP_PACKAGE_NAME, - "$APP_PACKAGE_NAME.RequestPermissionsActivity" - ) - putExtra("$APP_PACKAGE_NAME.PERMISSIONS", permissions) - putExtra("$APP_PACKAGE_NAME.ASK_TWICE", askTwice) - } - ) + // The WindowManagerStateHelper#waitForValidState only supports S+ + if (SdkLevel.isAtLeastS()) { + future = startActivityForFuture(*permissions, askTwice = askTwice) + waitForPermissionRequestActivity() + } else { + doAndWaitForWindowTransition { + future = startActivityForFuture(*permissions, askTwice = askTwice) + } } // Notification permission prompt is shown first, so get it out of the way @@ -692,7 +703,46 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { } else { block() } - return future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS) + try { + return future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS) + } catch (e: TimeoutException) { + val uiDump = StringBuilder() + UiDumpUtils.dumpNodes(uiDump) + Log.e(LOG_TAG, "Timed out waiting for activity result, UI dump: $uiDump") + throw e + } + } + + fun startActivityForFuture( + vararg permissions: String?, + askTwice: Boolean, + ): CompletableFuture<Instrumentation.ActivityResult> = + startActivityForFuture( + Intent().apply { + component = + ComponentName(APP_PACKAGE_NAME, "$APP_PACKAGE_NAME.RequestPermissionsActivity") + putExtra("$APP_PACKAGE_NAME.PERMISSIONS", permissions) + putExtra("$APP_PACKAGE_NAME.ASK_TWICE", askTwice) + } + ) + + /** + * This method waits for permission controller activity to be in a valid state, the timeout is 5 + * seconds. + */ + fun waitForPermissionRequestActivity() { + val requestPermissionIntent = Intent(PackageManager.ACTION_REQUEST_PERMISSIONS) + val componentName = + requestPermissionIntent.resolveActivity(context.packageManager) + ?: throw RuntimeException("Permission request is not handled by any activity.") + try { + windowManagerStateHelper.waitForValidState(componentName) + } catch (ex: Exception) { + // It doesn't mean a test would fail, it just meant that the test would proceed before + // waiting for permission request dialog. Permission request dialog should eventually + // come on the screen when ui-automator is trying to search for ui element. + Log.w(LOG_TAG, "Couldn't wait for permission request activity.", ex) + } } protected inline fun requestAppPermissionsAndAssertResult( @@ -700,7 +750,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { permissionAndExpectedGrantResults: Array<out Pair<String?, Boolean>>, askTwice: Boolean = false, waitForWindowTransition: Boolean = !isWatch, - crossinline block: () -> Unit + crossinline block: () -> Unit, ) { var shouldWaitForWindowTransition = waitForWindowTransition // Do not wait for windowTransition after action is performed on auto, when permissions @@ -722,12 +772,12 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { *permissions, askTwice = askTwice, waitForWindowTransition = shouldWaitForWindowTransition, - block = block + block = block, ) assertEquals( "Permission request result had unexpected resultCode:", Activity.RESULT_OK, - result.resultCode + result.resultCode, ) val responseSize: Int = @@ -735,14 +785,14 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { assertEquals( "Permission request result had unexpected number of grant results:", responseSize, - result.resultData!!.getIntArrayExtra("$APP_PACKAGE_NAME.GRANT_RESULTS")!!.size + result.resultData!!.getIntArrayExtra("$APP_PACKAGE_NAME.GRANT_RESULTS")!!.size, ) // Note that the behavior around requesting `null` permissions changed in the platform // in Android U. Currently, null permissions are ignored and left out of the result set. assertTrue( "Permission request result had fewer permissions than request", - permissions.size >= responseSize + permissions.size >= responseSize, ) assertEquals( "Permission request result had unexpected grant results:", @@ -754,7 +804,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { result.resultData!!.getIntArrayExtra("$APP_PACKAGE_NAME.GRANT_RESULTS")!!.map { it == PackageManager.PERMISSION_GRANTED } - ) + ), ) permissionAndExpectedGrantResults.forEach { @@ -766,14 +816,14 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { vararg permissionAndExpectedGrantResults: Pair<String?, Boolean>, askTwice: Boolean = false, waitForWindowTransition: Boolean = !isWatch, - crossinline block: () -> Unit + crossinline block: () -> Unit, ) { requestAppPermissionsAndAssertResult( permissionAndExpectedGrantResults.map { it.first }.toTypedArray(), permissionAndExpectedGrantResults, askTwice, waitForWindowTransition, - block + block, ) } @@ -784,27 +834,37 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { !uiDevice.performActionAndWait( { block() }, Until.newWindow(), - NEW_WINDOW_TIMEOUT_MILLIS + NEW_WINDOW_TIMEOUT_MILLIS, ) if (timeoutOccurred) { + val uiDump = StringBuilder() + UiDumpUtils.dumpNodes(uiDump) + Log.w(LOG_TAG, "Timed out waiting for window transition, UI dump: $uiDump") throw RuntimeException("Timed out waiting for window transition.") } } protected fun findPermissionRequestAllowButton(timeoutMillis: Long = 20000) { if (isAutomotive || isWatch) { - waitFindObject(By.text(getPermissionControllerString(ALLOW_BUTTON_TEXT)) - .displayId(displayId), timeoutMillis) + waitFindObject( + By.text(getPermissionControllerString(ALLOW_BUTTON_TEXT)).displayId(displayId), + timeoutMillis, + ) } else { waitFindObject(By.res(ALLOW_BUTTON).displayId(displayId), timeoutMillis) } } - protected fun clickPermissionRequestAllowButton(timeoutMillis: Long = 20000) { - if (isAutomotive || isWatch) { - click(By.text(getPermissionControllerString(ALLOW_BUTTON_TEXT)).displayId(displayId), - timeoutMillis) + protected fun clickPermissionRequestAllowButton( + timeoutMillis: Long = 20000, + isHealthPermission: Boolean = false, + ) { + if (isAutomotive || isWatch || isHealthPermission) { + click( + By.text(getPermissionControllerString(ALLOW_BUTTON_TEXT)).displayId(displayId), + timeoutMillis, + ) } else { click(By.res(ALLOW_BUTTON).displayId(displayId), timeoutMillis) } @@ -823,14 +883,16 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { uiDevice.wait( Until.hasObject( By.text(getPermissionControllerString(NOTIF_TEXT, APP_PACKAGE_NAME)) - .displayId(displayId) + .displayId(displayId) ), - 1000 + 1000, ) if (notificationPermissionRequestVisible) { if (isAutomotive) { - click(By.text(getPermissionControllerString(ALLOW_BUTTON_TEXT)) - .displayId(displayId)) + click( + By.text(getPermissionControllerString(ALLOW_BUTTON_TEXT)) + .displayId(displayId) + ) } else { click(By.res(ALLOW_BUTTON).displayId(displayId)) } @@ -846,11 +908,15 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { protected fun clickAllowAlwaysInSettings() { if (isAutomotive || isTv || isWatch) { - click(By.text(getPermissionControllerString("app_permission_button_allow_always")) - .displayId(displayId)) + click( + By.text(getPermissionControllerString("app_permission_button_allow_always")) + .displayId(displayId) + ) } else { - click(By.res("com.android.permissioncontroller:id/allow_always_radio_button") - .displayId(displayId)) + click( + By.res("com.android.permissioncontroller:id/allow_always_radio_button") + .displayId(displayId) + ) } } @@ -860,11 +926,14 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { protected fun clicksDenyInSettings() { if (isAutomotive || isWatch) { - click(By.text(getPermissionControllerString("app_permission_button_deny")) - .displayId(displayId)) + click( + By.text(getPermissionControllerString("app_permission_button_deny")) + .displayId(displayId) + ) } else { - click(By.res("com.android.permissioncontroller:id/deny_radio_button") - .displayId(displayId)) + click( + By.res("com.android.permissioncontroller:id/deny_radio_button").displayId(displayId) + ) } } @@ -872,8 +941,8 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { if (isAutomotive || isWatch) { waitFindObject( By.text(getPermissionControllerString(ALLOW_FOREGROUND_BUTTON_TEXT)) - .displayId(displayId), - timeoutMillis + .displayId(displayId), + timeoutMillis, ) } else { waitFindObject(By.res(ALLOW_FOREGROUND_BUTTON).displayId(displayId), timeoutMillis) @@ -884,8 +953,8 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { if (isAutomotive || isWatch) { click( By.text(getPermissionControllerString(ALLOW_FOREGROUND_BUTTON_TEXT)) - .displayId(displayId), - timeoutMillis + .displayId(displayId), + timeoutMillis, ) } else { click(By.res(ALLOW_FOREGROUND_BUTTON).displayId(displayId), timeoutMillis) @@ -963,7 +1032,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { val nextScreenNode: AccessibilityNodeInfo? = findAccessibilityNodeInfosByTextForSurfaceView( uiAutomation.rootInActiveWindow, - "All the time" + "All the time", ) if (nextScreenNode != null) { clickedOnLink = true @@ -973,12 +1042,42 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { assertTrue("Could not click on the settings link correctly", clickedOnLink) } + protected fun clickAllowReadHeartRate() { + eventually { + scrollToBottom() + + // Phone UI has allow all, toggle, and allow button. Watch UI only has allow button. + if (!isWatch) { + // Check "Allow all" button is visible. + val allowAllNode = + uiAutomation.rootInActiveWindow + .findAccessibilityNodeInfosByText(HEALTH_PERMISSION_ALLOW_ALL_PLAIN_TEXT)[0] + assertTrue(allowAllNode.isVisibleToUser) + + // Select "Heart rate" toggle and click "Allow" button. + click(By.text(HEALTH_PERMISSION_SELECT_HEART_RATE_PLAIN_TEXT).displayId(displayId)) + } + + clickPermissionRequestAllowButton(isHealthPermission = true) + } + } + + protected fun clickAlwaysAllowReadHealthDataInBackground() { + eventually { + if (isWatch) { + click(By.text(HEALTH_PERMISSION_ALLOW_ALWAYS_PLAIN_TEXT).displayId(displayId)) + } else { + clickPermissionRequestAllowButton(isHealthPermission = true) + } + } + } + protected fun clickPermissionRequestDenyAndDontAskAgainButton() { if (isAutomotive) { scrollToBottom() clickAndWaitForWindowTransition( By.text(getPermissionControllerString(DENY_AND_DONT_ASK_AGAIN_BUTTON_TEXT)) - .displayId(displayId) + .displayId(displayId) ) } else if (isWatch) { click(By.text(getPermissionControllerString(DENY_BUTTON_TEXT)).displayId(displayId)) @@ -994,15 +1093,17 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { } else { click( By.res("com.android.permissioncontroller:id/permission_deny_dont_ask_again_button") - .displayId(displayId) + .displayId(displayId) ) } } protected fun clickPermissionRequestNoUpgradeAndDontAskAgainButton() { if (isAutomotive || isWatch) { - click(By.text(getPermissionControllerString(NO_UPGRADE_AND_DONT_ASK_AGAIN_BUTTON_TEXT)) - .displayId(displayId)) + click( + By.text(getPermissionControllerString(NO_UPGRADE_AND_DONT_ASK_AGAIN_BUTTON_TEXT)) + .displayId(displayId) + ) } else { click(By.res(NO_UPGRADE_AND_DONT_ASK_AGAIN_BUTTON).displayId(displayId)) } @@ -1011,13 +1112,14 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { protected fun clickPermissionRationaleContentInAppPermission() { clickAndWaitForWindowTransition( By.text(getPermissionControllerString(APP_PERMISSION_RATIONALE_SUBTITLE_TEXT)) - .displayId(displayId) + .displayId(displayId) ) } protected fun clickPermissionRationaleViewInGrantDialog() { clickAndWaitForWindowTransition( - By.res(GRANT_DIALOG_PERMISSION_RATIONALE_CONTAINER_VIEW).displayId(displayId)) + By.res(GRANT_DIALOG_PERMISSION_RATIONALE_CONTAINER_VIEW).displayId(displayId) + ) } protected fun grantAppPermissionsByUi(vararg permissions: String) { @@ -1032,12 +1134,12 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { protected fun revokeAppPermissionsByUi( vararg permissions: String, - isLegacyApp: Boolean = false + isLegacyApp: Boolean = false, ) { setAppPermissionState( *permissions, state = PermissionState.DENIED, - isLegacyApp = isLegacyApp + isLegacyApp = isLegacyApp, ) } @@ -1079,7 +1181,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { throw e } }, - TIMEOUT_MILLIS + TIMEOUT_MILLIS, ) } @@ -1095,15 +1197,25 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { protected fun navigateToIndividualPermissionSetting( permission: String, - manuallyNavigate: Boolean = false + manuallyNavigate: Boolean = false, + ) { + navigateToIndividualPermissionSetting(permission, APP_PACKAGE_NAME, manuallyNavigate) + } + + protected fun navigateToIndividualPermissionSetting( + permission: String, + packageName: String, + manuallyNavigate: Boolean = false, ) { val useLegacyNavigation = isWatch || isAutomotive || manuallyNavigate if (useLegacyNavigation) { navigateToAppPermissionSettings() val permissionLabel = getPermissionLabel(permission) if (isWatch) { - clickAndWaitForWindowTransition(By.text(permissionLabel).displayId(displayId), - 40_000) + clickAndWaitForWindowTransition( + By.text(permissionLabel).displayId(displayId), + 40_000, + ) } else { clickPermissionControllerUi(By.text(permissionLabel).displayId(displayId)) } @@ -1113,7 +1225,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { runWithShellPermissionIdentity { context.startActivity( Intent(Intent.ACTION_MANAGE_APP_PERMISSION).apply { - putExtra(Intent.EXTRA_PACKAGE_NAME, APP_PACKAGE_NAME) + putExtra(Intent.EXTRA_PACKAGE_NAME, packageName) putExtra(Intent.EXTRA_PERMISSION_NAME, permission) putExtra(Intent.EXTRA_USER, Process.myUserHandle()) addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) @@ -1201,24 +1313,28 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { // won't show an "Ask every time" message !waitFindObject( By.text(getPermissionControllerString("app_permission_button_deny")) - .displayId(displayId) + .displayId(displayId) ) .isChecked } else if (isTv || isWatch) { - !(waitFindObject(By.text(getPermissionControllerString(DENY_BUTTON_TEXT)) - .displayId(displayId)) + !(waitFindObject( + By.text(getPermissionControllerString(DENY_BUTTON_TEXT)) + .displayId(displayId) + ) .isChecked || (!isLegacyApp && hasAskButton(permission) && - waitFindObject(By.text(getPermissionControllerString(ASK_BUTTON_TEXT)) - .displayId(displayId)) + waitFindObject( + By.text(getPermissionControllerString(ASK_BUTTON_TEXT)) + .displayId(displayId) + ) .isChecked)) } else { !(waitFindObject(By.res(DENY_RADIO_BUTTON).displayId(displayId)).isChecked || (!isLegacyApp && hasAskButton(permission) && waitFindObject(By.res(ASK_RADIO_BUTTON).displayId(displayId)) - .isChecked)) + .isChecked)) } var alreadyChecked = false val button = @@ -1230,50 +1346,55 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { PermissionState.ALLOWED -> if (showsForegroundOnlyButton(permission)) { By.text( - getPermissionControllerString( - "app_permission_button_allow_foreground" + getPermissionControllerString( + "app_permission_button_allow_foreground" + ) ) - ).displayId(displayId) + .displayId(displayId) } else { By.text( - getPermissionControllerString("app_permission_button_allow") - ).displayId(displayId) + getPermissionControllerString( + "app_permission_button_allow" + ) + ) + .displayId(displayId) } PermissionState.DENIED -> By.text(getPermissionControllerString("app_permission_button_deny")) - .displayId(displayId) + .displayId(displayId) PermissionState.DENIED_WITH_PREJUDICE -> By.text(getPermissionControllerString("app_permission_button_deny")) - .displayId(displayId) + .displayId(displayId) } } else if (isTv || isWatch) { when (state) { PermissionState.ALLOWED -> if (showsForegroundOnlyButton(permission)) { By.text( - getPermissionControllerString( - ALLOW_FOREGROUND_PREFERENCE_TEXT + getPermissionControllerString( + ALLOW_FOREGROUND_PREFERENCE_TEXT + ) ) - ).displayId(displayId) + .displayId(displayId) } else { byAnyText( getPermissionControllerResString(ALLOW_BUTTON_TEXT), getPermissionControllerResString( ALLOW_ALL_FILES_BUTTON_TEXT - ) + ), ) } PermissionState.DENIED -> if (!isLegacyApp && hasAskButton(permission)) { By.text(getPermissionControllerString(ASK_BUTTON_TEXT)) - .displayId(displayId) + .displayId(displayId) } else { By.text(getPermissionControllerString(DENY_BUTTON_TEXT)) - .displayId(displayId) + .displayId(displayId) } PermissionState.DENIED_WITH_PREJUDICE -> By.text(getPermissionControllerString(DENY_BUTTON_TEXT)) - .displayId(displayId) + .displayId(displayId) } } else { when (state) { @@ -1291,8 +1412,8 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { } else { By.res(DENY_RADIO_BUTTON).displayId(displayId) } - PermissionState.DENIED_WITH_PREJUDICE -> By.res(DENY_RADIO_BUTTON) - .displayId(displayId) + PermissionState.DENIED_WITH_PREJUDICE -> + By.res(DENY_RADIO_BUTTON).displayId(displayId) } } ) @@ -1309,8 +1430,11 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { if (isWatch) { click( By.desc( - getPermissionControllerString("media_confirm_dialog_positive_button") - ).displayId(displayId) + getPermissionControllerString( + "media_confirm_dialog_positive_button" + ) + ) + .displayId(displayId) ) } else { click(By.res(ALERT_DIALOG_OK_BUTTON).displayId(displayId)) @@ -1321,7 +1445,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { if (isWatch) { waitFindObject( By.text(getPermissionControllerString("old_sdk_deny_warning")) - .displayId(displayId) + .displayId(displayId) ) } else { waitFindObject(By.res(ALERT_DIALOG_MESSAGE).displayId(displayId)) @@ -1342,7 +1466,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { resources.getIdentifier( "com.android.permissioncontroller:string/grant_dialog_button_deny_anyway", null, - null + null, ) val confirmText = resources.getString(confirmTextRes) @@ -1420,7 +1544,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { protected fun findAccessibilityNodeInfosByTextForSurfaceView( node: AccessibilityNodeInfo, - text: String + text: String, ): AccessibilityNodeInfo? { if (node.text != null && node.text.contains(text)) return node for (i in 0 until node.childCount) { @@ -1433,7 +1557,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { } private fun byTextRes(textRes: Int): BySelector = - By.text(context.getString(textRes)).displayId(displayId) + By.text(context.getString(textRes)).displayId(displayId) private fun byTextStartsWithCaseInsensitive(prefix: String): BySelector = By.text(Pattern.compile("(?i)^${Pattern.quote(prefix)}.*$")).displayId(displayId) @@ -1443,7 +1567,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { assertTrue( "Invalid permission check result: $checkPermissionResult", checkPermissionResult == PackageManager.PERMISSION_GRANTED || - checkPermissionResult == PackageManager.PERMISSION_DENIED + checkPermissionResult == PackageManager.PERMISSION_DENIED, ) if (!expectPermission && checkPermissionResult == PackageManager.PERMISSION_GRANTED) { Assert.fail( @@ -1466,7 +1590,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { component = ComponentName( APP_PACKAGE_NAME, - "$APP_PACKAGE_NAME.CheckCalendarAccessActivity" + "$APP_PACKAGE_NAME.CheckCalendarAccessActivity", ) } ) @@ -1476,7 +1600,7 @@ abstract class BaseUsePermissionTest : BasePermissionTest() { assertTrue(result.resultData!!.hasExtra("$APP_PACKAGE_NAME.HAS_ACCESS")) assertEquals( expectAccess, - result.resultData!!.getBooleanExtra("$APP_PACKAGE_NAME.HAS_ACCESS", false) + result.resultData!!.getBooleanExtra("$APP_PACKAGE_NAME.HAS_ACCESS", false), ) } diff --git a/tests/cts/permissionui/src/android/permissionui/cts/CameraMicIndicatorsPermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/CameraMicIndicatorsPermissionTest.kt index 7abea1f23..e1cb76171 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/CameraMicIndicatorsPermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/CameraMicIndicatorsPermissionTest.kt @@ -23,19 +23,18 @@ import android.content.AttributionSource import android.content.Context import android.content.Intent import android.content.pm.PackageManager +import android.content.res.Resources import android.hardware.camera2.CameraManager import android.os.Build import android.os.Process import android.os.SystemClock import android.os.SystemProperties -import android.os.UserManager import android.permission.PermissionManager import android.permission.cts.MtsIgnore import android.platform.test.annotations.AsbSecurityTest import android.platform.test.rule.ScreenRecordRule import android.provider.DeviceConfig import android.provider.Settings -import android.safetycenter.SafetyCenterManager import android.server.wm.WindowManagerStateHelper import android.util.Log import androidx.annotation.RequiresApi @@ -124,7 +123,6 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { .toString() private val cameraLabel = originalCameraLabel.lowercase() private val micLabel = originalMicLabel.lowercase() - private var wasEnabled = false private var isScreenOn = false private var screenTimeoutBeforeTest: Long = 0L private lateinit var carMicPrivacyChipId: String @@ -147,7 +145,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { DeviceConfig.getString( DeviceConfig.NAMESPACE_PRIVACY, SAFETY_CENTER_ENABLED, - false.toString() + false.toString(), )!! } @@ -163,7 +161,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { @Before fun setUp() { - // Camera and Mic are not supported for secondary user visible as a background user. + // Skip the tests as Camera and Mic are not supported for visible background users. assumeFalse(isCar && UserHelper(context).isVisibleBackgroundUser()) runWithShellPermissionIdentity { screenTimeoutBeforeTest = @@ -171,7 +169,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { Settings.System.putLong( context.contentResolver, Settings.System.SCREEN_OFF_TIMEOUT, - 1800000L + 1800000L, ) } @@ -182,38 +180,20 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { isScreenOn = true } uiDevice.findObject(By.text("Close"))?.click() - wasEnabled = setIndicatorsEnabledStateIfNeeded(true) // If the change Id is not present, then isChangeEnabled will return true. To bypass this, // the change is set to "false" if present. assumeFalse( "feature not present on this device", callWithShellPermissionIdentity { CompatChanges.isChangeEnabled(PERMISSION_INDICATORS_NOT_PRESENT, Process.SYSTEM_UID) - } + }, ) install() } - private fun setIndicatorsEnabledStateIfNeeded(shouldBeEnabled: Boolean): Boolean { - var currentlyEnabled = false - runWithShellPermissionIdentity { - currentlyEnabled = - DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY, INDICATORS_FLAG, true) - if (currentlyEnabled != shouldBeEnabled) { - DeviceConfig.setProperty( - DeviceConfig.NAMESPACE_PRIVACY, - INDICATORS_FLAG, - shouldBeEnabled.toString(), - false - ) - } - } - return currentlyEnabled - } - @After fun tearDown() { - // Camera and Mic are not supported for secondary user visible as a background user. + // Skip the tests as Camera and Mic are not supported for visible background users. if (isCar && UserHelper(context).isVisibleBackgroundUser()) { return } @@ -224,16 +204,13 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { } eventually( { assertIndicatorsShown(false, false, false) }, - AUTO_MIC_INDICATOR_DISMISSAL_TIMEOUT_MS + AUTO_MIC_INDICATOR_DISMISSAL_TIMEOUT_MS, ) - if (!wasEnabled) { - setIndicatorsEnabledStateIfNeeded(false) - } runWithShellPermissionIdentity { Settings.System.putLong( context.contentResolver, Settings.System.SCREEN_OFF_TIMEOUT, - screenTimeoutBeforeTest + screenTimeoutBeforeTest, ) } changeSafetyCenterFlag(safetyCenterEnabled) @@ -249,7 +226,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { useMic: Boolean, useCamera: Boolean, useHotword: Boolean, - finishEarly: Boolean = false + finishEarly: Boolean = false, ) { context.startActivity( Intent(USE_INTENT_ACTION).apply { @@ -290,7 +267,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { useMic = true, useCamera = false, finishEarly = true, - safetyCenterEnabled = getSafetyCenterEnabled() + safetyCenterEnabled = getSafetyCenterEnabled(), ) } @@ -351,7 +328,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { useMic = false, useCamera = false, useHotword = true, - safetyCenterEnabled = true + safetyCenterEnabled = true, ) } @@ -366,7 +343,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { useMic = false, useCamera = true, chainUsage = true, - safetyCenterEnabled = true + safetyCenterEnabled = true, ) } @@ -376,12 +353,12 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { useHotword: Boolean = false, chainUsage: Boolean = false, safetyCenterEnabled: Boolean = false, - finishEarly: Boolean = false + finishEarly: Boolean = false, ) { Log.d( TAG, "testCameraAndMicIndicator useMic=$useMic useCamera=$useCamera " + - "safetyCenterEnabled=$safetyCenterEnabled finishEarly=$finishEarly" + "safetyCenterEnabled=$safetyCenterEnabled finishEarly=$finishEarly", ) // If camera is not available skip the test if (useCamera) { @@ -410,7 +387,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { permissionManager.checkPermissionForStartDataDelivery( Manifest.permission.RECORD_AUDIO, chainAttribution!!, - "" + "", ) assertEquals(PermissionManager.PERMISSION_GRANTED, ret) } @@ -443,7 +420,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { runWithShellPermissionIdentity { permissionManager.finishDataDelivery( Manifest.permission.RECORD_AUDIO, - chainAttribution + chainAttribution, ) } } @@ -482,7 +459,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { micInUse, useCamera, chainUsage, - safetyCenterEnabled + safetyCenterEnabled, ) uiDevice.pressBack() } @@ -491,7 +468,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { private fun assertWatchIndicatorsShown( useMic: Boolean, useCamera: Boolean, - useHotword: Boolean + useHotword: Boolean, ) { if (useMic || useHotword || (!useMic && !useCamera && !useHotword)) { val iconView = UiAutomatorUtils2.waitFindObjectOrNull(By.descContains(WEAR_MIC_LABEL)) @@ -531,7 +508,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { useMic: Boolean, useCamera: Boolean, useHotword: Boolean, - chainUsage: Boolean + chainUsage: Boolean, ) { eventually { // Ensure the privacy chip is present (or not) @@ -576,17 +553,17 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { val micLabelView = uiDevice.findObject(UiSelector().textContains(micLabel)) assertFalse( "View with text $micLabel found, but did not expect to", - micLabelView.exists() + micLabelView.exists(), ) val cameraLabelView = uiDevice.findObject(UiSelector().textContains(cameraLabel)) assertFalse( "View with text $cameraLabel found, but did not expect to", - cameraLabelView.exists() + cameraLabelView.exists(), ) val appView = uiDevice.findObject(UiSelector().textContains(APP_LABEL)) assertFalse( "View with text $APP_LABEL found, but did not expect to", - appView.exists() + appView.exists(), ) } } @@ -596,7 +573,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { useMic: Boolean, useCamera: Boolean, chainUsage: Boolean, - safetyCenterEnabled: Boolean = false + safetyCenterEnabled: Boolean = false, ) { // Ensure the privacy chip is present if (useCamera || useMic) { @@ -656,7 +633,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { context.packageName, null, null, - permissionManager.registerAttributionSource(childAttribution) + permissionManager.registerAttributionSource(childAttribution), ) attrSource = permissionManager.registerAttributionSource(attribution) } catch (e: PackageManager.NameNotFoundException) { @@ -706,7 +683,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { DeviceConfig.NAMESPACE_PRIVACY, SAFETY_CENTER_ENABLED, safetyCenterEnabled, - false + false, ) } } @@ -721,9 +698,21 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { } private fun getSafetyCenterEnabled(): Boolean { - val safetyCenterManager = - context.getSystemService(SafetyCenterManager::class.java) ?: return false - return runWithShellPermissionIdentity<Boolean> { safetyCenterManager.isSafetyCenterEnabled } + if (!SdkLevel.isAtLeastT()) { + // Safety Center does not exist below T. + return false + } + val systemResources = Resources.getSystem() + val resId = systemResources.getIdentifier("config_enableSafetyCenter", "bool", "android") + val safetyCenterSupported = context.getResources().getBoolean(resId) + if (!SdkLevel.isAtLeastU()) { + // On T, Safety Center is controlled by the DeviceConfig flag. + return safetyCenterSupported && safetyCenterEnabled.toBoolean() + } + // On UDC+, Safety Center is no longer controlled by DeviceConfig. + // The only way it can be disabled is if the OEM suppresses it at the + // config level using config_enableSafetyCenter. + return safetyCenterSupported } protected fun waitFindObject(selector: BySelector): UiObject2? { @@ -732,7 +721,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { private fun findObjectWithRetry( automatorMethod: (timeoutMillis: Long) -> UiObject2?, - timeoutMillis: Long = TIMEOUT_MILLIS + timeoutMillis: Long = TIMEOUT_MILLIS, ): UiObject2? { val startTime = SystemClock.elapsedRealtime() return try { @@ -755,7 +744,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { permissionControllerContext.resources.getIdentifier( resourceName, "string", - "com.android.permissioncontroller" + "com.android.permissioncontroller", ) return permissionControllerContext.getString(resourceId) } catch (e: PackageManager.NameNotFoundException) { @@ -768,7 +757,7 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { val micView = waitFindObject(byOneOfText(originalMicLabel, safetyCenterMicLabel)) assertNotNull( "View with text '$originalMicLabel' or '$safetyCenterMicLabel' not found", - micView + micView, ) } @@ -777,16 +766,10 @@ class CameraMicIndicatorsPermissionTest : StsExtraBusinessLogicTestCase { val cameraView = waitFindObject(byOneOfText(originalCameraLabel, safetyCenterCameraLabel)) assertNotNull( "View with text '$originalCameraLabel' or '$safetyCenterCameraLabel' not found", - cameraView + cameraView, ) } private fun byOneOfText(vararg textValues: String) = By.text(Pattern.compile(textValues.joinToString(separator = "|") { Pattern.quote(it) })) - - fun isAutomotiveWithVisibleBackgroundUser(): Boolean { - val userManager = context.getSystemService(UserManager::class.java) - return packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE) && - userManager.isVisibleBackgroundUsersSupported() - } } diff --git a/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationInCallTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationInCallTest.kt index c410f9c9c..9a4908c79 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationInCallTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationInCallTest.kt @@ -24,6 +24,7 @@ import android.content.Context import android.content.pm.PackageManager import android.net.Uri import android.os.Build +import android.os.Process import android.permission.flags.Flags import android.platform.test.annotations.AppModeFull import android.platform.test.annotations.RequiresFlagsEnabled @@ -52,12 +53,15 @@ import org.junit.Test */ @AppModeFull(reason = "Instant apps cannot install packages") @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") -@RequiresFlagsEnabled(Flags.FLAG_ENHANCED_CONFIRMATION_IN_CALL_APIS_ENABLED) +@RequiresFlagsEnabled(Flags.FLAG_UNKNOWN_CALL_PACKAGE_INSTALL_BLOCKING_ENABLED) // @CddTest(requirement = "TBD") class EnhancedConfirmationInCallTest { private val ecm = context.getSystemService(EnhancedConfirmationManager::class.java)!! + private val aom = context.getSystemService(AppOpsManager::class.java)!! private val packageManager = context.packageManager private val addedContacts = mutableMapOf<String, List<Uri>>() + private val phoneOnlyRestrictedSetting = AppOpsManager.OPSTR_REQUEST_INSTALL_PACKAGES + private val phoneAndEcmRestrictedSetting = AppOpsManager.OPSTR_REQUEST_INSTALL_PACKAGES @JvmField @Rule @@ -149,20 +153,32 @@ class EnhancedConfirmationInCallTest { fun tearDown() { voipService.endCallAndWaitForInactive() addedContacts.keys.forEach { removeContact(it) } + runWithShellPermissionIdentity { + aom.setUidMode( + AppOpsManager.OPSTR_ACCESS_RESTRICTED_SETTINGS, + Process.myUid(), + AppOpsManager.MODE_ALLOWED, + ) + } } - private fun isSettingRestricted(): Boolean { + private fun isSettingRestricted(settingsIdentifier: String): Boolean { return callWithShellPermissionIdentity { - ecm.isRestricted(context.packageName, AppOpsManager.OPSTR_REQUEST_INSTALL_PACKAGES) + ecm.isRestricted(context.packageName, settingsIdentifier) } } + private fun areSettingsRestricted(): Boolean { + return isSettingRestricted(phoneOnlyRestrictedSetting) && + isSettingRestricted(phoneAndEcmRestrictedSetting) + } + @Test fun testIncomingCall_NonContact() { voipService.createCallAndWaitForActive(NON_CONTACT_DISPLAY_NAME, NON_CONTACT_PHONE_NUMBER) - Assert.assertTrue(isSettingRestricted()) + Assert.assertTrue(areSettingsRestricted()) voipService.endCallAndWaitForInactive() - Assert.assertFalse(isSettingRestricted()) + Assert.assertFalse(areSettingsRestricted()) } @Test @@ -170,9 +186,9 @@ class EnhancedConfirmationInCallTest { addContact(CONTACT_DISPLAY_NAME, CONTACT_PHONE_NUMBER) // If no phone number is given, the display name will be checked voipService.createCallAndWaitForActive(CONTACT_DISPLAY_NAME, CONTACT_PHONE_NUMBER) - Assert.assertFalse(isSettingRestricted()) + Assert.assertFalse(areSettingsRestricted()) voipService.endCallAndWaitForInactive() - Assert.assertFalse(isSettingRestricted()) + Assert.assertFalse(areSettingsRestricted()) } @Test @@ -180,9 +196,9 @@ class EnhancedConfirmationInCallTest { addContact(CONTACT_DISPLAY_NAME, CONTACT_PHONE_NUMBER) // If the phone number matches, the display name is not checked voipService.createCallAndWaitForActive(NON_CONTACT_DISPLAY_NAME, CONTACT_PHONE_NUMBER) - Assert.assertFalse(isSettingRestricted()) + Assert.assertFalse(areSettingsRestricted()) voipService.endCallAndWaitForInactive() - Assert.assertFalse(isSettingRestricted()) + Assert.assertFalse(areSettingsRestricted()) } @Test @@ -192,10 +208,26 @@ class EnhancedConfirmationInCallTest { voipService.createCallAndWaitForActive(tempContactDisplay, tempContactPhone) addContact(tempContactDisplay, tempContactPhone) // State should not be recomputed just because the contact is newly added - Assert.assertTrue(isSettingRestricted()) + Assert.assertTrue(areSettingsRestricted()) voipService.endCallAndWaitForInactive() voipService.createCallAndWaitForActive(tempContactDisplay, tempContactPhone) // A new call should recognize our contact, and mark the call as trusted - Assert.assertFalse(isSettingRestricted()) + Assert.assertFalse(areSettingsRestricted()) + } + + @Test + fun testCallOnlyRestrictedSetting_notRestrictedIfEcmSet() { + // Set the current app to be restricted by ECM + runWithShellPermissionIdentity { + aom.setUidMode( + AppOpsManager.OPSTR_ACCESS_RESTRICTED_SETTINGS, + Process.myUid(), + AppOpsManager.MODE_ERRORED, + ) + } + // The ecm and phone restricted setting is restricted + Assert.assertFalse(isSettingRestricted(phoneOnlyRestrictedSetting)) + // But the phone only restriction is not + Assert.assertFalse(isSettingRestricted(phoneAndEcmRestrictedSetting)) } } diff --git a/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationManagerTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationManagerTest.kt index cde2b6d6a..596178b70 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationManagerTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/EnhancedConfirmationManagerTest.kt @@ -29,6 +29,7 @@ import android.platform.test.annotations.AppModeFull import android.platform.test.annotations.RequiresFlagsEnabled import android.platform.test.flag.junit.CheckFlagsRule import android.platform.test.flag.junit.DeviceFlagsValueProvider +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.platform.app.InstrumentationRegistry import androidx.test.uiautomator.By @@ -204,6 +205,7 @@ class EnhancedConfirmationManagerTest : BaseUsePermissionTest() { } @RequiresFlagsEnabled(Flags.FLAG_ENHANCED_CONFIRMATION_MODE_APIS_ENABLED) + @FlakyTest(bugId = 387927331) @Test fun grantDialogBlocksRestrictedGroupsThenRequestsUnrestrictedGroupsDespiteOutOfOrderRequest() { installPackageWithInstallSourceFromDownloadedFileAndAllowHardRestrictedPerms( @@ -219,6 +221,8 @@ class EnhancedConfirmationManagerTest : BaseUsePermissionTest() { waitForWindowTransition = false ) { clickECMAlertDialogOKButton() + // TODO: b/387927331 - On some targets, grant dialog hangs after this click + Thread.sleep(3_000L) clickPermissionRequestDenyButton() } assertTrue(isClearRestrictionAllowed(APP_PACKAGE_NAME)) @@ -234,6 +238,7 @@ class EnhancedConfirmationManagerTest : BaseUsePermissionTest() { } @RequiresFlagsEnabled(Flags.FLAG_ENHANCED_CONFIRMATION_MODE_APIS_ENABLED) + @FlakyTest(bugId = 387927331) @Test fun grantDialogBlocksRestrictedGroupsThenRequestsUnrestrictedHighPriorityGroups() { installPackageWithInstallSourceFromDownloadedFileAndAllowHardRestrictedPerms( @@ -247,12 +252,15 @@ class EnhancedConfirmationManagerTest : BaseUsePermissionTest() { waitForWindowTransition = false ) { clickECMAlertDialogOKButton() + // TODO: b/387927331 - On some targets, grant dialog hangs after this click + Thread.sleep(3_000L) clickPermissionRequestAllowForegroundButton() } assertTrue(isClearRestrictionAllowed(APP_PACKAGE_NAME)) } @RequiresFlagsEnabled(Flags.FLAG_ENHANCED_CONFIRMATION_MODE_APIS_ENABLED) + @FlakyTest(bugId = 390440965) @Test fun grantDialogBlocksRestrictedGroupsThenRequestsUnrestrictedLowPriorityGroups() { installPackageWithInstallSourceFromDownloadedFileAndAllowHardRestrictedPerms( @@ -266,6 +274,8 @@ class EnhancedConfirmationManagerTest : BaseUsePermissionTest() { waitForWindowTransition = false ) { clickECMAlertDialogOKButton() + // TODO: b/387927331 - On some targets, grant dialog hangs after this click + Thread.sleep(3_000L) clickPermissionRequestAllowForegroundButton() } assertTrue(isClearRestrictionAllowed(APP_PACKAGE_NAME)) @@ -311,7 +321,7 @@ class EnhancedConfirmationManagerTest : BaseUsePermissionTest() { Manifest.permission.ACCESS_FINE_LOCATION private const val GROUP_3_PERMISSION_2_UNRESTRICTED = Manifest.permission.ACCESS_COARSE_LOCATION - private const val GROUP_4_PERMISSION_1_UNRESTRICTED = Manifest.permission.BODY_SENSORS + private const val GROUP_4_PERMISSION_1_UNRESTRICTED = Manifest.permission.CAMERA private const val NON_PROTECTED_SETTING = "example_setting_which_is_not_protected" private const val PROTECTED_SETTING = "android:bind_accessibility_service" diff --git a/tests/cts/permissionui/src/android/permissionui/cts/LocationAccuracyTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/LocationAccuracyTest.kt index 176010cf5..4781fb895 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/LocationAccuracyTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/LocationAccuracyTest.kt @@ -25,6 +25,7 @@ import com.android.modules.utils.build.SdkLevel import org.junit.Assume.assumeFalse import org.junit.Assume.assumeTrue import org.junit.Before +import org.junit.Ignore import org.junit.Test @FlakyTest @@ -50,6 +51,8 @@ class LocationAccuracyTest : BaseUsePermissionTest() { } @Test + @Ignore("b/390440965") + // Ignore this test until the cause of flakiness is identified. fun testCoarsePermissionIsGranted() { installPackage(APP_APK_PATH_31) @@ -69,16 +72,20 @@ class LocationAccuracyTest : BaseUsePermissionTest() { } @Test + @Ignore("b/396478581") + // Ignore this test until the cause of flakiness is identified. fun testPrecisePermissionIsGranted() { installPackage(APP_APK_PATH_31) assertAppHasPermission(ACCESS_FINE_LOCATION, false) assertAppHasPermission(ACCESS_COARSE_LOCATION, false) assertAppHasPermission(ACCESS_BACKGROUND_LOCATION, false) + val waitForWindowTransition = SdkLevel.isAtLeastB(); requestAppPermissionsAndAssertResult( ACCESS_FINE_LOCATION to true, - ACCESS_COARSE_LOCATION to true + ACCESS_COARSE_LOCATION to true, + waitForWindowTransition = waitForWindowTransition ) { clickPreciseLocationRadioButton() clickCoarseLocationRadioButton() diff --git a/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionTest.kt index d41c7454f..5e2e40d20 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionTest.kt @@ -17,12 +17,18 @@ package android.permissionui.cts import android.Manifest +import android.app.role.RoleManager +import android.content.pm.PackageManager import android.os.Build +import android.platform.test.annotations.AsbSecurityTest import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress +import androidx.test.uiautomator.By import com.android.compatibility.common.util.CddTest import com.android.compatibility.common.util.SystemUtil +import org.junit.Assert import org.junit.Assume +import org.junit.Assume.assumeTrue import org.junit.Test /** @@ -180,4 +186,33 @@ class MediaPermissionTest : BaseUsePermissionTest() { assertAppHasPermission(Manifest.permission.READ_MEDIA_VIDEO, true) assertAppHasPermission(Manifest.permission.READ_MEDIA_IMAGES, true) } + + + @Test + @AsbSecurityTest(cveBugId = [315320090]) + fun testGalleryAppListedAsFixed() { + val galleryPkgs = SystemUtil.callWithShellPermissionIdentity { + context.getSystemService(RoleManager::class.java) + .getRoleHolders(SYSTEM_GALLERY_ROLE_NAME) + } + assumeTrue(galleryPkgs.isNotEmpty()) + val galleryPkg = galleryPkgs[0] + val checkPermissionResult = SystemUtil.callWithShellPermissionIdentity { + packageManager.checkPermission(Manifest.permission.READ_MEDIA_IMAGES, galleryPkg) + } + assumeTrue(checkPermissionResult == PackageManager.PERMISSION_GRANTED) + navigateToIndividualPermissionSetting(Manifest.permission.READ_MEDIA_IMAGES, galleryPkg) + // Attempt to deny the permission. It should not show the + // "denying default permission dialog" + click(By.res(DENY_RADIO_BUTTON)) + try { + waitFindObject(By.res(CANCEL_BUTTON_ID), 1000L) + Assert.fail("expected not to find the default deny dialog") + } catch (_: Exception) {} + } + + companion object { + private val SYSTEM_GALLERY_ROLE_NAME = "android.app.role.SYSTEM_GALLERY" + private val CANCEL_BUTTON_ID = "android:id/button1" + } } diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionRationalePermissionGrantDialogTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionRationalePermissionGrantDialogTest.kt index 751c56b3c..9a12765c0 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionRationalePermissionGrantDialogTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionRationalePermissionGrantDialogTest.kt @@ -41,8 +41,7 @@ import org.junit.Test @FlakyTest class PermissionRationalePermissionGrantDialogTest : BaseUsePermissionTest() { - @get:Rule - val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() + @get:Rule val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() @get:Rule val deviceConfigPermissionRationaleEnabled = @@ -50,7 +49,7 @@ class PermissionRationalePermissionGrantDialogTest : BaseUsePermissionTest() { context, DeviceConfig.NAMESPACE_PRIVACY, PERMISSION_RATIONALE_ENABLED, - true.toString() + true.toString(), ) @Before @@ -248,8 +247,10 @@ class PermissionRationalePermissionGrantDialogTest : BaseUsePermissionTest() { } } - @SdkSuppress(minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, codeName = - "VanillaIceCream") + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, + codeName = "VanillaIceCream", + ) @RequiresFlagsEnabled(android.content.pm.Flags.FLAG_ASL_IN_APK_APP_METADATA_SOURCE) @Test fun requestCoarseLocationPerm_hasAslInApk_packageSourceUnspecified() { @@ -262,8 +263,10 @@ class PermissionRationalePermissionGrantDialogTest : BaseUsePermissionTest() { } } - @SdkSuppress(minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, codeName = - "VanillaIceCream") + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, + codeName = "VanillaIceCream", + ) @RequiresFlagsEnabled(android.content.pm.Flags.FLAG_ASL_IN_APK_APP_METADATA_SOURCE) @Test fun requestCoarseLocationPerm_hasAslInApk_packageSourceStore() { @@ -276,8 +279,10 @@ class PermissionRationalePermissionGrantDialogTest : BaseUsePermissionTest() { } } - @SdkSuppress(minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, codeName = - "VanillaIceCream") + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, + codeName = "VanillaIceCream", + ) @RequiresFlagsEnabled(android.content.pm.Flags.FLAG_ASL_IN_APK_APP_METADATA_SOURCE) @Test fun requestCoarseLocationPerm_hasAslInApk_packageSourceLocalFile() { @@ -290,8 +295,10 @@ class PermissionRationalePermissionGrantDialogTest : BaseUsePermissionTest() { } } - @SdkSuppress(minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, codeName = - "VanillaIceCream") + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, + codeName = "VanillaIceCream", + ) @RequiresFlagsEnabled(android.content.pm.Flags.FLAG_ASL_IN_APK_APP_METADATA_SOURCE) @Test fun requestCoarseLocationPerm_hasAslInApk_packageSourceDownloadedFile() { @@ -304,8 +311,10 @@ class PermissionRationalePermissionGrantDialogTest : BaseUsePermissionTest() { } } - @SdkSuppress(minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, codeName = - "VanillaIceCream") + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, + codeName = "VanillaIceCream", + ) @RequiresFlagsEnabled(android.content.pm.Flags.FLAG_ASL_IN_APK_APP_METADATA_SOURCE) @Test fun requestCoarseLocationPerm_hasAslInApk_packageSourceOther() { @@ -338,7 +347,6 @@ class PermissionRationalePermissionGrantDialogTest : BaseUsePermissionTest() { requestAppPermissionsForNoResult(ACCESS_FINE_LOCATION) { clickPermissionRationaleViewInGrantDialog() assertPermissionRationaleDialogIsVisible(true) - assertPermissionRationaleContainerOnGrantDialogIsVisible(false) } } diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionSplitTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionSplitTest.kt index da70fc186..17cef0e31 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionSplitTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionSplitTest.kt @@ -16,13 +16,17 @@ package android.permissionui.cts +import android.content.pm.PackageManager +import android.health.connect.HealthPermissions import android.os.Build -import android.permission.flags.Flags +import android.permission.flags.Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED import android.platform.test.annotations.RequiresFlagsDisabled +import android.platform.test.annotations.RequiresFlagsEnabled import android.platform.test.flag.junit.DeviceFlagsValueProvider import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import org.junit.Assume.assumeFalse +import org.junit.Assume.assumeTrue import org.junit.Before import org.junit.Rule import org.junit.Test @@ -31,6 +35,12 @@ import org.junit.Test @FlakyTest class PermissionSplitTest : BaseUsePermissionTest() { + companion object { + @JvmStatic + private val supportHeartrate = + packageManager.hasSystemFeature(PackageManager.FEATURE_SENSOR_HEART_RATE) + } + @Rule @JvmField val mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() @Before @@ -62,28 +72,113 @@ class PermissionSplitTest : BaseUsePermissionTest() { testLocationPermissionSplit(false) } - @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu") - @RequiresFlagsDisabled(Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + // TODO: b/388596433 - Update maxSdkVersion to VANILLA_ICE_CREAM after SDK bumps. + // TODO: b/383440585 - Remove this test when flag annotation issue is fixed. + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.TIRAMISU, + maxSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, + ) + @Test + fun testBodySensorSplitOnTToU() { + installPackage(APP_APK_PATH_31) + testBodySensorPermissionSplitToBodySensorsBackground(true) + } + + // Before SDK_INT bumps to 36, the in-development B images are using SDK_INT=35(V). This will + // cause test failures on main builds where replaceBodySensor flag is enabled to remove Sensor + // group UI. As a workaround, we move SDK_INT=35 tests out and requires replaceBodySensor flag + // disabled when running on these images. + // TODO: b/388596433 - Update minSdkVersion to BAKLAVA after SDK bumps. + // TODO: b/383440585 - Update minSdkVersion to TIRAMISU when flag annotation issue is fixed. + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM) + @RequiresFlagsDisabled(FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) @Test - fun testBodySensorSplit() { + fun testBodySensorSplitPostV_replaceBodySensorFlagDisabled() { installPackage(APP_APK_PATH_31) - testBodySensorPermissionSplit(true) + testBodySensorPermissionSplitToBodySensorsBackground(true) } - @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu") - @RequiresFlagsDisabled(Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + // TODO: b/388596433 - Update maxSdkVersion to VANILLA_ICE_CREAM after SDK bumps. + // TODO: b/383440585 - Remove this test when flag annotation issue is fixed. + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.TIRAMISU, + maxSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, + ) @Test - fun testBodySensorSplit32() { + fun testBodySensorSplit32OnTToU() { installPackage(APP_APK_PATH_32) - testBodySensorPermissionSplit(true) + testBodySensorPermissionSplitToBodySensorsBackground(true) } - @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu") - @RequiresFlagsDisabled(Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + // Before SDK_INT bumps to 36, the in-development B images are using SDK_INT=35(V). This will + // cause test failures on main builds where replaceBodySensor flag is enabled to remove Sensor + // group UI. As a workaround, we move SDK_INT=35 tests out and requires replaceBodySensor flag + // disabled when running on these images. + // TODO: b/388596433 - Update minSdkVersion to BAKLAVA after SDK bumps. + // TODO: b/383440585 - Update minSdkVersion to TIRAMISU when flag annotation issue is fixed. + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM) + @RequiresFlagsDisabled(FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) @Test - fun testBodySensorNonSplit() { + fun testBodySensorSplit32PostV_replaceBodySensorFlagDisabled() { + installPackage(APP_APK_PATH_32) + testBodySensorPermissionSplitToBodySensorsBackground(true) + } + + // TODO: b/388596433 - Update maxSdkVersion to VANILLA_ICE_CREAM after SDK bumps. + // TODO: b/383440585 - Remove this test when flag annotation issue is fixed. + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.TIRAMISU, + maxSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, + ) + @Test + fun testBodySensorNonSplitOnTToU() { installPackage(APP_APK_PATH_LATEST) - testBodySensorPermissionSplit(false) + testBodySensorPermissionSplitToBodySensorsBackground(false) + } + + // Before SDK_INT bumps to 36, the in-development B images are using SDK_INT=35(V). This will + // cause test failures on main builds where replaceBodySensor flag is enabled to remove Sensor + // group UI. As a workaround, we move SDK_INT=35 tests out and requires replaceBodySensor flag + // disabled when running on these images. + // TODO: b/388596433 - Update minSdkVersion to BAKLAVA after SDK bumps. + // TODO: b/383440585 - Update minSdkVersion to TIRAMISU when flag annotation issue is fixed. + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM) + @RequiresFlagsDisabled(FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + @Test + fun testBodySensorNonSplitPostV_replaceBodySensorFlagDisabled() { + installPackage(APP_APK_PATH_LATEST) + testBodySensorPermissionSplitToBodySensorsBackground(false) + } + + @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") + @RequiresFlagsEnabled(FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED) + @Test + fun testBodySensorSplitOnBaklava_splitToReadHeartRate() { + assumeTrue(supportHeartrate) + installPackage(APP_APK_PATH_30_WITH_BACKGROUND) + assertAppHasPermission(android.Manifest.permission.BODY_SENSORS, false) + assertAppHasPermission(HealthPermissions.READ_HEART_RATE, false) + assertAppHasPermission(android.Manifest.permission.BODY_SENSORS_BACKGROUND, false) + assertAppHasPermission(HealthPermissions.READ_HEALTH_DATA_IN_BACKGROUND, false) + + requestAppPermissionsAndAssertResult( + android.Manifest.permission.BODY_SENSORS to true, + waitForWindowTransition = false, + ) { + clickAllowReadHeartRate() + } + + requestAppPermissionsAndAssertResult( + android.Manifest.permission.BODY_SENSORS_BACKGROUND to true, + waitForWindowTransition = false, + ) { + clickAlwaysAllowReadHealthDataInBackground() + } + + assertAppHasPermission(android.Manifest.permission.BODY_SENSORS, true) + assertAppHasPermission(HealthPermissions.READ_HEART_RATE, true) + assertAppHasPermission(android.Manifest.permission.BODY_SENSORS_BACKGROUND, true) + assertAppHasPermission(HealthPermissions.READ_HEALTH_DATA_IN_BACKGROUND, true) } private fun testLocationPermissionSplit(expectSplit: Boolean) { @@ -92,7 +187,7 @@ class PermissionSplitTest : BaseUsePermissionTest() { requestAppPermissionsAndAssertResult( android.Manifest.permission.ACCESS_FINE_LOCATION to true, - waitForWindowTransition = false + waitForWindowTransition = false, ) { if (expectSplit) { clickPermissionRequestSettingsLinkAndAllowAlways() @@ -108,13 +203,14 @@ class PermissionSplitTest : BaseUsePermissionTest() { assertAppHasPermission(android.Manifest.permission.ACCESS_BACKGROUND_LOCATION, expectSplit) } - private fun testBodySensorPermissionSplit(expectSplit: Boolean) { + private fun testBodySensorPermissionSplitToBodySensorsBackground(expectSplit: Boolean) { + assumeTrue(supportHeartrate) assertAppHasPermission(android.Manifest.permission.BODY_SENSORS, false) assertAppHasPermission(android.Manifest.permission.BODY_SENSORS_BACKGROUND, false) requestAppPermissionsAndAssertResult( android.Manifest.permission.BODY_SENSORS to true, - waitForWindowTransition = false + waitForWindowTransition = false, ) { if (expectSplit) { clickPermissionRequestSettingsLinkAndAllowAlways() diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTapjackingTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTapjackingTest.kt index baebfe06f..68af60dde 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTapjackingTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTapjackingTest.kt @@ -52,14 +52,17 @@ class PermissionTapjackingTest : BaseUsePermissionTest() { requestAppPermissionsForNoResult(ACCESS_FINE_LOCATION) {} val buttonCenter = - waitFindObject(By.text(getPermissionControllerString(ALLOW_FOREGROUND_BUTTON_TEXT)) - .displayId(displayId)) + waitFindObject( + By.text(getPermissionControllerString(ALLOW_FOREGROUND_BUTTON_TEXT)) + .displayId(displayId) + ) .visibleCenter // Wait for overlay to hide the dialog context.sendBroadcast(Intent(ACTION_SHOW_OVERLAY).putExtra(EXTRA_FULL_OVERLAY, true)) waitFindObject( - By.res("android.permissionui.cts.usepermission:id/overlay").displayId(displayId)) + By.res("android.permissionui.cts.usepermission:id/overlay").displayId(displayId) + ) tryClicking(buttonCenter) } @@ -76,18 +79,19 @@ class PermissionTapjackingTest : BaseUsePermissionTest() { assertAppHasPermission(ACCESS_FINE_LOCATION, false) requestAppPermissionsForNoResult(ACCESS_FINE_LOCATION) {} - val foregroundButtonCenter = - waitFindObject(By.text(getPermissionControllerString(ALLOW_FOREGROUND_BUTTON_TEXT)) - .displayId(displayId)) - .visibleCenter val oneTimeButton = - waitFindObjectOrNull(By.text(getPermissionControllerString(ALLOW_ONE_TIME_BUTTON_TEXT)) - .displayId(displayId)) + waitFindObjectOrNull( + By.text(getPermissionControllerString(ALLOW_ONE_TIME_BUTTON_TEXT)) + .displayId(displayId) + ) + // If one-time button is not available, fallback to deny button val overlayButtonBounds = oneTimeButton?.visibleBounds - ?: waitFindObject(By.text(getPermissionControllerString(DENY_BUTTON_TEXT)) - .displayId(displayId)) + ?: waitFindObject( + By.text(getPermissionControllerString(DENY_BUTTON_TEXT)) + .displayId(displayId) + ) .visibleBounds // Wait for overlay to hide the dialog @@ -100,7 +104,15 @@ class PermissionTapjackingTest : BaseUsePermissionTest() { .putExtra(OVERLAY_BOTTOM, overlayButtonBounds.bottom) ) waitFindObject( - By.res("android.permissionui.cts.usepermission:id/overlay").displayId(displayId)) + By.res("android.permissionui.cts.usepermission:id/overlay").displayId(displayId) + ) + + val foregroundButtonCenter = + waitFindObject( + By.text(getPermissionControllerString(ALLOW_FOREGROUND_BUTTON_TEXT)) + .displayId(displayId) + ) + .visibleCenter tryClicking(foregroundButtonCenter) } @@ -119,7 +131,7 @@ class PermissionTapjackingTest : BaseUsePermissionTest() { } assertAppHasPermission(ACCESS_FINE_LOCATION, true) }, - 10000 + 10000, ) } catch (e: RuntimeException) { // expected @@ -140,22 +152,26 @@ class PermissionTapjackingTest : BaseUsePermissionTest() { } assertAppHasPermission(ACCESS_FINE_LOCATION, true) }, - 10000 + 10000, ) } private fun click(buttonCenter: Point) { - val downTime = SystemClock.uptimeMillis() - val x= buttonCenter.x.toFloat() - val y = buttonCenter.y.toFloat() - var event = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN,x , y, 0) - event.displayId = displayId - uiAutomation.injectInputEvent(event, true) - - val upTime = SystemClock.uptimeMillis() - event = MotionEvent.obtain(upTime, upTime, MotionEvent.ACTION_UP, x, y, 0) - event.displayId = displayId - uiAutomation.injectInputEvent(event, true) + if (isAutomotiveVisibleBackgroundUser) { + val downTime = SystemClock.uptimeMillis() + val x = buttonCenter.x.toFloat() + val y = buttonCenter.y.toFloat() + var event = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN, x, y, 0) + event.displayId = displayId + uiAutomation.injectInputEvent(event, true) + + val upTime = SystemClock.uptimeMillis() + event = MotionEvent.obtain(upTime, upTime, MotionEvent.ACTION_UP, x, y, 0) + event.displayId = displayId + uiAutomation.injectInputEvent(event, true) + } else { + uiDevice.click(buttonCenter.x, buttonCenter.y) + } } companion object { diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PhotoPickerPermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PhotoPickerPermissionTest.kt index 9f76479e3..4a95a962a 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PhotoPickerPermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PhotoPickerPermissionTest.kt @@ -39,16 +39,19 @@ import com.android.compatibility.common.util.SystemUtil.eventually import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity import com.android.compatibility.common.util.UiAutomatorUtils2 import org.junit.AfterClass +import org.junit.Assert import org.junit.Assert.assertFalse import org.junit.Assert.assertNotNull import org.junit.Assert.assertTrue import org.junit.Assume.assumeTrue import org.junit.Before import org.junit.BeforeClass +import org.junit.Ignore import org.junit.Test @SdkSuppress(minSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE, codeName = "UpsideDownCake") @FlakyTest +@Ignore("b/393428835") class PhotoPickerPermissionTest : BaseUsePermissionTest() { companion object { @@ -68,7 +71,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { NAMESPACE_PRIVACY, PICKER_ENABLED_SETTING, true.toString(), - false + false, ) } photoUri = PhotoPickerUtils.createImage(context) @@ -85,7 +88,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { NAMESPACE_PRIVACY, PICKER_ENABLED_SETTING, false.toString(), - false + false, ) } } @@ -110,7 +113,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { val permissions = packageInfo.requestedPermissions?.toList() ?: emptyList<String>() assertFalse( "Expected app to not request READ_MEDIA_VISUAL_USER_SELECTED", - permissions.contains(READ_MEDIA_VISUAL_USER_SELECTED) + permissions.contains(READ_MEDIA_VISUAL_USER_SELECTED), ) } } @@ -125,7 +128,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { val permissions = packageInfo.requestedPermissions?.toList() ?: emptyList<String>() assertTrue( "Expected app to request READ_MEDIA_VISUAL_USER_SELECTED", - permissions.contains(READ_MEDIA_VISUAL_USER_SELECTED) + permissions.contains(READ_MEDIA_VISUAL_USER_SELECTED), ) } } @@ -145,7 +148,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { requestAppPermissionsAndAssertResult( arrayOf(READ_MEDIA_IMAGES, READ_MEDIA_VISUAL_USER_SELECTED), arrayOf(READ_MEDIA_IMAGES to false, READ_MEDIA_VISUAL_USER_SELECTED to false), - waitForWindowTransition = false + waitForWindowTransition = false, ) { doAndWaitForWindowTransition { click(By.res(SELECT_BUTTON)) } findImageOrVideo(expected = true) @@ -161,7 +164,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { requestAppPermissionsAndAssertResult( arrayOf(READ_MEDIA_IMAGES), arrayOf(READ_MEDIA_IMAGES to true), - waitForWindowTransition = false + waitForWindowTransition = false, ) { doAndWaitForWindowTransition { click(By.res(SELECT_BUTTON)) } clickImageOrVideo() @@ -174,17 +177,17 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { assertPermissionFlags( READ_MEDIA_IMAGES, FLAG_PERMISSION_ONE_TIME to true, - FLAG_PERMISSION_REVOKED_COMPAT to true + FLAG_PERMISSION_REVOKED_COMPAT to true, ) assertPermissionFlags( READ_MEDIA_VIDEO, FLAG_PERMISSION_ONE_TIME to true, - FLAG_PERMISSION_REVOKED_COMPAT to true + FLAG_PERMISSION_REVOKED_COMPAT to true, ) assertPermissionFlags( READ_MEDIA_VISUAL_USER_SELECTED, FLAG_PERMISSION_ONE_TIME to false, - FLAG_PERMISSION_REVOKED_COMPAT to false + FLAG_PERMISSION_REVOKED_COMPAT to false, ) } } @@ -209,7 +212,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { requestAppPermissionsAndAssertResult( arrayOf(READ_MEDIA_IMAGES, READ_MEDIA_VISUAL_USER_SELECTED), arrayOf(READ_MEDIA_IMAGES to false, READ_MEDIA_VISUAL_USER_SELECTED to true), - waitForWindowTransition = false + waitForWindowTransition = false, ) { doAndWaitForWindowTransition { click(By.res(SELECT_BUTTON)) } clickImageOrVideo() @@ -265,7 +268,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { installPackage(APP_APK_PATH_IMPLICIT_USER_SELECT_STORAGE) requestAppPermissionsAndAssertResult( arrayOf(READ_MEDIA_IMAGES), - arrayOf(READ_MEDIA_IMAGES to true) + arrayOf(READ_MEDIA_IMAGES to true), ) { click(By.res(ALLOW_ALL_BUTTON)) } @@ -278,7 +281,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { installPackage(APP_APK_PATH_LATEST) requestAppPermissionsAndAssertResult( arrayOf(READ_MEDIA_IMAGES, READ_MEDIA_VISUAL_USER_SELECTED), - arrayOf(READ_MEDIA_IMAGES to true, READ_MEDIA_VISUAL_USER_SELECTED to true) + arrayOf(READ_MEDIA_IMAGES to true, READ_MEDIA_VISUAL_USER_SELECTED to true), ) { click(By.res(ALLOW_ALL_BUTTON)) } @@ -338,7 +341,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { .toList() assertTrue( "Expected package to have USER_SELECTED", - requestedPerms.contains(READ_MEDIA_VISUAL_USER_SELECTED) + requestedPerms.contains(READ_MEDIA_VISUAL_USER_SELECTED), ) } @@ -363,7 +366,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { .toList() assertTrue( "Expected package to have USER_SELECTED", - requestedPerms.contains(READ_MEDIA_VISUAL_USER_SELECTED) + requestedPerms.contains(READ_MEDIA_VISUAL_USER_SELECTED), ) } @@ -381,14 +384,14 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { installPackage(APP_APK_PATH_IMPLICIT_USER_SELECT_STORAGE) requestAppPermissionsAndAssertResult( READ_MEDIA_VISUAL_USER_SELECTED to false, - waitForWindowTransition = false + waitForWindowTransition = false, ) {} uninstallPackage(APP_PACKAGE_NAME) installPackage(APP_APK_PATH_LATEST) requestAppPermissionsAndAssertResult( READ_MEDIA_VISUAL_USER_SELECTED to false, ACCESS_MEDIA_LOCATION to false, - waitForWindowTransition = false + waitForWindowTransition = false, ) {} } @@ -399,7 +402,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { requestAppPermissionsAndAssertResult( READ_MEDIA_IMAGES to true, READ_MEDIA_VIDEO to true, - waitForWindowTransition = false + waitForWindowTransition = false, ) {} } @@ -410,7 +413,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { READ_MEDIA_IMAGES to false, ACCESS_MEDIA_LOCATION to true, READ_MEDIA_VISUAL_USER_SELECTED to true, - waitForWindowTransition = false + waitForWindowTransition = false, ) { doAndWaitForWindowTransition { click(By.res(SELECT_BUTTON)) } clickImageOrVideo() @@ -427,7 +430,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { requestAppPermissionsAndAssertResult( ACCESS_MEDIA_LOCATION to false, READ_MEDIA_VISUAL_USER_SELECTED to false, - waitForWindowTransition = false + waitForWindowTransition = false, ) { findView(By.res(SELECT_BUTTON), expected = false) } @@ -440,7 +443,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { READ_MEDIA_IMAGES to false, ACCESS_MEDIA_LOCATION to true, READ_MEDIA_VISUAL_USER_SELECTED to true, - waitForWindowTransition = false + waitForWindowTransition = false, ) { doAndWaitForWindowTransition { click(By.res(SELECT_BUTTON)) } clickImageOrVideo() @@ -459,7 +462,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { requestAppPermissionsAndAssertResult( READ_MEDIA_IMAGES to false, READ_MEDIA_VISUAL_USER_SELECTED to true, - waitForWindowTransition = false + waitForWindowTransition = false, ) { doAndWaitForWindowTransition { click(By.res(SELECT_BUTTON)) } clickImageOrVideo() @@ -474,7 +477,7 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { requestAppPermissionsAndAssertResult( READ_MEDIA_IMAGES to false, READ_MEDIA_VISUAL_USER_SELECTED to true, - waitForWindowTransition = false + waitForWindowTransition = false, ) { doAndWaitForWindowTransition { click(By.res(SELECT_BUTTON)) } try { @@ -506,18 +509,32 @@ class PhotoPickerPermissionTest : BaseUsePermissionTest() { } private fun clickImageOrVideo() { - click(By.res(PhotoPickerUtils.getImageOrVideoResId(context))) + PhotoPickerUtils.clickAndWait(uiDevice, PhotoPickerUtils.getMediaItem(uiDevice)) } private fun clickAllow() { - click(By.res(PhotoPickerUtils.getAllowId(context))) + PhotoPickerUtils.clickAndWait(uiDevice, PhotoPickerUtils.findAddOrDoneButton()) } private fun findImageOrVideo(expected: Boolean) { - findView(By.res(PhotoPickerUtils.getImageOrVideoResId(context)), expected) + eventually { + val item = PhotoPickerUtils.getMediaItem(uiDevice) + if (!expected && item.exists()) { + Assert.fail("Found image or video, when not expecting it") + } else if (expected && !item.exists()) { + Assert.fail("Failed to find image or video") + } + } } private fun findVideo(expected: Boolean) { - findView(By.res(PhotoPickerUtils.getVideoResId(context)), expected) + eventually { + val item = PhotoPickerUtils.getVideoItem(uiDevice) + if (!expected && item.exists()) { + Assert.fail("Found video, when not expecting it") + } else if (expected && !item.exists()) { + Assert.fail("Failed to find video") + } + } } } diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PhotoPickerUtils.kt b/tests/cts/permissionui/src/android/permissionui/cts/PhotoPickerUtils.kt index db6c412db..aea5637df 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PhotoPickerUtils.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PhotoPickerUtils.kt @@ -21,23 +21,27 @@ import android.content.pm.PackageManager import android.net.Uri import android.os.Bundle import android.os.FileUtils +import android.provider.DeviceConfig import android.provider.MediaStore import android.provider.cts.media.MediaProviderTestUtils import android.provider.cts.media.MediaStoreUtils +import androidx.test.uiautomator.UiDevice +import androidx.test.uiautomator.UiObject +import androidx.test.uiautomator.UiSelector import com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity import java.io.IOException +import org.junit.Assert +// TODO: b/393428835: We need to merge these utils with the Photo Picker CTS ones object PhotoPickerUtils { private const val DISPLAY_NAME_PREFIX = "ctsPermissionPhotoPicker" private const val VIDEO_ICON_ID = ":id/icon_video" - private const val IMAGE_CHECK_BOX_ID = ":id/icon_check" private const val ALLOW_ID = ":id/button_add" + private const val REGEX_MEDIA_ITEM_CONTENT_DESCRIPTION = "^(Media|Photo|Video|GIF|Motion)[^s].*" + private const val REGEX_VIDEO_ITEM_CONTENT_DESCRIPTION = "^(Video)[^s].*" + private const val REGEX_CONTAINS_DONE = ".*[Dd]one.*" private var mediaProviderPkgName: String? = null - fun getImageOrVideoResId(context: Context): String { - return "${getMediaProviderPkgName(context)!!}$IMAGE_CHECK_BOX_ID" - } - fun getVideoResId(context: Context): String { return "${getMediaProviderPkgName(context)!!}$VIDEO_ICON_ID" } @@ -70,7 +74,7 @@ object PhotoPickerUtils { context, R.raw.lg_g4_iso_800_jpg, MediaStore.Images.Media.EXTERNAL_CONTENT_URI, - "image/jpeg" + "image/jpeg", ) .first } @@ -81,7 +85,7 @@ object PhotoPickerUtils { context, R.raw.test_video, MediaStore.Video.Media.EXTERNAL_CONTENT_URI, - "video/mp4" + "video/mp4", ) .first } @@ -108,6 +112,7 @@ object PhotoPickerUtils { stageMedia(context, resId, collectionUri, mimeType) } } + @Throws(IOException::class) private fun stageMedia( context: Context, @@ -125,4 +130,44 @@ object PhotoPickerUtils { return session.publish() to displayName } } + + /** Find a media item to perform click events */ + @Throws(Exception::class) + fun getMediaItem(device: UiDevice): UiObject { + val mediaItemSelector = + UiSelector().descriptionMatches(REGEX_MEDIA_ITEM_CONTENT_DESCRIPTION) + return device.findObject(mediaItemSelector) + } + + /** Find a media item to perform click events */ + @Throws(Exception::class) + fun getVideoItem(device: UiDevice): UiObject { + val mediaItemSelector = + UiSelector().descriptionMatches(REGEX_VIDEO_ITEM_CONTENT_DESCRIPTION) + return device.findObject(mediaItemSelector) + } + + fun findAddOrDoneButton(): UiObject { + if (isModernPickerEnabled()) { + return UiObject(UiSelector().textMatches(REGEX_CONTAINS_DONE)) + } + return UiObject(UiSelector().resourceIdMatches("$mediaProviderPkgName:id/button_add")) + } + + @Throws(Exception::class) + fun clickAndWait(uiDevice: UiDevice, uiObject: UiObject) { + uiObject.click() + uiDevice.waitForIdle() + } + + fun isModernPickerEnabled(): Boolean { + return try { + callWithShellPermissionIdentity { + DeviceConfig.getBoolean("mediaprovider", "enable_modern_picker", false) + } + } catch (e: Exception) { + Assert.fail("Failed to check if modern media provider is enabled") + false + } + } } diff --git a/tests/cts/role/Android.bp b/tests/cts/role/Android.bp index 9f1e6cff6..ea9af5d8e 100644 --- a/tests/cts/role/Android.bp +++ b/tests/cts/role/Android.bp @@ -37,7 +37,9 @@ android_test { "bedstead-multiuser", "flag-junit", "platform-test-annotations", + "platform-test-rules", "truth", + "uiautomator-helpers", ], test_suites: [ @@ -48,9 +50,17 @@ android_test { ], data: [ + ":CtsDefaultNotesApp", ":CtsRoleTestApp", ":CtsRoleTestApp28", ":CtsRoleTestApp33WithoutInCallService", ":CtsRoleTestAppClone", ], } + +filegroup { + name: "CtsRoleTestUtils", + srcs: [ + "src/android/app/role/cts/RoleManagerUtil.kt", + ], +} diff --git a/tests/cts/role/AndroidManifest.xml b/tests/cts/role/AndroidManifest.xml index a8c8c8e3d..7ea4287dc 100644 --- a/tests/cts/role/AndroidManifest.xml +++ b/tests/cts/role/AndroidManifest.xml @@ -22,6 +22,7 @@ <uses-permission android:name="android.permission.DISABLE_KEYGUARD" /> <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /> + <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> <application> diff --git a/tests/cts/role/AndroidTest.xml b/tests/cts/role/AndroidTest.xml index 73f23dd1b..9a60b09e3 100644 --- a/tests/cts/role/AndroidTest.xml +++ b/tests/cts/role/AndroidTest.xml @@ -32,6 +32,8 @@ <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> <option name="cleanup-apks" value="true" /> <option name="test-file-name" value="CtsRoleTestCases.apk" /> + <option name="install-arg" value="-t" /> + <option name="test-file-name" value="CtsDefaultNotesApp.apk" /> </target_preparer> <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> @@ -40,6 +42,7 @@ </target_preparer> <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> <option name="cleanup" value="true" /> + <option name="push" value="CtsDefaultNotesApp.apk->/data/local/tmp/cts-role/CtsDefaultNotesApp.apk" /> <option name="push" value="CtsRoleTestApp.apk->/data/local/tmp/cts-role/CtsRoleTestApp.apk" /> <option name="push" value="CtsRoleTestApp28.apk->/data/local/tmp/cts-role/CtsRoleTestApp28.apk" /> <option name="push" value="CtsRoleTestApp33WithoutInCallService.apk->/data/local/tmp/cts-role/CtsRoleTestApp33WithoutInCallService.apk" /> diff --git a/tests/cts/role/src/android/app/role/cts/ChooseNoteRoleAppTest.kt b/tests/cts/role/src/android/app/role/cts/ChooseNoteRoleAppTest.kt new file mode 100644 index 000000000..18003d1d9 --- /dev/null +++ b/tests/cts/role/src/android/app/role/cts/ChooseNoteRoleAppTest.kt @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2025 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 android.app.role.cts + +import android.content.Intent +import android.platform.test.rule.NotesRoleManagerRule +import android.platform.uiautomatorhelpers.WaitUtils.ensureThat +import android.provider.Settings +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.uiautomator.By.text +import com.android.compatibility.common.util.UiAutomatorUtils2.getUiDevice +import com.android.compatibility.common.util.UiAutomatorUtils2.waitFindObject +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Before +import org.junit.Rule +import org.junit.Test + +class ChooseNoteRoleAppTest { + + @[Rule JvmField] + val rule = NotesRoleManagerRule(requiredNotesRoleHolderPackage = NOTES_APP_PACKAGE_NAME) + + @Before + fun setUp() { + rule.utils.clearRoleHolder() + InstrumentationRegistry.getInstrumentation() + .context + .startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + } + + @After + fun after() { + getUiDevice().pressHome() + } + + @Test + fun chooseNoteRoleHolderApp() { + ensureThat { rule.utils.getRoleHolderPackageName().isEmpty() } + + // Scroll to "Notes app" item in Default apps screen and click on it + waitFindObject(text("Notes app")).click() + // Scroll to "CtsDefaultNotesApp" item and click on it + waitFindObject(text("CtsDefaultNotesApp")).click() + + assertEquals(rule.utils.getRoleHolderPackageName(), NOTES_APP_PACKAGE_NAME) + } + + private companion object { + const val NOTES_APP_PACKAGE_NAME = "com.android.cts.notesapp" + } +} diff --git a/tests/cts/role/src/android/app/role/cts/RoleManagerSecurityTest.kt b/tests/cts/role/src/android/app/role/cts/RoleManagerSecurityTest.kt new file mode 100644 index 000000000..59a8c21b2 --- /dev/null +++ b/tests/cts/role/src/android/app/role/cts/RoleManagerSecurityTest.kt @@ -0,0 +1,148 @@ +/* + * Copyright (C) 2025 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 android.app.role.cts + +import android.app.role.RoleManager +import android.content.Context +import android.os.Build +import android.os.Process +import android.os.UserHandle +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SdkSuppress +import androidx.test.platform.app.InstrumentationRegistry +import com.android.compatibility.common.util.SystemUtil +import com.google.common.truth.Truth.assertThat +import java.util.concurrent.CompletableFuture +import java.util.concurrent.Executor +import java.util.concurrent.TimeUnit +import java.util.function.Consumer +import org.junit.After +import org.junit.Assert.fail +import org.junit.Assume.assumeTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith + +/** Tests {@link RoleManager} security fixes. */ +@RunWith(AndroidJUnit4::class) +class RoleManagerSecurityTest { + private var browserRoleHolder: String? = null + + @Before + fun setUp() { + saveBrowserRoleHolder() + } + + @After + fun tearDown() { + restoreBrowserRoleHolder() + } + + private fun saveBrowserRoleHolder() { + val roleHolders: List<String> = getRoleHolders(RoleManager.ROLE_BROWSER, roleManager) + browserRoleHolder = if (roleHolders.isNotEmpty()) roleHolders[0] else null + } + + private fun restoreBrowserRoleHolder() { + browserRoleHolder?.let { packageName -> + addRoleHolderAsUser( + RoleManager.ROLE_BROWSER, + packageName, + Process.myUserHandle(), + true, + roleManager, + context.mainExecutor, + ) + } + } + + private fun getRoleHolders(roleName: String, roleManager: RoleManager): List<String> { + return SystemUtil.callWithShellPermissionIdentity { roleManager.getRoleHolders(roleName) } + } + + private fun addRoleHolderAsUser( + roleName: String, + packageName: String, + userHandle: UserHandle, + expectSuccess: Boolean, + roleManager: RoleManager, + executor: Executor, + ) { + val future = CallbackFuture() + SystemUtil.runWithShellPermissionIdentity { + roleManager.addRoleHolderAsUser(roleName, packageName, 0, userHandle, executor, future) + } + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isEqualTo(expectSuccess) + } + + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.S, + maxSdkVersion = Build.VERSION_CODES.TIRAMISU, + ) + @Test + fun cannotGetDefaultApplicationOnOlderSdk() { + assumeTrue(roleManager.isRoleAvailable(RoleManager.ROLE_BROWSER)) + try { + roleManager.getDefaultApplication(RoleManager.ROLE_BROWSER) + } catch (e: NoSuchMethodError) { + // Expected when permission module hasn't been updated + } catch (e: IllegalStateException) { + // Expected when permission module has been updated, and SDK 33 or below + } catch (e: Throwable) { + fail("Missing patch for cveBugId = [379362792]") + } + } + + @SdkSuppress( + minSdkVersion = Build.VERSION_CODES.S, + maxSdkVersion = Build.VERSION_CODES.TIRAMISU, + ) + @Test + fun cannotSetDefaultApplicationOnOlderSdk() { + assumeTrue(roleManager.isRoleAvailable(RoleManager.ROLE_BROWSER)) + val future = CallbackFuture() + try { + roleManager.setDefaultApplication( + RoleManager.ROLE_BROWSER, + APP_PACKAGE_NAME, + 0, + context.mainExecutor, + future, + ) + future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS) + } catch (e: NoSuchMethodError) { + // Expected when permission module hasn't been updated + } catch (e: IllegalStateException) { + // Expected when permission module has been updated, and SDK 33 or below + } catch (e: Throwable) { + fail("Missing patch for cveBugId = [379362792]") + } + } + + private class CallbackFuture : CompletableFuture<Boolean?>(), Consumer<Boolean?> { + override fun accept(successful: Boolean?) { + complete(successful) + } + } + + companion object { + private const val TIMEOUT_MILLIS: Long = (15 * 1000).toLong() + private const val APP_PACKAGE_NAME: String = "android.app.role.cts.app" + + private val context: Context = InstrumentationRegistry.getInstrumentation().targetContext + private val roleManager: RoleManager = context.getSystemService(RoleManager::class.java) + } +} diff --git a/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java b/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java index ce1c26d2d..e2310e7fb 100644 --- a/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java +++ b/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java @@ -18,6 +18,7 @@ package android.app.role.cts; import static com.android.bedstead.multiuser.MultiUserDeviceStateExtensionsKt.privateProfile; import static com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity; +import static com.android.compatibility.common.util.SystemUtil.eventually; import static com.android.compatibility.common.util.SystemUtil.runShellCommand; import static com.android.compatibility.common.util.SystemUtil.runShellCommandOrThrow; import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity; @@ -26,6 +27,7 @@ import static com.android.compatibility.common.util.UiAutomatorUtils2.waitFindOb import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; import static org.junit.Assert.fail; import static org.junit.Assume.assumeFalse; @@ -45,7 +47,6 @@ import android.os.Build; import android.os.Process; import android.os.UserHandle; import android.permission.flags.Flags; -import android.platform.test.annotations.RequiresFlagsDisabled; import android.platform.test.annotations.RequiresFlagsEnabled; import android.platform.test.flag.junit.CheckFlagsRule; import android.platform.test.flag.junit.DeviceFlagsValueProvider; @@ -104,7 +105,6 @@ public class RoleManagerTest { private static final String ROLE_NAME = RoleManager.ROLE_BROWSER; private static final String ROLE_PHONE_NAME = RoleManager.ROLE_DIALER; - private static final String ROLE_SMS_NAME = RoleManager.ROLE_SMS; private static final String PROFILE_GROUP_EXCLUSIVE_ROLE_NAME = RoleManager.ROLE_RESERVED_FOR_TESTING_PROFILE_GROUP_EXCLUSIVITY; private static final String ROLE_SHORT_LABEL = "Browser app"; @@ -168,6 +168,9 @@ public class RoleManagerTest { ? By.text("Don\u2019t ask again") : By.res("com.android.permissioncontroller:id/dont_ask_again"); + private static final BySelector PERMISSION_APP_LABEL = + By.pkg(sPackageManager.getPermissionControllerPackageName()).text(APP_LABEL); + @Rule public CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); @Rule @@ -284,13 +287,20 @@ public class RoleManagerTest { @RequiresFlagsEnabled(Flags.FLAG_ENHANCED_CONFIRMATION_MODE_APIS_ENABLED) @FlakyTest(bugId = 288468003, detail = "CtsRoleTestCases is breaching 20min SLO") public void requestRoleThenBlockRequestRoleDialogByRestrictedSettingDialog() throws Exception { - assumeTrue(sRoleManager.isRoleAvailable(RoleManager.ROLE_SMS)); assumeFalse(sIsWatch || sIsAutomotive || sIsTelevision); + assumeTrue(sRoleManager.isRoleAvailable(RoleManager.ROLE_SMS)); + assumeFalse(callWithShellPermissionIdentity( + () -> getRoleHolders(RoleManager.ROLE_SMS)).contains(APP_PACKAGE_NAME)); + + // TODO: b/388960315 - Remove wait after addressing race condition + runWithShellPermissionIdentity( + () -> waitForEnhancedConfirmationRestrictedAppOpMode(sContext, APP_PACKAGE_NAME, + AppOpsManager.MODE_DEFAULT)); runWithShellPermissionIdentity( () -> setEnhancedConfirmationRestrictedAppOpMode(sContext, APP_PACKAGE_NAME, AppOpsManager.MODE_ERRORED)); - requestRole(ROLE_SMS_NAME); + requestRole(RoleManager.ROLE_SMS); waitFindObject(ENHANCED_CONFIRMATION_DIALOG_SELECTOR, TIMEOUT_MILLIS); pressBack(); @@ -467,7 +477,7 @@ public class RoleManagerTest { private void respondToRoleRequest(boolean allow) throws InterruptedException, UiObjectNotFoundException { if (allow) { - waitFindObject(By.text(APP_LABEL)).click(); + waitFindObject(PERMISSION_APP_LABEL).click(); } Pair<Integer, Intent> result = clickButtonAndWaitForResult(allow); int expectedResult = allow ? Activity.RESULT_OK : Activity.RESULT_CANCELED; @@ -713,6 +723,10 @@ public class RoleManagerTest { throws Exception { assumeTrue(sRoleManager.isRoleAvailable(RoleManager.ROLE_DIALER)); assumeFalse(sIsWatch || sIsAutomotive || sIsTelevision); + // TODO: b/388960315 - Remove wait after addressing race condition + runWithShellPermissionIdentity( + () -> waitForEnhancedConfirmationRestrictedAppOpMode(sContext, APP_PACKAGE_NAME, + AppOpsManager.MODE_DEFAULT)); runWithShellPermissionIdentity( () -> setEnhancedConfirmationRestrictedAppOpMode(sContext, APP_PACKAGE_NAME, AppOpsManager.MODE_ERRORED)); @@ -817,6 +831,13 @@ public class RoleManagerTest { @FlakyTest @Test public void openDefaultAppListThenIsNotDefaultAppInList() throws Exception { + assumeFalse(callWithShellPermissionIdentity( + () -> getRoleHolders(RoleManager.ROLE_BROWSER)).contains(APP_PACKAGE_NAME)); + assumeFalse(callWithShellPermissionIdentity( + () -> getRoleHolders(RoleManager.ROLE_DIALER)).contains(APP_PACKAGE_NAME)); + assumeFalse(callWithShellPermissionIdentity( + () -> getRoleHolders(RoleManager.ROLE_SMS)).contains(APP_PACKAGE_NAME)); + sContext.startActivity(new Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) .addCategory(Intent.CATEGORY_DEFAULT) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)); @@ -857,7 +878,6 @@ public class RoleManagerTest { } @Test - @RequiresFlagsEnabled(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE) @EnsureHasPrivateProfile(installInstrumentedApp = OptionalBoolean.TRUE) @SdkSuppress(minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, codeName = "VanillaIceCream") @@ -926,6 +946,19 @@ public class RoleManagerTest { pressBack(); } + private void waitForEnhancedConfirmationRestrictedAppOpMode(@NonNull Context context, + @NonNull String packageName, int expectedMode) + throws PackageManager.NameNotFoundException { + final AppOpsManager appOpsManager = context.getSystemService(AppOpsManager.class); + eventually(() -> { + int uid = context.getPackageManager().getApplicationInfo(packageName, 0).uid; + int actualMode = appOpsManager.checkOpNoThrow( + AppOpsManager.OPSTR_ACCESS_RESTRICTED_SETTINGS, uid, packageName); + assertEquals("Even after waiting, a test app's post-install" + + " ACCESS_RESTRICTED_SETTINGS op mode is incorrect", expectedMode, actualMode); + }); + } + private void setEnhancedConfirmationRestrictedAppOpMode(@NonNull Context context, @NonNull String packageName, int mode) throws PackageManager.NameNotFoundException { @@ -1171,6 +1204,8 @@ public class RoleManagerTest { @Test public void removeSmsRoleHolderThenPermissionIsRevoked() throws Exception { assumeTrue(sRoleManager.isRoleAvailable(RoleManager.ROLE_SMS)); + assumeFalse(callWithShellPermissionIdentity( + () -> getRoleHolders(RoleManager.ROLE_SMS)).contains(APP_PACKAGE_NAME)); String smsRoleHolder = getRoleHolders(RoleManager.ROLE_SMS).get(0); addRoleHolder(RoleManager.ROLE_SMS, APP_PACKAGE_NAME); @@ -1405,16 +1440,6 @@ public class RoleManagerTest { }); } - @RequiresFlagsDisabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) - @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") - @Test - public void cannotGetDefaultHoldersForTestFlagDisabled() throws Exception { - runWithShellPermissionIdentity(() -> { - assertThrows(IllegalStateException.class, () -> - sRoleManager.getDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME)); - }); - } - @RequiresFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") @Test @@ -1444,18 +1469,6 @@ public class RoleManagerTest { }); } - @RequiresFlagsDisabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) - @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") - @Test - public void cannotSetDefaultHoldersForTestFlagDisabled() throws Exception { - List<String> testRoleHolders = List.of("a", "b", "c"); - runWithShellPermissionIdentity(() -> { - assertThrows(IllegalStateException.class, () -> - sRoleManager.setDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME, - testRoleHolders)); - }); - } - @RequiresFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") @Test @@ -1492,27 +1505,21 @@ public class RoleManagerTest { @RequiresFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") @Test - public void setAndGetDefaultHolders() throws Exception { - List<String> testRoleHolders = List.of("a", "b", "c"); + public void cannotSetDefaultHoldersForTestNullPackageNames() throws Exception { runWithShellPermissionIdentity(() -> { - sRoleManager.setDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME, - testRoleHolders); - List<String> roleHolders = - sRoleManager.getDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME); - assertThat(roleHolders).isEqualTo(testRoleHolders); + assertThrows(NullPointerException.class, () -> + sRoleManager.setDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME, + null)); }); } @RequiresFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") @Test - public void setAndGetDefaultHoldersNoRoleHolders() throws Exception { - List<String> initialRoleHolders = List.of("a", "b", "c"); - List<String> testRoleHolders = Collections.emptyList(); + public void setAndGetDefaultHolders() throws Exception { + List<String> testRoleHolders = List.of("a", "b", "c"); runWithShellPermissionIdentity(() -> { sRoleManager.setDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME, - initialRoleHolders); - sRoleManager.setDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME, testRoleHolders); List<String> roleHolders = sRoleManager.getDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME); @@ -1523,25 +1530,17 @@ public class RoleManagerTest { @RequiresFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") @Test - public void setAndGetDefaultHoldersNullRoleHolders() throws Exception { + public void setAndGetDefaultHoldersNoRoleHolders() throws Exception { List<String> initialRoleHolders = List.of("a", "b", "c"); + List<String> testRoleHolders = Collections.emptyList(); runWithShellPermissionIdentity(() -> { sRoleManager.setDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME, initialRoleHolders); - sRoleManager.setDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME, null); + sRoleManager.setDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME, + testRoleHolders); List<String> roleHolders = sRoleManager.getDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME); - assertThat(roleHolders).isEqualTo(Collections.emptyList()); - }); - } - - @RequiresFlagsDisabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) - @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") - @Test - public void cannotGetIsRoleVisibleForTestFlagDisabled() throws Exception { - runWithShellPermissionIdentity(() -> { - assertThrows(IllegalStateException.class, () -> - sRoleManager.isRoleVisibleForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME)); + assertThat(roleHolders).isEqualTo(testRoleHolders); }); } @@ -1573,16 +1572,6 @@ public class RoleManagerTest { }); } - @RequiresFlagsDisabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) - @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") - @Test - public void cannotSetRoleVisibleForTestFlagDisabled() throws Exception { - runWithShellPermissionIdentity(() -> { - assertThrows(IllegalStateException.class, () -> - sRoleManager.setRoleVisibleForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME, false)); - }); - } - @RequiresFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") @Test diff --git a/tests/cts/rolemultiuser/Android.bp b/tests/cts/rolemultiuser/Android.bp index 7de55fc1b..51eff83b9 100644 --- a/tests/cts/rolemultiuser/Android.bp +++ b/tests/cts/rolemultiuser/Android.bp @@ -24,6 +24,7 @@ android_test { srcs: [ "src/**/*.kt", + ":CtsRoleTestUtils", ], static_libs: [ @@ -45,6 +46,6 @@ android_test { ], data: [ - ":CtsRoleMultiUserTestApp", + ":CtsRoleTestApp", ], } diff --git a/tests/cts/rolemultiuser/AndroidManifest.xml b/tests/cts/rolemultiuser/AndroidManifest.xml index 1524c5703..77710a5aa 100644 --- a/tests/cts/rolemultiuser/AndroidManifest.xml +++ b/tests/cts/rolemultiuser/AndroidManifest.xml @@ -22,6 +22,10 @@ <application> <uses-library android:name="android.test.runner" /> + + <activity + android:name=".WaitForResultActivity" + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"/> </application> <instrumentation diff --git a/tests/cts/rolemultiuser/AndroidTest.xml b/tests/cts/rolemultiuser/AndroidTest.xml index 15c34f54a..510b70fdb 100644 --- a/tests/cts/rolemultiuser/AndroidTest.xml +++ b/tests/cts/rolemultiuser/AndroidTest.xml @@ -41,7 +41,7 @@ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> <option name="cleanup" value="true" /> - <option name="push" value="CtsRoleMultiUserTestApp.apk->/data/local/tmp/cts-role/CtsRoleMultiUserTestApp.apk" /> + <option name="push" value="CtsRoleTestApp.apk->/data/local/tmp/cts-role/CtsRoleTestApp.apk" /> </target_preparer> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > diff --git a/tests/cts/rolemultiuser/CtsRoleMultiUserTestApp/Android.bp b/tests/cts/rolemultiuser/CtsRoleMultiUserTestApp/Android.bp deleted file mode 100644 index 71ccd0e59..000000000 --- a/tests/cts/rolemultiuser/CtsRoleMultiUserTestApp/Android.bp +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (C) 2024 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 { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -android_test_helper_app { - name: "CtsRoleMultiUserTestApp", - defaults: ["mts-target-sdk-version-current"], - min_sdk_version: "30", -} diff --git a/tests/cts/rolemultiuser/TEST_MAPPING b/tests/cts/rolemultiuser/TEST_MAPPING index 323e3094c..b45469e14 100644 --- a/tests/cts/rolemultiuser/TEST_MAPPING +++ b/tests/cts/rolemultiuser/TEST_MAPPING @@ -1,12 +1,17 @@ { - "postsubmit": [ + "presubmit": [ { "name": "CtsRoleMultiUserTestCases" } ], - "mainline-postsubmit": [ + "mainline-presubmit": [ { "name": "CtsRoleMultiUserTestCases[com.google.android.permission.apex]" } + ], + "permission-mainline-presubmit": [ + { + "name": "CtsRoleMultiUserTestCases" + } ] } diff --git a/tests/cts/rolemultiuser/src/android/app/rolemultiuser/cts/RoleManagerMultiUserTest.kt b/tests/cts/rolemultiuser/src/android/app/rolemultiuser/cts/RoleManagerMultiUserTest.kt index 134f45131..3e24d5025 100644 --- a/tests/cts/rolemultiuser/src/android/app/rolemultiuser/cts/RoleManagerMultiUserTest.kt +++ b/tests/cts/rolemultiuser/src/android/app/rolemultiuser/cts/RoleManagerMultiUserTest.kt @@ -15,18 +15,35 @@ */ package android.app.rolemultiuser.cts +import android.app.Activity import android.app.role.RoleManager +import android.app.role.cts.RoleManagerUtil +import android.content.ComponentName import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager import android.os.Build import android.os.Process import android.os.UserHandle +import android.os.UserManager.DISALLOW_CONFIG_DEFAULT_APPS +import android.provider.Settings +import android.util.Log +import android.util.Pair import androidx.test.filters.SdkSuppress +import androidx.test.rule.ActivityTestRule +import androidx.test.uiautomator.By +import com.android.bedstead.enterprise.annotations.EnsureDoesNotHaveUserRestriction +import com.android.bedstead.enterprise.annotations.EnsureHasNoWorkProfile +import com.android.bedstead.enterprise.annotations.EnsureHasUserRestriction import com.android.bedstead.enterprise.annotations.EnsureHasWorkProfile import com.android.bedstead.enterprise.annotations.RequireRunOnWorkProfile import com.android.bedstead.enterprise.workProfile import com.android.bedstead.flags.annotations.RequireFlagsEnabled import com.android.bedstead.harrier.BedsteadJUnit4 import com.android.bedstead.harrier.DeviceState +import com.android.bedstead.harrier.UserType.INITIAL_USER +import com.android.bedstead.harrier.UserType.WORK_PROFILE +import com.android.bedstead.multiuser.annotations.EnsureCanAddUser import com.android.bedstead.multiuser.annotations.EnsureHasAdditionalUser import com.android.bedstead.multiuser.annotations.EnsureHasPrivateProfile import com.android.bedstead.multiuser.annotations.EnsureHasSecondaryUser @@ -38,22 +55,31 @@ import com.android.bedstead.nene.TestApis.context import com.android.bedstead.nene.TestApis.permissions import com.android.bedstead.nene.TestApis.users import com.android.bedstead.nene.types.OptionalBoolean +import com.android.bedstead.nene.userrestrictions.CommonUserRestrictions.DISALLOW_ADD_MANAGED_PROFILE +import com.android.bedstead.nene.users.UserReference +import com.android.bedstead.nene.users.UserType import com.android.bedstead.permissions.CommonPermissions.INTERACT_ACROSS_USERS_FULL import com.android.bedstead.permissions.CommonPermissions.MANAGE_DEFAULT_APPLICATIONS import com.android.bedstead.permissions.CommonPermissions.MANAGE_ROLE_HOLDERS import com.android.bedstead.permissions.annotations.EnsureDoesNotHavePermission import com.android.bedstead.permissions.annotations.EnsureHasPermission +import com.android.compatibility.common.util.DisableAnimationRule +import com.android.compatibility.common.util.FreezeRotationRule import com.android.compatibility.common.util.SystemUtil import com.android.compatibility.common.util.SystemUtil.eventually +import com.android.compatibility.common.util.UiAutomatorUtils2.getUiDevice +import com.android.compatibility.common.util.UiAutomatorUtils2.waitFindObject +import com.android.compatibility.common.util.UiAutomatorUtils2.waitFindObjectOrNull import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertWithMessage -import java.util.Objects import java.util.concurrent.CompletableFuture import java.util.concurrent.TimeUnit import java.util.function.Consumer import org.junit.After +import org.junit.Assert.assertNull import org.junit.Assert.assertThrows import org.junit.Assume.assumeFalse +import org.junit.Assume.assumeTrue import org.junit.Before import org.junit.ClassRule import org.junit.Rule @@ -63,16 +89,31 @@ import org.junit.runner.RunWith @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava") @RunWith(BedsteadJUnit4::class) class RoleManagerMultiUserTest { + + @JvmField + @Rule + var activityRule: ActivityTestRule<WaitForResultActivity> = + ActivityTestRule(WaitForResultActivity::class.java) + @Before - @Throws(java.lang.Exception::class) fun setUp() { + assumeTrue(RoleManagerUtil.isCddCompliantScreenSize()) installAppForAllUsers() + + // If "none" selected in test, ensure we re-enable fallback for other test runs + permissions().withPermission(MANAGE_ROLE_HOLDERS, INTERACT_ACROSS_USERS_FULL).use { + setRoleFallbackEnabledForAllUsers() + } } @After - @Throws(java.lang.Exception::class) fun tearDown() { uninstallAppForAllUsers() + + // If "none" selected in test, ensure we re-enable fallback for other test runs + permissions().withPermission(MANAGE_ROLE_HOLDERS, INTERACT_ACROSS_USERS_FULL).use { + setRoleFallbackEnabledForAllUsers() + } } @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) @@ -83,9 +124,8 @@ class RoleManagerMultiUserTest { @Test @Throws(Exception::class) fun isAvailableAsUserForProfileGroupExclusiveRole() { - val workProfileRoleManager = getRoleManagerForUser(deviceState.workProfile().userHandle()) - val privateProfileRoleManager = - getRoleManagerForUser(deviceState.privateProfile().userHandle()) + val workProfileRoleManager = getRoleManagerForUser(deviceState.workProfile()) + val privateProfileRoleManager = getRoleManagerForUser(deviceState.privateProfile()) assertThat(roleManager.isRoleAvailable(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)).isTrue() assertThat(workProfileRoleManager.isRoleAvailable(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) @@ -219,19 +259,17 @@ class RoleManagerMultiUserTest { @Test @Throws(java.lang.Exception::class) fun ensureRoleHasActiveUser() { - val primaryUser = deviceState.initialUser().userHandle() + val primaryUser = deviceState.initialUser() + val primaryUserId = primaryUser.userHandle().identifier val primaryUserRoleManager = getRoleManagerForUser(primaryUser) - val secondaryUser = deviceState.secondaryUser().userHandle() + val secondaryUser = deviceState.secondaryUser() + val secondaryUserId = secondaryUser.userHandle().identifier val secondaryUserRoleManager = getRoleManagerForUser(secondaryUser) - assertWithMessage( - "Expected active user in profile group for user ${primaryUser.identifier}" - ) + assertWithMessage("Expected active user in profile group for user $primaryUserId") .that(primaryUserRoleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) .isNotNull() - assertWithMessage( - "Expected active user in profile group for user ${secondaryUser.identifier}" - ) + assertWithMessage("Expected active user in profile group for user $secondaryUserId") .that( secondaryUserRoleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) ) @@ -240,28 +278,6 @@ class RoleManagerMultiUserTest { @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) - @EnsureHasWorkProfile - @Test - @Throws(java.lang.Exception::class) - fun ensureOnlyActiveUserIsRoleHolder() { - try { - // Set test default role holder. Ensures fallbacks to a default holder - roleManager.setDefaultHoldersForTest( - PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, - listOf(APP_PACKAGE_NAME), - ) - - val activeUser = roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)!! - // Test app install might take a moment - eventually { assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(activeUser) } - } finally { - // Clear test default role holder - roleManager.setDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, null) - } - } - - @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) - @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) @EnsureDoesNotHavePermission(MANAGE_DEFAULT_APPLICATIONS) @EnsureHasWorkProfile(installInstrumentedApp = OptionalBoolean.TRUE) @Test @@ -309,7 +325,7 @@ class RoleManagerMultiUserTest { // initialUser needs to be not the targetUser val targetActiveUser = users().current().userHandle() val initialUser = - if (Objects.equals(targetActiveUser, deviceState.initialUser())) { + if (targetActiveUser == deviceState.initialUser().userHandle()) { deviceState.workProfile().userHandle() } else { deviceState.initialUser().userHandle() @@ -318,10 +334,7 @@ class RoleManagerMultiUserTest { try { // Set test default role holder. Ensures fallbacks to a default holder - roleManager.setDefaultHoldersForTest( - PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, - listOf(APP_PACKAGE_NAME), - ) + setDefaultHoldersForTestForAllUsers() roleManager.setActiveUserForRole( PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, @@ -333,8 +346,7 @@ class RoleManagerMultiUserTest { // We can assume targetActiveUser is role holder since fallback is enabled eventually { assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) } } finally { - // Clear test default role holder - roleManager.setDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, null) + clearDefaultHoldersForTestForAllUsers() } } @@ -346,10 +358,7 @@ class RoleManagerMultiUserTest { fun setAndGetActiveUserForRoleSetWorkProfile() { try { // Set test default role holder. Ensures fallbacks to a default holder - roleManager.setDefaultHoldersForTest( - PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, - listOf(APP_PACKAGE_NAME), - ) + setDefaultHoldersForTestForAllUsers() val targetActiveUser = deviceState.workProfile().userHandle() roleManager.setActiveUserForRole( @@ -363,8 +372,7 @@ class RoleManagerMultiUserTest { // We can assume targetActiveUser is role holder since fallback is enabled eventually { assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) } } finally { - // Clear test default role holder - roleManager.setDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, null) + setDefaultHoldersForTestForAllUsers() } } @@ -380,7 +388,7 @@ class RoleManagerMultiUserTest { val initialUser = deviceState.workProfile().userHandle() // setActiveUserForRole and getActiveUserForRole is used to ensure initial active users // state and requires INTERACT_ACROSS_USERS_FULL - permissions().withPermission(INTERACT_ACROSS_USERS_FULL).use { _ -> + permissions().withPermission(INTERACT_ACROSS_USERS_FULL).use { roleManager.setActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, initialUser, 0) assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) .isEqualTo(initialUser) @@ -408,7 +416,7 @@ class RoleManagerMultiUserTest { // getActiveUserForRole is used to ensure addRoleHolderAsUser didn't set active user, and // requires INTERACT_ACROSS_USERS_FULL - permissions().withPermission(INTERACT_ACROSS_USERS_FULL).use { _ -> + permissions().withPermission(INTERACT_ACROSS_USERS_FULL).use { assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) .isEqualTo(initialUser) } @@ -450,7 +458,7 @@ class RoleManagerMultiUserTest { @Throws(java.lang.Exception::class) fun addRoleHolderAsUserSetsWorkProfileAsActive() { // Set other user as active - val initialUser = users().main()!!.userHandle() + val initialUser = deviceState.initialUser().userHandle() roleManager.setActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, initialUser, 0) assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) .isEqualTo(initialUser) @@ -473,6 +481,47 @@ class RoleManagerMultiUserTest { assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) } + @RequireFlagsEnabled( + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED, + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED, + ) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun addRoleHolderAsUserReenablesFallbackOnProfileParent() { + // Set other user as active + val initialUserReference = deviceState.initialUser() + val initialUser = initialUserReference.userHandle() + roleManager.setActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, initialUser, 0) + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(initialUser) + + val profileParentRoleManager = getRoleManagerForUser(initialUserReference) + profileParentRoleManager.setRoleFallbackEnabled(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, false) + assertThat( + profileParentRoleManager.isRoleFallbackEnabled(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + ) + .isFalse() + + val targetActiveUser = deviceState.workProfile().userHandle() + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + targetActiveUser, + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + assertThat( + profileParentRoleManager.isRoleFallbackEnabled(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + ) + .isTrue() + } + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) @EnsureHasPermission(MANAGE_DEFAULT_APPLICATIONS) @EnsureDoesNotHavePermission(INTERACT_ACROSS_USERS_FULL) @@ -485,7 +534,7 @@ class RoleManagerMultiUserTest { val initialUser = deviceState.workProfile().userHandle() // setActiveUserForRole and getActiveUserForRole is used to ensure initial active users // state and requires INTERACT_ACROSS_USERS_FULL - permissions().withPermission(INTERACT_ACROSS_USERS_FULL).use { _ -> + permissions().withPermission(INTERACT_ACROSS_USERS_FULL).use { roleManager.setActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, initialUser, 0) assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) .isEqualTo(initialUser) @@ -505,7 +554,7 @@ class RoleManagerMultiUserTest { // getActiveUserForRole is used to ensure setDefaultApplication didn't set active user, // and requires INTERACT_ACROSS_USERS_FULL - permissions().withPermission(INTERACT_ACROSS_USERS_FULL).use { _ -> + permissions().withPermission(INTERACT_ACROSS_USERS_FULL).use { assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) .isEqualTo(initialUser) } @@ -535,7 +584,7 @@ class RoleManagerMultiUserTest { assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) .isEqualTo(targetActiveUser) - assertExpectedProfileHasRoleUsingGetDefaultApplication(targetActiveUser) + eventually { assertExpectedProfileHasRoleUsingGetDefaultApplication(targetActiveUser) } } @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) @@ -546,7 +595,7 @@ class RoleManagerMultiUserTest { @Throws(java.lang.Exception::class) fun setDefaultApplicationSetsWorkProfileAsActive() { // Set other user as active - val initialUser = users().main()!!.userHandle() + val initialUser = deviceState.initialUser().userHandle() roleManager.setActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, initialUser, 0) assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) .isEqualTo(initialUser) @@ -564,10 +613,1572 @@ class RoleManagerMultiUserTest { assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) .isEqualTo(targetActiveUser) - assertExpectedProfileHasRoleUsingGetDefaultApplication(targetActiveUser) + eventually { assertExpectedProfileHasRoleUsingGetDefaultApplication(targetActiveUser) } + } + + @RequireFlagsEnabled( + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED, + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED, + ) + @EnsureHasPermission( + INTERACT_ACROSS_USERS_FULL, + MANAGE_DEFAULT_APPLICATIONS, + MANAGE_ROLE_HOLDERS, + ) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun setDefaultApplicationReenablesFallbackOnProfileParent() { + // Set other user as active + val initialUserReference = deviceState.initialUser() + val initialUser = initialUserReference.userHandle() + roleManager.setActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, initialUser, 0) + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(initialUser) + + val profileParentRoleManager = getRoleManagerForUser(initialUserReference) + profileParentRoleManager.setRoleFallbackEnabled(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, false) + assertThat( + profileParentRoleManager.isRoleFallbackEnabled(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + ) + .isFalse() + + val future = CallbackFuture() + getRoleManagerForUser(deviceState.workProfile()) + .setDefaultApplication( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + assertThat( + profileParentRoleManager.isRoleFallbackEnabled(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + ) + .isTrue() + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureCanAddUser + @EnsureHasNoWorkProfile + @RequireRunOnPrimaryUser + @EnsureDoesNotHaveUserRestriction(DISALLOW_ADD_MANAGED_PROFILE) + @Test + @Throws(Exception::class) + fun ensureActiveUserSetToParentOnUserRemoved() { + users() + .createUser() + .parent(users().initial()) + .type(users().supportedType(UserType.MANAGED_PROFILE_TYPE_NAME)) + .createAndStart() + .use { userReference -> + val targetActiveUser = userReference.userHandle() + roleManager.setActiveUserForRole( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + targetActiveUser, + 0, + ) + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + + userReference.remove() + } + + // Removal of users in roles service might take a moment + eventually { + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(users().current().userHandle()) + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListAndSetDefaultAppThenIsDefaultApp() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + waitFindObject(By.text(PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL)).click() + getUiDevice().waitForIdle() + + val targetActiveUser = users().current().userHandle() + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + if (isWatch) { + waitFindObject(By.clickable(true).hasDescendant(By.text(targetAppLabel))).click() + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + .click() + } + + if (isWatch) { + waitFindObject( + By.clickable(true).checked(true).hasDescendant(By.text(targetAppLabel)) + ) + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true).checked(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + } + + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + + pressBack() + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListAndSetWorkDefaultAppThenIsDefaultApp() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + waitFindObject(By.text(PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL)).click() + getUiDevice().waitForIdle() + + val targetActiveUser = deviceState.workProfile().userHandle() + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + if (isWatch) { + waitFindObject(By.clickable(true).hasDescendant(By.text(targetAppLabel))).click() + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + .click() + } + + if (isWatch) { + waitFindObject( + By.clickable(true).checked(true).hasDescendant(By.text(targetAppLabel)) + ) + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true).checked(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + } + + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + + pressBack() + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListAndSetDefaultAppThenSetNoneThenHasNoneDefaultApp() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + waitFindObject(By.text(PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL)).click() + getUiDevice().waitForIdle() + + val targetActiveUser = users().current().userHandle() + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + if (isWatch) { + waitFindObject(By.clickable(true).hasDescendant(By.text(targetAppLabel))).click() + getUiDevice().waitForIdle() + waitFindObject(By.clickable(true).hasDescendant(By.text(NONE_LABEL))).click() + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + .click() + getUiDevice().waitForIdle() + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(NONE_LABEL)) + ) + .click() + } + + if (isWatch) { + waitFindObject(By.clickable(true).checked(true).hasDescendant(By.text(NONE_LABEL))) + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true).checked(true)) + .hasDescendant(By.text(NONE_LABEL)) + ) + } + + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(deviceState.initialUser().userHandle()) + assertNoRoleHoldersUsingGetRoleHoldersAsUser() + + pressBack() + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListAndSetWorkDefaultAppThenSetNoneThenHasNoneDefaultApp() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + waitFindObject(By.text(PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL)).click() + getUiDevice().waitForIdle() + + val targetActiveUser = deviceState.workProfile().userHandle() + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + if (isWatch) { + waitFindObject(By.clickable(true).hasDescendant(By.text(targetAppLabel))).click() + getUiDevice().waitForIdle() + waitFindObject(By.clickable(true).hasDescendant(By.text(NONE_LABEL))).click() + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + .click() + getUiDevice().waitForIdle() + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(NONE_LABEL)) + ) + .click() + } + + if (isWatch) { + waitFindObject(By.clickable(true).checked(true).hasDescendant(By.text(NONE_LABEL))) + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true).checked(true)) + .hasDescendant(By.text(NONE_LABEL)) + ) + } + + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(deviceState.initialUser().userHandle()) + assertNoRoleHoldersUsingGetRoleHoldersAsUser() + + pressBack() + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListAndSetDefaultAppThenIsDefaultAppInList() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + waitFindObject(By.text(PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL)).click() + getUiDevice().waitForIdle() + + val targetActiveUser = users().current().userHandle() + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + if (isWatch) { + waitFindObject(By.clickable(true).hasDescendant(By.text(targetAppLabel))).click() + waitFindObject( + By.clickable(true).checked(true).hasDescendant(By.text(targetAppLabel)) + ) + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + .click() + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true).checked(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + } + pressBack() + + waitFindObject(By.text(targetAppLabel)) + + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListAndSetWorkDefaultAppThenIsDefaultAppInList() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + waitFindObject(By.text(PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL)).click() + getUiDevice().waitForIdle() + + val targetActiveUser = deviceState.workProfile().userHandle() + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + if (isWatch) { + waitFindObject(By.clickable(true).hasDescendant(By.text(targetAppLabel))).click() + waitFindObject( + By.clickable(true).checked(true).hasDescendant(By.text(targetAppLabel)) + ) + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + .click() + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true).checked(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + } + pressBack() + + waitFindObject(By.text(targetAppLabel)) + + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListAndSetDefaultAppThenSetNoneThenIsNoneDefaultAppInList() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + waitFindObject(By.text(PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL)).click() + getUiDevice().waitForIdle() + + val targetActiveUser = users().current().userHandle() + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + if (isWatch) { + waitFindObject(By.clickable(true).hasDescendant(By.text(targetAppLabel))).click() + getUiDevice().waitForIdle() + waitFindObject(By.clickable(true).hasDescendant(By.text(NONE_LABEL))).click() + waitFindObject(By.clickable(true).checked(true).hasDescendant(By.text(NONE_LABEL))) + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + .click() + getUiDevice().waitForIdle() + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(NONE_LABEL)) + ) + .click() + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true).checked(true)) + .hasDescendant(By.text(NONE_LABEL)) + ) + } + pressBack() + + waitFindObject( + By.clickable(true) + .hasDescendant(By.text(PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL)) + .hasDescendant(By.text(NONE_LABEL)) + ) + + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(deviceState.initialUser().userHandle()) + assertNoRoleHoldersUsingGetRoleHoldersAsUser() + + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListAndSetWorkDefaultAppThenSetNoneThenIsNoneDefaultAppInList() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + waitFindObject(By.text(PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL)).click() + getUiDevice().waitForIdle() + + val targetActiveUser = deviceState.workProfile().userHandle() + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + if (isWatch) { + waitFindObject(By.clickable(true).hasDescendant(By.text(targetAppLabel))).click() + getUiDevice().waitForIdle() + waitFindObject(By.clickable(true).hasDescendant(By.text(NONE_LABEL))).click() + waitFindObject(By.clickable(true).checked(true).hasDescendant(By.text(NONE_LABEL))) + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + .click() + getUiDevice().waitForIdle() + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(NONE_LABEL)) + ) + .click() + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true).checked(true)) + .hasDescendant(By.text(NONE_LABEL)) + ) + } + pressBack() + + waitFindObject( + By.clickable(true) + .hasDescendant(By.text(PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL)) + .hasDescendant(By.text(NONE_LABEL)) + ) + + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(deviceState.initialUser().userHandle()) + assertNoRoleHoldersUsingGetRoleHoldersAsUser() + + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } } + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test @Throws(java.lang.Exception::class) + fun openDefaultAppListFromPrimaryUserAndShowsPrimaryIsDefaultAppInList() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + val targetActiveUser = deviceState.initialUser().userHandle() + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + targetActiveUser, + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + waitFindObject(By.text(targetAppLabel)) + + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListFromPrimaryUserAndShowsWorkIsDefaultAppInList() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + val targetActiveUser = deviceState.workProfile().userHandle() + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + targetActiveUser, + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + waitFindObject(By.text(targetAppLabel)) + + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled( + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED, + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED, + ) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasWorkProfile + @RequireRunOnWorkProfile + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListFromWorkProfileAndShowsPrimaryIsDefaultAppInList() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + val targetActiveUser = deviceState.initialUser().userHandle() + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + targetActiveUser, + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + waitFindObject(By.text(targetAppLabel)) + + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasWorkProfile + @RequireRunOnWorkProfile + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListFromWorkProfileAndShowsWorkIsDefaultAppInList() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + val targetActiveUser = deviceState.workProfile().userHandle() + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + targetActiveUser, + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + waitFindObject(By.text(targetAppLabel)) + + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun requestRoleAndAllowPrimaryThenIsRoleHolder() { + try { + // setDefaultHoldersForTestForAllUsers and setRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + // Ensure non-primary selected first. Request exits early if user and package + // already the role holder + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + deviceState.workProfile().userHandle(), + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + } + + requestRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + + val targetActiveUser = deviceState.initialUser().userHandle() + respondToRoleRequest(true, targetActiveUser) + + // getActiveUserForRole and getRoleHoldersAsUser require INTERACT_ACROSS_USERS_FULL and + // MANAGE_ROLE_HOLDERS permissions to validate cross user role active user and role + // holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + } + } finally { + // clearDefaultHoldersForTestForAllUsers and clearRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun requestRoleAndAllowWorkThenWorkIsRoleHolder() { + try { + // setDefaultHoldersForTestForAllUsers and setRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + // Ensure non-primary selected first. Request exits early if user and package + // already the role holder + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + deviceState.workProfile().userHandle(), + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + } + + requestRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + + val targetActiveUser = deviceState.workProfile().userHandle() + respondToRoleRequest(true, targetActiveUser) + + // getActiveUserForRole and getRoleHoldersAsUser require INTERACT_ACROSS_USERS_FULL and + // MANAGE_ROLE_HOLDERS permissions to validate cross user role active user and role + // holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + } + } finally { + // clearDefaultHoldersForTestForAllUsers and clearRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasWorkProfile + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun requestRoleAndSelectNoneThenIsNoneRoleHolder() { + try { + // setDefaultHoldersForTestForAllUsers and setRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + // Ensure non-primary selected first. Request exits early if user and package + // already the role holder + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + deviceState.workProfile().userHandle(), + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + } + + requestRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + respondNoneToRoleRequest() + + // getActiveUserForRole and getRoleHoldersAsUser require INTERACT_ACROSS_USERS_FULL and + // MANAGE_ROLE_HOLDERS permissions to validate cross user role active user and role + // holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(deviceState.initialUser().userHandle()) + assertNoRoleHoldersUsingGetRoleHoldersAsUser() + } + } finally { + // clearDefaultHoldersForTestForAllUsers and clearRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasWorkProfile + @RequireRunOnWorkProfile + @Test + @Throws(java.lang.Exception::class) + fun requestRoleFromWorkProfileAndAllowPrimaryThenIsRoleHolder() { + try { + // setDefaultHoldersForTestForAllUsers and setRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + // Ensure non-work selected first. Request exits early if user and package + // already the role holder + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + deviceState.initialUser().userHandle(), + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + } + + requestRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + + val targetActiveUser = deviceState.initialUser().userHandle() + respondToRoleRequest(true, targetActiveUser) + + // getActiveUserForRole and getRoleHoldersAsUser require INTERACT_ACROSS_USERS_FULL and + // MANAGE_ROLE_HOLDERS permissions to validate cross user role active user and role + // holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + } + } finally { + // clearDefaultHoldersForTestForAllUsers and clearRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasWorkProfile + @RequireRunOnWorkProfile + @Test + @Throws(java.lang.Exception::class) + fun requestRoleFromWorkProfileAndAllowWorkThenWorkIsRoleHolder() { + try { + // setDefaultHoldersForTestForAllUsers and setRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + // Ensure non-work selected first. Request exits early if user and package + // already the role holder + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + deviceState.initialUser().userHandle(), + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + } + + requestRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + + val targetActiveUser = deviceState.workProfile().userHandle() + respondToRoleRequest(true, targetActiveUser) + + // getActiveUserForRole and getRoleHoldersAsUser require INTERACT_ACROSS_USERS_FULL and + // MANAGE_ROLE_HOLDERS permissions to validate cross user role active user and role + // holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + } + } finally { + // clearDefaultHoldersForTestForAllUsers and clearRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + } + + @RequireFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED) + @EnsureHasWorkProfile + @RequireRunOnWorkProfile + @Test + @Throws(java.lang.Exception::class) + fun requestRoleFromWorkProfileAndSelectNoneThenIsNoneRoleHolder() { + try { + // setDefaultHoldersForTestForAllUsers and setRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + // Ensure non-work selected first. Request exits early if user and package + // already the role holder + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + deviceState.initialUser().userHandle(), + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + } + + requestRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + respondNoneToRoleRequest() + + // getActiveUserForRole and getRoleHoldersAsUser require INTERACT_ACROSS_USERS_FULL and + // MANAGE_ROLE_HOLDERS permissions to validate cross user role active user and role + // holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(deviceState.initialUser().userHandle()) + assertNoRoleHoldersUsingGetRoleHoldersAsUser() + } + } finally { + // clearDefaultHoldersForTestForAllUsers and clearRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + } + + @RequireFlagsEnabled( + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED, + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED, + ) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasUserRestriction(value = DISALLOW_CONFIG_DEFAULT_APPS, onUser = INITIAL_USER) + @EnsureHasWorkProfile(isOrganizationOwned = false) + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListAndOpenDefaultAppWhenBYODHasUserRestrictionOnPrimaryProfile() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + waitFindObject(By.text(PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL)).click() + getUiDevice().waitForIdle() + + // CollapsingToolbar title can't be found by text, so using description instead. + waitFindObject(By.desc(PROFILE_GROUP_EXCLUSIVITY_ROLE_LABEL)) + + pressBack() + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled( + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED, + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED, + ) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasUserRestriction(value = DISALLOW_CONFIG_DEFAULT_APPS, onUser = INITIAL_USER) + @EnsureHasWorkProfile(isOrganizationOwned = true) + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListAndCannotOpenDefaultAppWhenHasUserRestrictionOnPrimaryProfile() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + waitFindObject(By.text(PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL)).click() + getUiDevice().waitForIdle() + + // CollapsingToolbar title can't be found by text, so using description instead. + assertNull( + waitFindObjectOrNull( + By.desc(PROFILE_GROUP_EXCLUSIVITY_ROLE_LABEL), + IDLE_TIMEOUT_MILLIS, + ) + ) + + pressBack() + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled( + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED, + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED, + ) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasUserRestriction(value = DISALLOW_CONFIG_DEFAULT_APPS, onUser = WORK_PROFILE) + @EnsureHasWorkProfile(isOrganizationOwned = true) + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppListAndCannotOpenDefaultAppWhenHasUserRestrictionOnWorkProfile() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + context.startActivity( + Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS) + .addCategory(Intent.CATEGORY_DEFAULT) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + waitFindObject(By.text(PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL)).click() + getUiDevice().waitForIdle() + + // CollapsingToolbar title can't be found by text, so using description instead. + assertNull( + waitFindObjectOrNull( + By.desc(PROFILE_GROUP_EXCLUSIVITY_ROLE_LABEL), + IDLE_TIMEOUT_MILLIS, + ) + ) + + pressBack() + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled( + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED, + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED, + ) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasUserRestriction(value = DISALLOW_CONFIG_DEFAULT_APPS, onUser = INITIAL_USER) + @EnsureHasWorkProfile(isOrganizationOwned = false) + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppDetailsAndSetDefaultAppWhenBYODHasUserRestrictionOnPrimaryProfile() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + // Ensure non-target selected first. Request exits early if user and package + // already the role holder + val initialActiveUser = deviceState.workProfile().userHandle() + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + initialActiveUser, + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + + context.startActivity( + Intent(Intent.ACTION_MANAGE_DEFAULT_APP) + .addCategory(Intent.CATEGORY_DEFAULT) + .putExtra(Intent.EXTRA_ROLE_NAME, PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + + val targetActiveUser = users().current().userHandle() + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + if (isWatch) { + waitFindObject(By.clickable(true).hasDescendant(By.text(targetAppLabel))).click() + waitFindObject( + By.clickable(true).checked(true).hasDescendant(By.text(targetAppLabel)) + ) + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + .click() + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true).checked(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + } + + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + + pressBack() + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled( + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED, + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED, + ) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasUserRestriction(value = DISALLOW_CONFIG_DEFAULT_APPS, onUser = INITIAL_USER) + @EnsureHasWorkProfile(isOrganizationOwned = true) + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppDetailsAndCannotSetDefaultAppWhenHasUserRestrictionOnPrimaryProfile() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + // Ensure non-target selected first. Request exits early if user and package + // already the role holder + val initialActiveUser = deviceState.workProfile().userHandle() + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + initialActiveUser, + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + + context.startActivity( + Intent(Intent.ACTION_MANAGE_DEFAULT_APP) + .addCategory(Intent.CATEGORY_DEFAULT) + .putExtra(Intent.EXTRA_ROLE_NAME, PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + + val targetActiveUser = users().current().userHandle() + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + if (isWatch) { + waitFindObject(By.clickable(true).hasDescendant(By.text(targetAppLabel))).click() + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + .click() + } + + if (isWatch) { + assertNull( + waitFindObjectOrNull( + By.clickable(true).checked(true).hasDescendant(By.text(targetAppLabel)), + IDLE_TIMEOUT_MILLIS, + ) + ) + } else { + assertNull( + waitFindObjectOrNull( + By.clickable(true) + .hasDescendant(By.checkable(true).checked(true)) + .hasDescendant(By.text(targetAppLabel)), + IDLE_TIMEOUT_MILLIS, + ) + ) + } + + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(initialActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(initialActiveUser) + + pressBack() + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled( + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED, + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED, + ) + @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS) + @EnsureHasUserRestriction(value = DISALLOW_CONFIG_DEFAULT_APPS, onUser = WORK_PROFILE) + @EnsureHasWorkProfile(isOrganizationOwned = true) + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun openDefaultAppDetailsAndCannotSetDefaultAppWhenHasUserRestrictionOnWorkProfile() { + try { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + // Ensure non-target selected first. Request exits early if user and package + // already the role holder + val initialActiveUser = deviceState.workProfile().userHandle() + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + initialActiveUser, + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + + context.startActivity( + Intent(Intent.ACTION_MANAGE_DEFAULT_APP) + .addCategory(Intent.CATEGORY_DEFAULT) + .putExtra(Intent.EXTRA_ROLE_NAME, PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK) + ) + getUiDevice().waitForIdle() + + val targetActiveUser = users().current().userHandle() + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + if (isWatch) { + waitFindObject(By.clickable(true).hasDescendant(By.text(targetAppLabel))).click() + } else { + waitFindObject( + By.clickable(true) + .hasDescendant(By.checkable(true)) + .hasDescendant(By.text(targetAppLabel)) + ) + .click() + } + + if (isWatch) { + assertNull( + waitFindObjectOrNull( + By.clickable(true).checked(true).hasDescendant(By.text(targetAppLabel)), + IDLE_TIMEOUT_MILLIS, + ) + ) + } else { + assertNull( + waitFindObjectOrNull( + By.clickable(true) + .hasDescendant(By.checkable(true).checked(true)) + .hasDescendant(By.text(targetAppLabel)), + IDLE_TIMEOUT_MILLIS, + ) + ) + } + + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(initialActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(initialActiveUser) + + pressBack() + pressBack() + } finally { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + + @RequireFlagsEnabled( + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED, + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED, + ) + @EnsureHasUserRestriction(value = DISALLOW_CONFIG_DEFAULT_APPS, onUser = INITIAL_USER) + @EnsureHasWorkProfile(isOrganizationOwned = false) + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun requestRoleAllowedWhenBYODHasUserRestrictionOnPrimaryProfile() { + try { + // setDefaultHoldersForTestForAllUsers and setRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + // Ensure non-primary selected first. Request exits early if user and package + // already the role holder + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + deviceState.workProfile().userHandle(), + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + } + + requestRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + + val targetActiveUser = deviceState.initialUser().userHandle() + respondToRoleRequest(true, targetActiveUser) + + // getActiveUserForRole and getRoleHoldersAsUser require INTERACT_ACROSS_USERS_FULL and + // MANAGE_ROLE_HOLDERS permissions to validate cross user role active user and role + // holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + assertThat(roleManager.getActiveUserForRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME)) + .isEqualTo(targetActiveUser) + assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser(targetActiveUser) + } + } finally { + // clearDefaultHoldersForTestForAllUsers and clearRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + } + + @RequireFlagsEnabled( + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED, + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED, + ) + @EnsureHasUserRestriction(value = DISALLOW_CONFIG_DEFAULT_APPS, onUser = INITIAL_USER) + @EnsureHasWorkProfile(isOrganizationOwned = true) + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun requestRoleDeniedWhenHasUserRestrictionOnPrimaryProfile() { + try { + // setDefaultHoldersForTestForAllUsers and setRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + // Ensure non-primary selected first. Request exits early if user and package + // already the role holder + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + deviceState.workProfile().userHandle(), + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + } + + requestRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + roleRequestNotShown() + } finally { + // clearDefaultHoldersForTestForAllUsers and clearRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + } + + @RequireFlagsEnabled( + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED, + com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_UX_BUGFIX_ENABLED, + ) + @EnsureHasUserRestriction(value = DISALLOW_CONFIG_DEFAULT_APPS, onUser = WORK_PROFILE) + @EnsureHasWorkProfile(isOrganizationOwned = true) + @RequireRunOnPrimaryUser + @Test + @Throws(java.lang.Exception::class) + fun requestRoleDeniedWhenHasUserRestrictionOnWorkProfile() { + try { + // setDefaultHoldersForTestForAllUsers and setRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + // Set test default role holder. Ensures fallbacks to a default holder + setDefaultHoldersForTestForAllUsers() + setRoleVisibleForTestForAllUsers() + + // Ensure non-primary selected first. Request exits early if user and package + // already the role holder + val future = CallbackFuture() + roleManager.addRoleHolderAsUser( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + APP_PACKAGE_NAME, + 0, + deviceState.workProfile().userHandle(), + context.mainExecutor, + future, + ) + assertThat(future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)).isTrue() + } + + requestRole(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) + roleRequestNotShown() + } finally { + // clearDefaultHoldersForTestForAllUsers and clearRoleVisibleForTestForAllUsers require + // INTERACT_ACROSS_USERS_FULL and MANAGE_ROLE_HOLDERS permissions to validate cross user + // role active user and role holder states + permissions().withPermission(INTERACT_ACROSS_USERS_FULL, MANAGE_ROLE_HOLDERS).use { + clearDefaultHoldersForTestForAllUsers() + clearRoleVisibleForTestForAllUsers() + } + } + } + private fun installAppForAllUsers() { SystemUtil.runShellCommandOrThrow("pm install -r --user all $APP_APK_PATH") } @@ -576,14 +2187,78 @@ class RoleManagerMultiUserTest { SystemUtil.runShellCommand("pm uninstall $APP_PACKAGE_NAME") } + private fun pressBack() { + getUiDevice().pressBack() + getUiDevice().waitForIdle() + } + + private fun requestRole(roleName: String) { + val intent = + Intent() + .setComponent(ComponentName(APP_PACKAGE_NAME, APP_REQUEST_ROLE_ACTIVITY_NAME)) + .putExtra(Intent.EXTRA_ROLE_NAME, roleName) + activityRule.getActivity().startActivityToWaitForResult(intent) + } + + private fun respondToRoleRequest(allow: Boolean, targetActiveUser: UserHandle) { + if (allow) { + val targetAppLabel = "$APP_LABEL@${targetActiveUser.identifier}" + waitFindObject(By.text(targetAppLabel)).click() + } + val result: Pair<Int, Intent?> = clickButtonAndWaitForResult(allow) + val expectedResult = + if (allow && targetActiveUser == users().instrumented().userHandle()) Activity.RESULT_OK + else Activity.RESULT_CANCELED + + assertThat(result.first).isEqualTo(expectedResult) + } + + private fun respondNoneToRoleRequest() { + waitFindObject(By.text(NONE_LABEL)).click() + val result: Pair<Int, Intent?> = clickButtonAndWaitForResult(true) + assertThat(result.first).isEqualTo(Activity.RESULT_CANCELED) + } + + private fun clickButtonAndWaitForResult(positive: Boolean): Pair<Int, Intent?> { + waitFindObject(if (positive) POSITIVE_BUTTON_SELECTOR else NEGATIVE_BUTTON_SELECTOR).click() + return waitForResult() + } + + private fun roleRequestNotShown() { + val requestRoleItem = + waitFindObjectOrNull(By.textStartsWith(APP_LABEL), IDLE_TIMEOUT_MILLIS) + assertNull(requestRoleItem) + + val result: Pair<Int, Intent?> = waitForResult() + assertThat(result.first).isEqualTo(Activity.RESULT_CANCELED) + } + + @Throws(InterruptedException::class) + private fun waitForResult(): Pair<Int, Intent?> { + return activityRule.getActivity().waitForActivityResult(TIMEOUT_MILLIS) + } + + private fun assertNoRoleHoldersUsingGetRoleHoldersAsUser() { + for (userReference in users().profileGroup(deviceState.initialUser())) { + val user = userReference.userHandle() + // Verify the non-active user does not hold the role + assertWithMessage( + "Expected user ${user.identifier} to not have a role holder for" + + " $PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME" + ) + .that(roleManager.getRoleHoldersAsUser(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, user)) + .isEmpty() + } + } + private fun assertExpectedProfileHasRoleUsingGetRoleHoldersAsUser( expectedActiveUser: UserHandle ) { - for (userReference in users().profileGroup()) { + for (userReference in users().profileGroup(deviceState.initialUser())) { val user = userReference.userHandle() - if (Objects.equals(user, expectedActiveUser)) { - val roleHolders = - roleManager.getRoleHoldersAsUser(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, user) + val roleHolders = + roleManager.getRoleHoldersAsUser(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, user) + if (user == expectedActiveUser) { assertWithMessage( "Expected user ${user.identifier} to have a role holder for " + " $PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME" @@ -602,9 +2277,7 @@ class RoleManagerMultiUserTest { "Expected user ${user.identifier} to not have a role holder for" + " $PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME" ) - .that( - roleManager.getRoleHoldersAsUser(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, user) - ) + .that(roleHolders) .isEmpty() } } @@ -613,10 +2286,10 @@ class RoleManagerMultiUserTest { private fun assertExpectedProfileHasRoleUsingGetDefaultApplication( expectedActiveUser: UserHandle ) { - for (userReference in users().profileGroup()) { + for (userReference in users().profileGroup(deviceState.initialUser())) { + val userRoleManager = getRoleManagerForUser(userReference) val user = userReference.userHandle() - val userRoleManager = getRoleManagerForUser(user) - if (Objects.equals(user, expectedActiveUser)) { + if (user == expectedActiveUser) { assertWithMessage("Expected default application for user ${user.identifier}") .that( userRoleManager.getDefaultApplication(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME) @@ -633,8 +2306,63 @@ class RoleManagerMultiUserTest { } } - private fun getRoleManagerForUser(user: UserHandle): RoleManager { - val userContext = context.createContextAsUser(user, 0) + private fun setDefaultHoldersForTestForAllUsers() { + // Set test default role holder. Ensures fallbacks to a default holder + for (userRoleManager in + users().profileGroup(users().current()).map { getRoleManagerForUser(it) }) { + userRoleManager.setDefaultHoldersForTest( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + listOf(APP_PACKAGE_NAME), + ) + } + } + + private fun clearDefaultHoldersForTestForAllUsers() { + // Set test default role holder. Ensures fallbacks to a default holder + for (userRoleManager in + users().profileGroup(users().current()).map { getRoleManagerForUser(it) }) { + userRoleManager.setDefaultHoldersForTest( + PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, + emptyList(), + ) + } + } + + private fun setRoleVisibleForTestForAllUsers() { + // Set test default role holder. Ensures fallbacks to a default holder + for (userRoleManager in + users().profileGroup(users().current()).map { getRoleManagerForUser(it) }) { + userRoleManager.setRoleVisibleForTest(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, true) + } + } + + private fun clearRoleVisibleForTestForAllUsers() { + // Set test default role holder. Ensures fallbacks to a default holder + for (userRoleManager in + users().profileGroup(users().current()).map { getRoleManagerForUser(it) }) { + userRoleManager.setRoleVisibleForTest(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, false) + } + } + + private fun setRoleFallbackEnabledForAllUsers() { + for (userReference in users().profileGroup(users().current())) { + try { + val userRoleManager = getRoleManagerForUser(userReference) + userRoleManager.setRoleFallbackEnabled(PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME, true) + } catch (e: Exception) { + Log.w( + LOG_TAG, + "Encountered error setting fallback enabled for" + + " $PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME@" + + "${userReference.userHandle().identifier}", + e, + ) + } + } + } + + private fun getRoleManagerForUser(user: UserReference): RoleManager { + val userContext = context().androidContextAsUser(user) return userContext.getSystemService(RoleManager::class.java) } @@ -645,16 +2373,40 @@ class RoleManagerMultiUserTest { } companion object { + private val LOG_TAG = RoleManagerMultiUserTest::class.java.simpleName + private const val TIMEOUT_MILLIS: Long = (15 * 1000).toLong() + private const val IDLE_TIMEOUT_MILLIS: Long = (2 * 1000).toLong() private const val PROFILE_GROUP_EXCLUSIVITY_ROLE_NAME = RoleManager.ROLE_RESERVED_FOR_TESTING_PROFILE_GROUP_EXCLUSIVITY + private const val PROFILE_GROUP_EXCLUSIVITY_ROLE_LABEL = + "Default test profile group exclusive role app" + private const val PROFILE_GROUP_EXCLUSIVITY_ROLE_SHORT_LABEL = + "Test profile group exclusive role app" private const val PRIVATE_PROFILE_TYPE_NAME = "android.os.usertype.profile.PRIVATE" - private const val APP_APK_PATH: String = - "/data/local/tmp/cts-role/CtsRoleMultiUserTestApp.apk" - private const val APP_PACKAGE_NAME: String = "android.app.rolemultiuser.cts.app" + private const val APP_APK_PATH = "/data/local/tmp/cts-role/CtsRoleTestApp.apk" + private const val APP_PACKAGE_NAME = "android.app.role.cts.app" + private const val APP_LABEL = "CtsRoleTestApp" + private const val APP_REQUEST_ROLE_ACTIVITY_NAME = APP_PACKAGE_NAME + ".RequestRoleActivity" + private const val NONE_LABEL = "None" + private val context: Context = context().instrumentedContext() private val roleManager: RoleManager = context.getSystemService(RoleManager::class.java) + private val packageManager: PackageManager = context.packageManager + private val isWatch = packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH) + + private val NEGATIVE_BUTTON_SELECTOR = + if (isWatch) By.text("Cancel") else By.res("android:id/button2") + private val POSITIVE_BUTTON_SELECTOR = + if (isWatch) By.text("Set as default") else By.res("android:id/button1") @JvmField @ClassRule @Rule val deviceState = DeviceState() + + @JvmField + @ClassRule + @Rule + var disableAnimationRule: DisableAnimationRule = DisableAnimationRule() + + @JvmField @ClassRule @Rule var freezeRotationRule: FreezeRotationRule = FreezeRotationRule() } } diff --git a/tests/cts/rolemultiuser/src/android/app/rolemultiuser/cts/WaitForResultActivity.kt b/tests/cts/rolemultiuser/src/android/app/rolemultiuser/cts/WaitForResultActivity.kt new file mode 100644 index 000000000..84590ce91 --- /dev/null +++ b/tests/cts/rolemultiuser/src/android/app/rolemultiuser/cts/WaitForResultActivity.kt @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2024 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 android.app.rolemultiuser.cts + +import android.app.Activity +import android.content.Intent +import android.os.Bundle +import android.util.Pair +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit + +/** An Activity that can start another Activity and wait for its result. */ +class WaitForResultActivity : Activity() { + private var mLatch: CountDownLatch? = null + private var mResultCode = 0 + private var mData: Intent? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + if (savedInstanceState != null) { + throw RuntimeException( + ("Activity was recreated (perhaps due to a configuration change?) " + + "and this activity doesn't currently know how to gracefully handle " + + "configuration changes.") + ) + } + } + + fun startActivityToWaitForResult(intent: Intent) { + mLatch = CountDownLatch(1) + startActivityForResult(intent, REQUEST_CODE_WAIT_FOR_RESULT) + } + + @Throws(InterruptedException::class) + fun waitForActivityResult(timeoutMillis: Long): Pair<Int, Intent?> { + mLatch!!.await(timeoutMillis, TimeUnit.MILLISECONDS) + return Pair(mResultCode, mData) + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (requestCode == REQUEST_CODE_WAIT_FOR_RESULT) { + mResultCode = resultCode + mData = data + mLatch!!.countDown() + } else { + super.onActivityResult(requestCode, resultCode, data) + } + } + + companion object { + private const val REQUEST_CODE_WAIT_FOR_RESULT = 1 + } +} diff --git a/tests/cts/safetycenter/AndroidTest.xml b/tests/cts/safetycenter/AndroidTest.xml index 6d8c3069c..ed161f0b6 100644 --- a/tests/cts/safetycenter/AndroidTest.xml +++ b/tests/cts/safetycenter/AndroidTest.xml @@ -47,6 +47,10 @@ <!-- Disable syncing to prevent overwriting flags during testing. --> <option name="run-command" value="device_config set_sync_disabled_for_tests persistent" /> <option name="teardown-command" value="device_config set_sync_disabled_for_tests none" /> + <!-- Belt-and-braces attempt to dismiss keyguard. Tradefed should have already done this + for us, but this is a precaution in an attempt to mitigate b/379620557. --> + <option name="run-command" value="input keyevent KEYCODE_WAKEUP" /> + <option name="run-command" value="wm dismiss-keyguard" /> <!-- Dismiss any system dialogs (e.g. crashes, ANR). --> <option name="run-command" value="am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS --receiver-foreground" /> </target_preparer> diff --git a/tests/functional/safetycenter/multiusers/AndroidTest.xml b/tests/functional/safetycenter/multiusers/AndroidTest.xml index 20032357a..bfb7fdbf2 100644 --- a/tests/functional/safetycenter/multiusers/AndroidTest.xml +++ b/tests/functional/safetycenter/multiusers/AndroidTest.xml @@ -47,6 +47,10 @@ <!-- Disable syncing to prevent overwriting flags during testing. --> <option name="run-command" value="device_config set_sync_disabled_for_tests persistent" /> <option name="teardown-command" value="device_config set_sync_disabled_for_tests none" /> + <!-- Belt-and-braces attempt to dismiss keyguard. Tradefed should have already done this + for us, but this is a precaution in an attempt to mitigate b/379620557. --> + <option name="run-command" value="input keyevent KEYCODE_WAKEUP" /> + <option name="run-command" value="wm dismiss-keyguard" /> <!-- Dismiss any system dialogs (e.g. crashes, ANR). --> <option name="run-command" value="am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS --receiver-foreground" /> </target_preparer> diff --git a/tests/functional/safetycenter/multiusers/src/android/safetycenter/functional/multiusers/SafetyCenterMultiUsersTest.kt b/tests/functional/safetycenter/multiusers/src/android/safetycenter/functional/multiusers/SafetyCenterMultiUsersTest.kt index 9dba6f9c2..041cc652f 100644 --- a/tests/functional/safetycenter/multiusers/src/android/safetycenter/functional/multiusers/SafetyCenterMultiUsersTest.kt +++ b/tests/functional/safetycenter/multiusers/src/android/safetycenter/functional/multiusers/SafetyCenterMultiUsersTest.kt @@ -374,7 +374,8 @@ class SafetyCenterMultiUsersTest { safetyCenterTestData.safetyCenterStatusUnknown, emptyList(), listOf( - SafetyCenterEntryOrGroup( + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, safetyCenterTestData.safetyCenterEntryDefault( SINGLE_SOURCE_ALL_PROFILE_ID, deviceState.additionalUser().id(), @@ -382,7 +383,8 @@ class SafetyCenterMultiUsersTest { createTestActivityRedirectPendingIntentForUser( deviceState.additionalUser().userHandle() ), - ) + ), + "No info yet", ) ), emptyList(), @@ -1227,8 +1229,10 @@ class SafetyCenterMultiUsersTest { safetyCenterTestData.safetyCenterStatusUnknown, emptyList(), listOf( - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryDefault(SINGLE_SOURCE_ALL_PROFILE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryDefault(SINGLE_SOURCE_ALL_PROFILE_ID), + "No info yet", ) ), emptyList(), @@ -1298,8 +1302,10 @@ class SafetyCenterMultiUsersTest { safetyCenterTestData.safetyCenterStatusUnknown, emptyList(), listOf( - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryDefault(SINGLE_SOURCE_ALL_PROFILE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryDefault(SINGLE_SOURCE_ALL_PROFILE_ID), + "No info yet", ) ), emptyList(), diff --git a/tests/functional/safetycenter/safetycenteractivity/Android.bp b/tests/functional/safetycenter/safetycenteractivity/Android.bp index ea5f9f286..2346a0d5f 100644 --- a/tests/functional/safetycenter/safetycenteractivity/Android.bp +++ b/tests/functional/safetycenter/safetycenteractivity/Android.bp @@ -29,6 +29,7 @@ android_test { "src/**/*.kt", ], static_libs: [ + "aconfig_settingstheme_exported_flags_java_lib", "androidx.test.rules", "androidx.test.ext.junit", "compatibility-device-preconditions", diff --git a/tests/functional/safetycenter/safetycenteractivity/AndroidTest.xml b/tests/functional/safetycenter/safetycenteractivity/AndroidTest.xml index a1826653f..ee79dcd2a 100644 --- a/tests/functional/safetycenter/safetycenteractivity/AndroidTest.xml +++ b/tests/functional/safetycenter/safetycenteractivity/AndroidTest.xml @@ -47,6 +47,10 @@ <!-- Disable syncing to prevent overwriting flags during testing. --> <option name="run-command" value="device_config set_sync_disabled_for_tests persistent" /> <option name="teardown-command" value="device_config set_sync_disabled_for_tests none" /> + <!-- Belt-and-braces attempt to dismiss keyguard. Tradefed should have already done this + for us, but this is a precaution in an attempt to mitigate b/379620557. --> + <option name="run-command" value="input keyevent KEYCODE_WAKEUP" /> + <option name="run-command" value="wm dismiss-keyguard" /> <!-- Dismiss any system dialogs (e.g. crashes, ANR). --> <option name="run-command" value="am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS --receiver-foreground" /> </target_preparer> diff --git a/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt b/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt index 7e8205bd6..fb577e8f6 100644 --- a/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt +++ b/tests/functional/safetycenter/safetycenteractivity/src/android/safetycenter/functional/ui/SafetyCenterActivityTest.kt @@ -21,6 +21,9 @@ import android.os.Build import android.os.Build.VERSION_CODES.TIRAMISU import android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE import android.os.Bundle +import android.platform.test.annotations.RequiresFlagsDisabled +import android.platform.test.flag.junit.CheckFlagsRule +import android.platform.test.flag.junit.DeviceFlagsValueProvider import android.safetycenter.SafetyCenterManager.EXTRA_SAFETY_SOURCE_ID import android.safetycenter.SafetyCenterManager.EXTRA_SAFETY_SOURCE_ISSUE_ID import android.safetycenter.SafetySourceData.SEVERITY_LEVEL_CRITICAL_WARNING @@ -60,6 +63,7 @@ import com.android.safetycenter.testing.UiTestHelper.RESCAN_BUTTON_LABEL import com.android.safetycenter.testing.UiTestHelper.clickConfirmDismissal import com.android.safetycenter.testing.UiTestHelper.clickDismissIssueCard import com.android.safetycenter.testing.UiTestHelper.clickMoreIssuesCard +import com.android.safetycenter.testing.UiTestHelper.clickOpenSubpage import com.android.safetycenter.testing.UiTestHelper.resetRotation import com.android.safetycenter.testing.UiTestHelper.rotate import com.android.safetycenter.testing.UiTestHelper.setAnimationsEnabled @@ -73,7 +77,10 @@ import com.android.safetycenter.testing.UiTestHelper.waitPageTitleDisplayed import com.android.safetycenter.testing.UiTestHelper.waitSourceDataDisplayed import com.android.safetycenter.testing.UiTestHelper.waitSourceIssueDisplayed import com.android.safetycenter.testing.UiTestHelper.waitSourceIssueNotDisplayed +import com.android.settingslib.widget.theme.flags.Flags as SettingsThemeFlags +import java.util.regex.Pattern import org.junit.After +import org.junit.Assume.assumeFalse import org.junit.Assume.assumeTrue import org.junit.Rule import org.junit.Test @@ -92,6 +99,8 @@ class SafetyCenterActivityTest { @get:Rule(order = 2) val safetyCenterTestRule = SafetyCenterTestRule(safetyCenterTestHelper) @get:Rule(order = 3) val disableAnimationRule = DisableAnimationRule() @get:Rule(order = 4) val freezeRotationRule = FreezeRotationRule() + @get:Rule(order = 5) + val checkFlagsRule: CheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() @After fun clearDataAfterTest() { @@ -99,13 +108,13 @@ class SafetyCenterActivityTest { } @Test - fun launchActivity_allowingSettingsTrampoline() { + fun launchActivity_allowingSettingsTrampoline_showsSafetyCenter() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.singleSourceConfig) val dataToDisplay = safetySourceTestData.criticalWithResolvingGeneralIssue safetyCenterTestHelper.setData(SINGLE_SOURCE_ID, dataToDisplay) context.launchSafetyCenterActivity(preventTrampolineToSettings = false) { - waitSourceDataDisplayed(dataToDisplay) + waitSourceIssueDisplayed(dataToDisplay.issues[0]) } } @@ -131,7 +140,13 @@ class SafetyCenterActivityTest { val dataToDisplay = safetySourceTestData.criticalWithResolvingGeneralIssue safetyCenterTestHelper.setData(SINGLE_SOURCE_ID, dataToDisplay) - context.launchSafetyCenterActivity { waitSourceDataDisplayed(dataToDisplay) } + context.launchSafetyCenterActivity { + if (SafetyCenterFlags.showSubpages) { + waitSourceIssueDisplayed(dataToDisplay.issues[0]) + } else { + waitSourceDataDisplayed(dataToDisplay) + } + } } @Test @@ -276,6 +291,8 @@ class SafetyCenterActivityTest { @Test fun launchActivity_displaysGroupsOfSingleSourceAsEntity() { + // Single source groups are displayed in the subpage when subpages enabled + assumeFalse(SafetyCenterFlags.showSubpages) safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourceGroupsConfig) context.launchSafetyCenterActivity { @@ -297,7 +314,11 @@ class SafetyCenterActivityTest { val dataToDisplay = safetySourceTestData.recommendationWithGeneralIssue safetyCenterTestHelper.setData(SINGLE_SOURCE_ID, dataToDisplay) - waitSourceDataDisplayed(dataToDisplay) + if (SafetyCenterFlags.showSubpages) { + waitSourceIssueDisplayed(dataToDisplay.issues[0]) + } else { + waitSourceDataDisplayed(dataToDisplay) + } } } @@ -338,6 +359,8 @@ class SafetyCenterActivityTest { @Test fun entryListWithEntryGroup_informationState_hasContentDescription() { + // No custom content descriptions when using subpages + assumeFalse(SafetyCenterFlags.showSubpages) safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig) safetyCenterTestHelper.setData(SOURCE_ID_1, safetySourceTestData.information) safetyCenterTestHelper.setData(SOURCE_ID_2, safetySourceTestData.information) @@ -355,6 +378,8 @@ class SafetyCenterActivityTest { @Test fun entryListWithEntryGroup_recommendationState_hasActionsNeededContentDescription() { + // No custom content descriptions when using subpages + assumeFalse(SafetyCenterFlags.showSubpages) safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig) safetyCenterTestHelper.setData( SOURCE_ID_1, @@ -394,6 +419,8 @@ class SafetyCenterActivityTest { @Test fun entryListWithEntryGroup_unclickableDisabledEntry_hasContentDescription() { + // No custom content descriptions when using subpages + assumeFalse(SafetyCenterFlags.showSubpages) safetyCenterTestHelper.setConfig( safetyCenterTestConfigs.multipleSourcesConfigWithSourceWithInvalidIntent ) @@ -424,6 +451,8 @@ class SafetyCenterActivityTest { @Test fun entryListWithEntryGroup_clickableDisabledEntry_hasContentDescription() { + // No custom content descriptions when using subpages + assumeFalse(SafetyCenterFlags.showSubpages) safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig) safetyCenterTestHelper.setData( SOURCE_ID_1, @@ -442,6 +471,8 @@ class SafetyCenterActivityTest { @Test fun entryListWithSingleSource_informationState_hasContentDescription() { + // No custom content descriptions when using subpages + assumeFalse(SafetyCenterFlags.showSubpages) safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.singleSourceConfig) safetyCenterTestHelper.setData(SINGLE_SOURCE_ID, safetySourceTestData.information) @@ -456,6 +487,12 @@ class SafetyCenterActivityTest { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.singleSourceConfig) context.launchSafetyCenterActivity { + if (SafetyCenterFlags.showSubpages) { + clickOpenSubpage( + context, + safetyCenterTestConfigs.singleSourceConfig.safetySourcesGroups.first(), + ) + } waitDisplayed(By.text("OK")) { it.click() } waitButtonDisplayed("Exit test activity") { it.click() } waitDisplayed(By.text("OK")) @@ -467,6 +504,13 @@ class SafetyCenterActivityTest { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.implicitIntentSingleSourceConfig) context.launchSafetyCenterActivity { + if (SafetyCenterFlags.showSubpages) { + clickOpenSubpage( + context, + safetyCenterTestConfigs.implicitIntentSingleSourceConfig.safetySourcesGroups + .first(), + ) + } waitDisplayed(By.text("OK")) { it.click() } waitButtonDisplayed("Exit test activity") { it.click() } } @@ -478,6 +522,12 @@ class SafetyCenterActivityTest { safetyCenterTestHelper.setData(SINGLE_SOURCE_ID, safetySourceTestData.information) context.launchSafetyCenterActivity { + if (SafetyCenterFlags.showSubpages) { + clickOpenSubpage( + context, + safetyCenterTestConfigs.singleSourceConfig.safetySourcesGroups.first(), + ) + } waitDisplayed(By.text("Ok title")) { it.click() } waitButtonDisplayed("Exit test activity") { it.click() } waitDisplayed(By.text("Ok title")) @@ -493,6 +543,12 @@ class SafetyCenterActivityTest { ) context.launchSafetyCenterActivity { + if (SafetyCenterFlags.showSubpages) { + clickOpenSubpage( + context, + safetyCenterTestConfigs.singleSourceConfig.safetySourcesGroups.first(), + ) + } waitDisplayed(By.desc("Information")) { it.click() } waitButtonDisplayed("Exit test activity") { it.click() } waitDisplayed(By.text("Ok title")) @@ -517,6 +573,8 @@ class SafetyCenterActivityTest { } @Test + // TODO: b/398188361 - Update this for expressive theme + @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED) fun issueCard_noAttribution_hasProperContentDescriptions() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.issueOnlySourceNoGroupTitleConfig) @@ -531,6 +589,8 @@ class SafetyCenterActivityTest { @Test @SdkSuppress(minSdkVersion = UPSIDE_DOWN_CAKE) + // TODO: b/398188361 - Update this for expressive theme + @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED) fun issueCard_withAttribution_hasProperContentDescriptions() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.singleSourceConfig) @@ -553,7 +613,6 @@ class SafetyCenterActivityTest { clickDismissIssueCard() waitSourceIssueNotDisplayed(safetySourceTestData.informationIssue) - waitSourceDataDisplayed(safetySourceTestData.information) waitButtonDisplayed(RESCAN_BUTTON_LABEL) } } @@ -644,7 +703,7 @@ class SafetyCenterActivityTest { @Test fun issueCard_resolveIssue_successConfirmationShown() { - SafetyCenterFlags.hideResolvedIssueUiTransitionDelay = TIMEOUT_LONG + SafetyCenterFlags.setHideResolvedIssueUiTransitionDelay(context, TIMEOUT_LONG) safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.singleSourceConfig) // Set the initial data for the source @@ -780,7 +839,7 @@ class SafetyCenterActivityTest { @Test fun issueCard_resolveIssue_noSuccessMessage_noResolutionUiShown_issueDismisses() { - SafetyCenterFlags.hideResolvedIssueUiTransitionDelay = TIMEOUT_LONG + SafetyCenterFlags.setHideResolvedIssueUiTransitionDelay(context, TIMEOUT_LONG) safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.singleSourceConfig) // Set the initial data for the source @@ -905,6 +964,8 @@ class SafetyCenterActivityTest { } @Test + // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag + @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED) fun launchActivity_fromQuickSettings_issuesExpanded() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig) safetyCenterTestHelper.setData( @@ -929,6 +990,8 @@ class SafetyCenterActivityTest { } @Test + // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag + @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED) fun launchActivity_fromNotification_targetIssueAlreadyFirstIssue() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig) safetyCenterTestHelper.setData( @@ -954,6 +1017,8 @@ class SafetyCenterActivityTest { } @Test + // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag + @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED) fun launchActivity_fromNotification_targetIssueSamePriorityAsFirstIssue_reorderedFirstIssue() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig) safetyCenterTestHelper.setData( @@ -979,6 +1044,8 @@ class SafetyCenterActivityTest { } @Test + // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag + @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED) fun launchActivity_fromNotification_targetLowerPriorityAsFirstIssue_reorderedSecondIssue() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig) safetyCenterTestHelper.setData( @@ -1003,6 +1070,8 @@ class SafetyCenterActivityTest { } @Test + // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag + @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED) fun launchActivity_fromNotification_targetIssueNotFound() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig) safetyCenterTestHelper.setData( @@ -1042,6 +1111,8 @@ class SafetyCenterActivityTest { } @Test + // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag + @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED) fun moreIssuesCard_moreIssuesCardShown_additionalIssueCardsCollapsed() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig) safetyCenterTestHelper.setData( @@ -1064,6 +1135,8 @@ class SafetyCenterActivityTest { } @Test + // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag + @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED) fun moreIssuesCard_expandAdditionalIssueCards() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig) safetyCenterTestHelper.setData( @@ -1090,6 +1163,8 @@ class SafetyCenterActivityTest { } @Test + // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag + @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED) fun moreIssuesCard_rotation_cardsStillExpanded() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig) safetyCenterTestHelper.setData( @@ -1124,6 +1199,8 @@ class SafetyCenterActivityTest { } @Test + // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag + @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED) fun moreIssuesCard_withThreeIssues_showsTopIssuesAndMoreIssuesCard() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig) safetyCenterTestHelper.setData( @@ -1148,6 +1225,8 @@ class SafetyCenterActivityTest { } @Test + // TODO: b/379849464 - Fix this for expressive design and stop disabling this flag + @RequiresFlagsDisabled(SettingsThemeFlags.FLAG_IS_EXPRESSIVE_DESIGN_ENABLED) fun moreIssuesCard_twoIssuesAlreadyShown_expandAdditionalIssueCards() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourcesConfig) safetyCenterTestHelper.setData( @@ -1173,7 +1252,7 @@ class SafetyCenterActivityTest { } @Test - fun collapsedEntryGroup_expandsWhenClicked() { + fun entryGroup_showsEntriesWhenClicked() { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourceGroupsConfig) with(safetyCenterTestHelper) { setConfig(safetyCenterTestConfigs.multipleSourceGroupsConfig) @@ -1245,6 +1324,7 @@ class SafetyCenterActivityTest { @Test fun expandedEntryGroup_collapsesWhenClicked() { + assumeFalse(SafetyCenterFlags.showSubpages) // No collapsible groups when using subpages with(safetyCenterTestHelper) { setConfig(safetyCenterTestConfigs.multipleSourceGroupsConfig) setData( @@ -1339,6 +1419,7 @@ class SafetyCenterActivityTest { @Test fun expandedEntryGroup_otherGroupRemainsCollapsed() { + assumeFalse(SafetyCenterFlags.showSubpages) // No collapsible groups when using subpages safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.multipleSourceGroupsConfig) with(safetyCenterTestHelper) { setConfig(safetyCenterTestConfigs.multipleSourceGroupsConfig) @@ -1444,6 +1525,13 @@ class SafetyCenterActivityTest { safetyCenterTestHelper.setConfig(safetyCenterTestConfigs.implicitIntentSingleSourceConfig) context.launchSafetyCenterActivity { + if (SafetyCenterFlags.showSubpages) { + clickOpenSubpage( + context, + safetyCenterTestConfigs.implicitIntentSingleSourceConfig.safetySourcesGroups + .first(), + ) + } waitDisplayed(By.text("OK")) { it.click() } waitDisplayed(By.text("is_from_settings_homepage false")) waitButtonDisplayed("Exit test activity") { it.click() } @@ -1477,9 +1565,10 @@ class SafetyCenterActivityTest { ) safetyCenterTestHelper.setEnabled(false) + val containsPrivacyPattern = Pattern.compile(".*[Pp]rivacy|[Pp]ermission.*") // NOTYPO context.launchSafetyCenterActivity(intentAction = PRIVACY_CONTROLS_ACTION) { waitDisplayed(By.pkg(context.getSettingsPackageName())) - waitPageTitleDisplayed("Privacy") + waitDisplayed(By.text(containsPrivacyPattern)) } } diff --git a/tests/functional/safetycenter/singleuser/AndroidTest.xml b/tests/functional/safetycenter/singleuser/AndroidTest.xml index af040eb6f..f778ca93e 100644 --- a/tests/functional/safetycenter/singleuser/AndroidTest.xml +++ b/tests/functional/safetycenter/singleuser/AndroidTest.xml @@ -47,8 +47,8 @@ <!-- Disable syncing to prevent overwriting flags during testing. --> <option name="run-command" value="device_config set_sync_disabled_for_tests persistent" /> <option name="teardown-command" value="device_config set_sync_disabled_for_tests none" /> - <!-- TODO(b/379928062): Ensure device not on lockscreen. Reassess when keyguard bug is - closed --> + <!-- Belt-and-braces attempt to dismiss keyguard. Tradefed should have already done this + for us, but this is a precaution in an attempt to mitigate b/379620557. --> <option name="run-command" value="input keyevent KEYCODE_WAKEUP" /> <option name="run-command" value="wm dismiss-keyguard" /> <!-- Dismiss any system dialogs (e.g. crashes, ANR). --> diff --git a/tests/functional/safetycenter/singleuser/src/android/safetycenter/functional/SafetyCenterManagerTest.kt b/tests/functional/safetycenter/singleuser/src/android/safetycenter/functional/SafetyCenterManagerTest.kt index 985f15572..f5d230deb 100644 --- a/tests/functional/safetycenter/singleuser/src/android/safetycenter/functional/SafetyCenterManagerTest.kt +++ b/tests/functional/safetycenter/singleuser/src/android/safetycenter/functional/SafetyCenterManagerTest.kt @@ -75,6 +75,7 @@ import com.android.safetycenter.internaldata.SafetyCenterIds import com.android.safetycenter.resources.SafetyCenterResourcesApk import com.android.safetycenter.testing.Coroutines.TIMEOUT_LONG import com.android.safetycenter.testing.Coroutines.TIMEOUT_SHORT +import com.android.safetycenter.testing.Coroutines.assertWithTimeout import com.android.safetycenter.testing.Coroutines.waitForWithTimeout import com.android.safetycenter.testing.SafetyCenterApisWithShellPermissions.dismissSafetyCenterIssueWithPermission import com.android.safetycenter.testing.SafetyCenterApisWithShellPermissions.getSafetyCenterConfigWithPermission @@ -104,6 +105,7 @@ import com.android.safetycenter.testing.SafetyCenterTestConfigs.Companion.MIXED_ import com.android.safetycenter.testing.SafetyCenterTestConfigs.Companion.MIXED_STATELESS_GROUP_ID import com.android.safetycenter.testing.SafetyCenterTestConfigs.Companion.MULTIPLE_SOURCES_GROUP_ID_1 import com.android.safetycenter.testing.SafetyCenterTestConfigs.Companion.MULTIPLE_SOURCES_GROUP_ID_2 +import com.android.safetycenter.testing.SafetyCenterTestConfigs.Companion.SINGLE_SOURCE_GROUP_ID import com.android.safetycenter.testing.SafetyCenterTestConfigs.Companion.SINGLE_SOURCE_ID import com.android.safetycenter.testing.SafetyCenterTestConfigs.Companion.SOURCE_ID_1 import com.android.safetycenter.testing.SafetyCenterTestConfigs.Companion.SOURCE_ID_2 @@ -309,14 +311,16 @@ class SafetyCenterManagerTest { private val safetyCenterEntryOrGroupRecommendation: SafetyCenterEntryOrGroup get() = - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID), ) private val safetyCenterEntryOrGroupCritical: SafetyCenterEntryOrGroup get() = - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryCritical(SINGLE_SOURCE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryCritical(SINGLE_SOURCE_ID), ) private val safetyCenterEntryGroupMixedFromComplexConfig: SafetyCenterEntryOrGroup @@ -425,8 +429,10 @@ class SafetyCenterManagerTest { safetyCenterStatusUnknownScanning, emptyList(), listOf( - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryDefault(SINGLE_SOURCE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryDefault(SINGLE_SOURCE_ID), + "No info yet", ) ), emptyList(), @@ -438,8 +444,10 @@ class SafetyCenterManagerTest { safetyCenterTestData.safetyCenterStatusUnknown, emptyList(), listOf( - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryDefault(SINGLE_SOURCE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryDefault(SINGLE_SOURCE_ID), + "No info yet", ) ), emptyList(), @@ -451,8 +459,9 @@ class SafetyCenterManagerTest { safetyCenterStatusOk, emptyList(), listOf( - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryUnspecified(SINGLE_SOURCE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryUnspecified(SINGLE_SOURCE_ID), ) ), emptyList(), @@ -464,8 +473,9 @@ class SafetyCenterManagerTest { safetyCenterStatusOk, emptyList(), listOf( - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryOk(SINGLE_SOURCE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryOk(SINGLE_SOURCE_ID), ) ), emptyList(), @@ -477,14 +487,15 @@ class SafetyCenterManagerTest { safetyCenterStatusOk, emptyList(), listOf( - SafetyCenterEntryOrGroup( + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, safetyCenterTestData .safetyCenterEntryOkBuilder(SINGLE_SOURCE_ID) .setIconAction( ICON_ACTION_TYPE_INFO, safetySourceTestData.createTestActivityRedirectPendingIntent(), ) - .build() + .build(), ) ), emptyList(), @@ -496,8 +507,10 @@ class SafetyCenterManagerTest { safetyCenterStatusUnknownScanning, emptyList(), listOf( - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryError(SINGLE_SOURCE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryError(SINGLE_SOURCE_ID), + "Couldn’t check setting", ) ), emptyList(), @@ -509,8 +522,10 @@ class SafetyCenterManagerTest { safetyCenterTestData.safetyCenterStatusUnknown, emptyList(), listOf( - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryError(SINGLE_SOURCE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryError(SINGLE_SOURCE_ID), + "Couldn’t check setting", ) ), emptyList(), @@ -522,13 +537,33 @@ class SafetyCenterManagerTest { safetyCenterStatusOkOneAlert, listOf(safetyCenterTestData.safetyCenterIssueInformation(SINGLE_SOURCE_ID)), listOf( - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryOk(SINGLE_SOURCE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryOk(SINGLE_SOURCE_ID), + "Ok summary", // When an issue is present, entry summary is used ) ), emptyList(), ) + private val safetyCenterDataOkOneDismissedAlert: SafetyCenterData + get() = + SafetyCenterData( + safetyCenterStatusOk, + emptyList(), + listOf( + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryOk(SINGLE_SOURCE_ID), + "Ok summary", // When an issue is present, entry summary is used + ) + ), + emptyList(), + ) + .withDismissedIssuesIfAtLeastU( + listOf(safetyCenterTestData.safetyCenterIssueInformation(SINGLE_SOURCE_ID)) + ) + private val safetyCenterDataOkReviewCriticalEntry: SafetyCenterData get() = SafetyCenterData( @@ -562,8 +597,9 @@ class SafetyCenterManagerTest { safetyCenterStatusGeneralRecommendationOneAlert, listOf(safetyCenterTestData.safetyCenterIssueRecommendation(SINGLE_SOURCE_ID)), listOf( - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID), ) ), emptyList(), @@ -580,8 +616,9 @@ class SafetyCenterManagerTest { ) ), listOf( - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID), ) ), emptyList(), @@ -593,8 +630,9 @@ class SafetyCenterManagerTest { safetyCenterStatusAccountRecommendationOneAlert, listOf(safetyCenterTestData.safetyCenterIssueRecommendation(SINGLE_SOURCE_ID)), listOf( - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID), ) ), emptyList(), @@ -606,8 +644,9 @@ class SafetyCenterManagerTest { safetyCenterStatusDeviceRecommendationOneAlert, listOf(safetyCenterTestData.safetyCenterIssueRecommendation(SINGLE_SOURCE_ID)), listOf( - SafetyCenterEntryOrGroup( - safetyCenterTestData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID) + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, + safetyCenterTestData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID), ) ), emptyList(), @@ -1024,6 +1063,12 @@ class SafetyCenterManagerTest { ) val defaultEntryPendingIntent = apiSafetyCenterData.entriesOrGroups.firstOrNull()?.entry?.pendingIntent + ?: apiSafetyCenterData.entriesOrGroups + .firstOrNull() + ?.entryGroup + ?.entries + ?.firstOrNull() + ?.pendingIntent val defaultEntryIntentFilterEqualsToExplicitIntent = callWithShellPermissionIdentity("android.permission.GET_INTENT_SENDER_INTENT") { expectedExplicitPendingIntent.intentFilterEquals(defaultEntryPendingIntent) @@ -1044,6 +1089,12 @@ class SafetyCenterManagerTest { ) val defaultEntryPendingIntent = apiSafetyCenterData.entriesOrGroups.firstOrNull()?.entry?.pendingIntent + ?: apiSafetyCenterData.entriesOrGroups + .firstOrNull() + ?.entryGroup + ?.entries + ?.firstOrNull() + ?.pendingIntent val defaultEntryIntentFilterEqualsToImplicitIntent = callWithShellPermissionIdentity("android.permission.GET_INTENT_SENDER_INTENT") { expectedImplicitPendingIntent.intentFilterEquals(defaultEntryPendingIntent) @@ -2306,18 +2357,14 @@ class SafetyCenterManagerTest { groupId = MULTIPLE_SOURCES_GROUP_ID_2, ) ) - waitForWithTimeout(timeout = RESURFACE_TIMEOUT, checkPeriod = RESURFACE_CHECK) { - val hasResurfaced = - safetyCenterManager - .getSafetyCenterDataWithPermission() - .issues - .contains( - safetyCenterTestData.safetyCenterIssueCritical( - SOURCE_ID_5, - groupId = MULTIPLE_SOURCES_GROUP_ID_2, - ) + assertWithTimeout(timeout = RESURFACE_TIMEOUT, checkPeriod = RESURFACE_CHECK) { + assertThat(safetyCenterManager.getSafetyCenterDataWithPermission().issues) + .contains( + safetyCenterTestData.safetyCenterIssueCritical( + SOURCE_ID_5, + groupId = MULTIPLE_SOURCES_GROUP_ID_2, ) - hasResurfaced + ) } } @@ -3115,12 +3162,14 @@ class SafetyCenterManagerTest { safetyCenterTestData.safetyCenterStatusUnknown, emptyList(), listOf( - SafetyCenterEntryOrGroup( + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, safetyCenterTestData .safetyCenterEntryDefaultBuilder(SINGLE_SOURCE_ID) .setPendingIntent(null) .setEnabled(false) - .build() + .build(), + "No info yet", ) ), emptyList(), @@ -3143,13 +3192,14 @@ class SafetyCenterManagerTest { safetyCenterStatusOk, emptyList(), listOf( - SafetyCenterEntryOrGroup( + safetyCenterTestData.singletonSafetyCenterEntryOrGroup( + SINGLE_SOURCE_GROUP_ID, safetyCenterTestData .safetyCenterEntryOkBuilder(SINGLE_SOURCE_ID) .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNSPECIFIED) .setPendingIntent(null) .setEnabled(false) - .build() + .build(), ) ), emptyList(), @@ -3446,15 +3496,11 @@ class SafetyCenterManagerTest { SafetyCenterTestData.issueId(SINGLE_SOURCE_ID, INFORMATION_ISSUE_ID) ) - val expectedSafetyCenterData = - safetyCenterDataOk.withDismissedIssuesIfAtLeastU( - listOf(safetyCenterTestData.safetyCenterIssueInformation(SINGLE_SOURCE_ID)) - ) assertFailsWith(TimeoutCancellationException::class) { waitForWithTimeout(timeout = TIMEOUT_SHORT) { val hasResurfaced = safetyCenterManager.getSafetyCenterDataWithPermission() != - expectedSafetyCenterData + safetyCenterDataOkOneDismissedAlert hasResurfaced } } @@ -3483,15 +3529,11 @@ class SafetyCenterManagerTest { SafetyCenterTestData.issueId(SINGLE_SOURCE_ID, INFORMATION_ISSUE_ID) ) - val expectedSafetyCenterData = - safetyCenterDataOk.withDismissedIssuesIfAtLeastU( - listOf(safetyCenterTestData.safetyCenterIssueInformation(SINGLE_SOURCE_ID)) - ) assertFailsWith(TimeoutCancellationException::class) { waitForWithTimeout(timeout = TIMEOUT_SHORT) { val hasResurfaced = safetyCenterManager.getSafetyCenterDataWithPermission() != - expectedSafetyCenterData + safetyCenterDataOkOneDismissedAlert hasResurfaced } } @@ -3941,9 +3983,9 @@ class SafetyCenterManagerTest { companion object { private val RESURFACE_DELAY = Duration.ofMillis(500) - // Wait 3 times the RESURFACE_DELAY before asserting whether an issue has or has not + // Wait 5 times the RESURFACE_DELAY before asserting whether an issue has or has not // resurfaced. Use a constant additive error buffer if we increase the delay considerably. - private val RESURFACE_TIMEOUT = RESURFACE_DELAY.multipliedBy(3) + private val RESURFACE_TIMEOUT = RESURFACE_DELAY.multipliedBy(5) // Check more than once during a RESURFACE_DELAY before asserting whether an issue has or // has not resurfaced. Use a different check logic (focused at the expected resurface time) diff --git a/tests/functional/safetycenter/singleuser/src/android/safetycenter/functional/ui/SafetyCenterQsActivityTest.kt b/tests/functional/safetycenter/singleuser/src/android/safetycenter/functional/ui/SafetyCenterQsActivityTest.kt index 73d6a0737..1d971194e 100644 --- a/tests/functional/safetycenter/singleuser/src/android/safetycenter/functional/ui/SafetyCenterQsActivityTest.kt +++ b/tests/functional/safetycenter/singleuser/src/android/safetycenter/functional/ui/SafetyCenterQsActivityTest.kt @@ -46,12 +46,12 @@ class SafetyCenterQsActivityTest { private val safetyCenterTestHelper = SafetyCenterTestHelper(context) private val safetyCenterTestConfigs = SafetyCenterTestConfigs(context) + @get:Rule(order = 0) val freezeRotationRule = FreezeRotationRule() @get:Rule(order = 1) val supportsSafetyCenterRule = SupportsSafetyCenterRule(context) @get:Rule(order = 2) val enableCameraRule = EnableSensorRule(context, CAMERA) @get:Rule(order = 3) val enableMicrophoneRule = EnableSensorRule(context, MICROPHONE) @get:Rule(order = 4) val safetyCenterTestRule = SafetyCenterTestRule(safetyCenterTestHelper) @get:Rule(order = 5) val disableAnimationRule = DisableAnimationRule() - @get:Rule(order = 6) val freezeRotationRule = FreezeRotationRule() @Before fun setTestConfigBeforeTest() { diff --git a/tests/functional/safetycenter/subpages/AndroidTest.xml b/tests/functional/safetycenter/subpages/AndroidTest.xml index c3245e9d7..ac493841f 100644 --- a/tests/functional/safetycenter/subpages/AndroidTest.xml +++ b/tests/functional/safetycenter/subpages/AndroidTest.xml @@ -47,6 +47,10 @@ <!-- Disable syncing to prevent overwriting flags during testing. --> <option name="run-command" value="device_config set_sync_disabled_for_tests persistent" /> <option name="teardown-command" value="device_config set_sync_disabled_for_tests none" /> + <!-- Belt-and-braces attempt to dismiss keyguard. Tradefed should have already done this + for us, but this is a precaution in an attempt to mitigate b/379620557. --> + <option name="run-command" value="input keyevent KEYCODE_WAKEUP" /> + <option name="run-command" value="wm dismiss-keyguard" /> <!-- Dismiss any system dialogs (e.g. crashes, ANR). --> <option name="run-command" value="am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS --receiver-foreground" /> </target_preparer> diff --git a/tests/hostside/safetycenter/AndroidTest.xml b/tests/hostside/safetycenter/AndroidTest.xml index a28b70c3c..41f0bcc40 100644 --- a/tests/hostside/safetycenter/AndroidTest.xml +++ b/tests/hostside/safetycenter/AndroidTest.xml @@ -32,6 +32,10 @@ <!-- Disable syncing to prevent overwriting flags during testing. --> <option name="run-command" value="device_config set_sync_disabled_for_tests persistent" /> <option name="teardown-command" value="device_config set_sync_disabled_for_tests none" /> + <!-- Belt-and-braces attempt to dismiss keyguard. Tradefed should have already done this + for us, but this is a precaution in an attempt to mitigate b/379620557. --> + <option name="run-command" value="input keyevent KEYCODE_WAKEUP" /> + <option name="run-command" value="wm dismiss-keyguard" /> <!-- Dismiss any system dialogs (e.g. crashes, ANR). --> <option name="run-command" value="am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS --receiver-foreground" /> </target_preparer> diff --git a/tests/hostside/safetycenter/helper-app/src/android/safetycenter/hostside/device/SafetyCenterNotificationLoggingHelperTests.kt b/tests/hostside/safetycenter/helper-app/src/android/safetycenter/hostside/device/SafetyCenterNotificationLoggingHelperTests.kt index 60e6e41ec..c56c913b6 100644 --- a/tests/hostside/safetycenter/helper-app/src/android/safetycenter/hostside/device/SafetyCenterNotificationLoggingHelperTests.kt +++ b/tests/hostside/safetycenter/helper-app/src/android/safetycenter/hostside/device/SafetyCenterNotificationLoggingHelperTests.kt @@ -69,6 +69,12 @@ class SafetyCenterNotificationLoggingHelperTests { @Test fun sendNotification() { safetyCenterTestHelper.setData(SINGLE_SOURCE_ID, newTestDataWithNotifiableIssue()) + TestNotificationListener.waitForSingleNotificationMatching( + NotificationCharacteristics( + actions = listOf("See issue"), + safetySourceId = SINGLE_SOURCE_ID, + ) + ) } @Test @@ -104,7 +110,7 @@ class SafetyCenterNotificationLoggingHelperTests { statusBarNotificationWithChannel.statusBarNotification.notification.contentIntent SafetyCenterActivityLauncher.executeBlockAndExit( launchActivity = { PendingIntentSender.send(contentIntent) }, - block = {} // No action required + block = {}, // No action required ) } } diff --git a/tests/utils/safetycenter/Android.bp b/tests/utils/safetycenter/Android.bp index fab8c8dde..11fd3951d 100644 --- a/tests/utils/safetycenter/Android.bp +++ b/tests/utils/safetycenter/Android.bp @@ -36,6 +36,7 @@ android_library { "kotlinx-coroutines-android", "safety-center-internal-data", "safety-center-resources-lib", + "SettingsLibSettingsTheme", // TODO(b/326414126): aconfig: support multi-container library "com.android.permission.flags-aconfig-java", ], diff --git a/tests/utils/safetycenter/AndroidManifest.xml b/tests/utils/safetycenter/AndroidManifest.xml index f0a4fcbb6..ce3724318 100644 --- a/tests/utils/safetycenter/AndroidManifest.xml +++ b/tests/utils/safetycenter/AndroidManifest.xml @@ -39,7 +39,6 @@ android:exported="false"/> <activity android:name=".TestActivity" - android:theme="@style/OptOutEdgeToEdgeEnforcement" android:exported="false"> <intent-filter android:priority="-1"> <action android:name="com.android.safetycenter.testing.action.TEST_ACTIVITY"/> diff --git a/tests/utils/safetycenter/java/com/android/safetycenter/testing/Coroutines.kt b/tests/utils/safetycenter/java/com/android/safetycenter/testing/Coroutines.kt index cc8c53d5e..47f5165e2 100644 --- a/tests/utils/safetycenter/java/com/android/safetycenter/testing/Coroutines.kt +++ b/tests/utils/safetycenter/java/com/android/safetycenter/testing/Coroutines.kt @@ -22,6 +22,7 @@ import java.time.Duration import kotlinx.coroutines.DEBUG_PROPERTY_NAME import kotlinx.coroutines.DEBUG_PROPERTY_VALUE_AUTO import kotlinx.coroutines.DEBUG_PROPERTY_VALUE_ON +import kotlinx.coroutines.TimeoutCancellationException import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withTimeout @@ -68,6 +69,20 @@ object Coroutines { runBlockingWithTimeout(timeout) { waitFor(checkPeriod, condition) } } + /** Check an assertion passes, with a timeout if it does not. */ + fun assertWithTimeout( + timeout: Duration = TIMEOUT_LONG, + checkPeriod: Duration = CHECK_PERIOD, + assertion: () -> Unit, + ) { + try { + runBlockingWithTimeout(timeout) { assertThatWaiting(checkPeriod, assertion) } + } catch (ex: TimeoutCancellationException) { + // Rerun the assertion to generate a meaningful error message that isn't just "timeout" + assertion() + } + } + /** Retries a [fallibleAction] until no errors are thrown or a timeout occurs. */ fun waitForSuccessWithTimeout( timeout: Duration = TIMEOUT_LONG, @@ -105,6 +120,21 @@ object Coroutines { } } + /** Check an assertion passes using coroutines. */ + private suspend fun assertThatWaiting( + checkPeriod: Duration = CHECK_PERIOD, + assertion: () -> Unit, + ) { + while (true) { + try { + assertion() + break + } catch (ex: AssertionError) { + delay(checkPeriod.toMillis()) + } + } + } + private const val TAG: String = "Coroutines" /** A medium period, to be used for conditions that are expected to change. */ diff --git a/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterFlags.kt b/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterFlags.kt index 26a66a1a3..4b4abf360 100644 --- a/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterFlags.kt +++ b/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterFlags.kt @@ -21,6 +21,7 @@ import android.Manifest.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG import android.Manifest.permission.WRITE_DEVICE_CONFIG import android.annotation.TargetApi import android.app.job.JobInfo +import android.content.Context import android.content.pm.PackageManager import android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE import android.provider.DeviceConfig @@ -34,16 +35,21 @@ import android.safetycenter.SafetyCenterManager.REFRESH_REASON_PERIODIC import android.safetycenter.SafetyCenterManager.REFRESH_REASON_RESCAN_BUTTON_CLICK import android.safetycenter.SafetyCenterManager.REFRESH_REASON_SAFETY_CENTER_ENABLED import android.safetycenter.SafetySourceData +import android.util.Log import com.android.modules.utils.build.SdkLevel import com.android.safetycenter.testing.Coroutines.TEST_TIMEOUT import com.android.safetycenter.testing.Coroutines.TIMEOUT_LONG import com.android.safetycenter.testing.ShellPermissions.callWithShellPermissionIdentity +import com.android.settingslib.widget.SettingsThemeHelper import java.time.Duration import kotlin.reflect.KProperty /** A class that facilitates working with Safety Center flags. */ object SafetyCenterFlags { + /** This is a hidden API constant within [DeviceConfig]. */ + private const val NAMESPACE_SETTINGS_UI = "settings_ui" + /** Flag that determines whether Safety Center is enabled. */ private val isEnabledFlag = Flag("safety_center_is_enabled", defaultValue = SdkLevel.isAtLeastU(), BooleanParser()) @@ -143,8 +149,7 @@ object SafetyCenterFlags { ) /** - * Flag that determines the time for which Safety Center will wait before starting dismissal of - * resolved issue UI + * Flag that determines how long Safety Center will wait before hiding the resolved issue UI. */ private val hideResolveUiTransitionDelayFlag = Flag( @@ -154,6 +159,20 @@ object SafetyCenterFlags { ) /** + * Flag that determines how long an expressive BannerMessagePreference will wait before hiding + * the resolved UI. + */ + private val bannerMessagePrefHideResolvedContentTransitionDelayFlag = + Flag( + "banner_message_pref_hide_resolved_content_delay_millis", + defaultValue = Duration.ofMillis(400), + DurationParser(), + namespace = NAMESPACE_SETTINGS_UI, + // This flag is only writeable on BP2A builds built after 3 March 2025 + writeMustSucceed = false, + ) + + /** * Flag containing a comma delimited lists of source IDs that we won't track when deciding if a * broadcast is completed. We still send broadcasts to (and handle API calls from) these sources * as normal. @@ -254,7 +273,7 @@ object SafetyCenterFlags { * expand-and-collapse list. */ private val showSubpagesFlag = - Flag("safety_center_show_subpages", defaultValue = false, BooleanParser()) + Flag("safety_center_show_subpages", defaultValue = SdkLevel.isAtLeastU(), BooleanParser()) private val overrideRefreshOnPageOpenSourcesFlag = Flag( @@ -312,6 +331,7 @@ object SafetyCenterFlags { resolveActionTimeoutFlag, tempHiddenIssueResurfaceDelayFlag, hideResolveUiTransitionDelayFlag, + bannerMessagePrefHideResolvedContentTransitionDelayFlag, untrackedSourcesFlag, resurfaceIssueMaxCountsFlag, resurfaceIssueDelaysFlag, @@ -327,6 +347,16 @@ object SafetyCenterFlags { periodicBackgroundRefreshIntervalFlag, ) + /** All the Safety Center flags that should be written to during setup and reset. */ + private val SETUP_FLAGS = + FLAGS.filter { it.name != isEnabledFlag.name } + .filter { + // This flag is only writeable on BP2A builds built after 3 March 2025 + // Don't set it up on versions we know will trigger a write error. + it.name != bannerMessagePrefHideResolvedContentTransitionDelayFlag.name || + SdkLevel.isAtLeastB() + } + /** A property that allows getting and setting the [isEnabledFlag]. */ var isEnabled: Boolean by isEnabledFlag @@ -357,9 +387,28 @@ object SafetyCenterFlags { /** A property that allows getting and setting the [tempHiddenIssueResurfaceDelayFlag]. */ var tempHiddenIssueResurfaceDelay: Duration by tempHiddenIssueResurfaceDelayFlag + // TODO: b/379849464 - replace remaining usages and make this private /** A property that allows getting and setting the [hideResolveUiTransitionDelayFlag]. */ var hideResolvedIssueUiTransitionDelay: Duration by hideResolveUiTransitionDelayFlag + /** + * A property that allows getting and setting the + * [bannerMessagePrefHideResolvedContentTransitionDelayFlag] + */ + private var bannerMessagePrefHideResolvedContentTransitionDelay: Duration by + bannerMessagePrefHideResolvedContentTransitionDelayFlag + + /** + * Sets the proper hide_resolved_issue_ui_transition_delay flag based on expressive design + * state. + */ + fun setHideResolvedIssueUiTransitionDelay(context: Context, value: Duration) = + if (SettingsThemeHelper.isExpressiveTheme(context)) { + bannerMessagePrefHideResolvedContentTransitionDelay = value + } else { + hideResolvedIssueUiTransitionDelay = value + } + /** A property that allows getting and setting the [untrackedSourcesFlag]. */ var untrackedSources: Set<String> by untrackedSourcesFlag @@ -396,14 +445,23 @@ object SafetyCenterFlags { * This snapshot is only taken once and cached afterwards. [setup] must be called at least once * prior to modifying any flag for the snapshot to be taken with the right values. */ - @Volatile lateinit var snapshot: Properties + @Volatile lateinit var snapshot: Map<String, Properties> - private val lazySnapshot: Properties by lazy { + private val lazySnapshot: Map<String, Properties> by lazy { callWithShellPermissionIdentity(READ_DEVICE_CONFIG) { - DeviceConfig.getProperties(NAMESPACE_PRIVACY, *FLAGS.map { it.name }.toTypedArray()) + mapOf( + NAMESPACE_PRIVACY to fetchPropertiesForNamespace(NAMESPACE_PRIVACY), + NAMESPACE_SETTINGS_UI to fetchPropertiesForNamespace(NAMESPACE_SETTINGS_UI), + ) } } + private fun fetchPropertiesForNamespace(namespace: String) = + DeviceConfig.getProperties( + namespace, + *FLAGS.filter { it.namespace == namespace }.map { it.name }.toTypedArray(), + ) + /** * Takes a snapshot of all Safety Center flags and sets them up to their default values. * @@ -413,8 +471,7 @@ object SafetyCenterFlags { */ fun setup() { snapshot = lazySnapshot - FLAGS.filter { it.name != isEnabledFlag.name } - .forEach { writeDeviceConfigProperty(it.name, it.defaultStringValue) } + SETUP_FLAGS.forEach { it.writeToDeviceConfig(it.defaultStringValue) } } /** @@ -428,12 +485,11 @@ object SafetyCenterFlags { // Write flags one by one instead of using `DeviceConfig#setProperties` as the latter does // not work when DeviceConfig sync is disabled and does not take uninitialized values into // account. - FLAGS.filter { it.name != isEnabledFlag.name } - .forEach { - val key = it.name - val value = snapshot.getString(key, /* defaultValue */ null) - writeDeviceConfigProperty(key, value) - } + SETUP_FLAGS.forEach { + val key = it.name + val value = snapshot[it.namespace]?.getString(key, /* defaultValue */ null) + it.writeToDeviceConfig(value) + } } /** Sets the [refreshTimeouts] for all refresh reasons to the given [refreshTimeout]. */ @@ -442,8 +498,8 @@ object SafetyCenterFlags { } /** Returns the [isEnabledFlag] value of the Safety Center flags snapshot. */ - fun Properties.isSafetyCenterEnabled() = - getBoolean(isEnabledFlag.name, isEnabledFlag.defaultValue) + fun Map<String, Properties>.isSafetyCenterEnabled(): Boolean = + this[NAMESPACE_PRIVACY]!!.getBoolean(isEnabledFlag.name, isEnabledFlag.defaultValue) @TargetApi(UPSIDE_DOWN_CAKE) private fun getAllRefreshTimeoutsMap(refreshTimeout: Duration): Map<Int, Duration> = @@ -516,32 +572,48 @@ object SafetyCenterFlags { .joinToString(entriesDelimiter) } - private class Flag<T>(val name: String, val defaultValue: T, private val parser: Parser<T>) { + private class Flag<T>( + val name: String, + val defaultValue: T, + private val parser: Parser<T>, + val namespace: String = NAMESPACE_PRIVACY, + val writeMustSucceed: Boolean = true, + ) { val defaultStringValue = parser.toString(defaultValue) operator fun getValue(thisRef: Any?, property: KProperty<*>): T = - readDeviceConfigProperty(name)?.let(parser::parseFromString) ?: defaultValue + readFromDeviceConfig(name)?.let(parser::parseFromString) ?: defaultValue - operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T) { - writeDeviceConfigProperty(name, parser.toString(value)) - } - } + private fun readFromDeviceConfig(name: String): String? = + callWithShellPermissionIdentity(READ_DEVICE_CONFIG) { + DeviceConfig.getProperty(namespace, name) + } - private fun readDeviceConfigProperty(name: String): String? = - callWithShellPermissionIdentity(READ_DEVICE_CONFIG) { - DeviceConfig.getProperty(NAMESPACE_PRIVACY, name) + operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T) { + writeToDeviceConfig(parser.toString(value)) } - private fun writeDeviceConfigProperty(name: String, stringValue: String?) { - callWithShellPermissionIdentity(WRITE_DEVICE_CONFIG, WRITE_ALLOWLISTED_DEVICE_CONFIG) { - val valueWasSet = - DeviceConfig.setProperty( - NAMESPACE_PRIVACY, - name, - stringValue, /* makeDefault */ - false, - ) - require(valueWasSet) { "Could not set $name to: $stringValue" } + fun writeToDeviceConfig(stringValue: String?) { + callWithShellPermissionIdentity(WRITE_DEVICE_CONFIG, WRITE_ALLOWLISTED_DEVICE_CONFIG) { + val valueWasSet = + try { + DeviceConfig.setProperty( + namespace, + name, + stringValue, + /* makeDefault */ false, + ) + } catch (e: Exception) { + Log.w(TAG, "Error while setting $name to: $stringValue", e) + false + } + + if (writeMustSucceed) { + require(valueWasSet) { "Could not set $name to: $stringValue" } + } + } } } + + private const val TAG = "SafetyCenterFlags" } diff --git a/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterTestData.kt b/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterTestData.kt index 631aae65f..15f8d02ae 100644 --- a/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterTestData.kt +++ b/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterTestData.kt @@ -32,6 +32,8 @@ import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNKNOWN import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNSPECIFIED import android.safetycenter.SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON import android.safetycenter.SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION +import android.safetycenter.SafetyCenterEntryGroup +import android.safetycenter.SafetyCenterEntryOrGroup import android.safetycenter.SafetyCenterIssue import android.safetycenter.SafetyCenterIssue.ISSUE_SEVERITY_LEVEL_CRITICAL_WARNING import android.safetycenter.SafetyCenterIssue.ISSUE_SEVERITY_LEVEL_OK @@ -279,6 +281,32 @@ class SafetyCenterTestData(context: Context) { .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION) .build() + fun singletonSafetyCenterEntryOrGroup( + groupId: String, + entry: SafetyCenterEntry, + groupSummary: String? = null, + ) = + // TODO: b/361404288 - Replace with platform version check + if (SafetyCenterFlags.showSubpages) { + val summary = + if (groupSummary == null && entry.severityLevel > ENTRY_SEVERITY_LEVEL_OK) { + entry.summary + } else groupSummary ?: "OK" + + SafetyCenterEntryOrGroup( + SafetyCenterEntryGroup.Builder(groupId, "OK") + .setSeverityLevel(entry.severityLevel) + .setSeverityUnspecifiedIconType( + SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION + ) + .setSummary(summary) + .setEntries(listOf(entry)) + .build() + ) + } else { + SafetyCenterEntryOrGroup(entry) + } + /** * Returns an information [SafetyCenterIssue] for the given source and user id that is * consistent with information [SafetySourceIssue]s used in [SafetySourceTestData]. diff --git a/tests/utils/safetycenter/java/com/android/safetycenter/testing/UiTestHelper.kt b/tests/utils/safetycenter/java/com/android/safetycenter/testing/UiTestHelper.kt index c7d195528..3dfefeecf 100644 --- a/tests/utils/safetycenter/java/com/android/safetycenter/testing/UiTestHelper.kt +++ b/tests/utils/safetycenter/java/com/android/safetycenter/testing/UiTestHelper.kt @@ -197,6 +197,7 @@ object UiTestHelper { /** Opens the subpage by clicking on the group title. */ fun clickOpenSubpage(context: Context, group: SafetySourcesGroup) { waitDisplayed(By.text(context.getString(group.titleResId))) { it.click() } + getUiDevice().waitForIdle() } /** Clicks the more issues card button to show or hide additional issues. */ diff --git a/tests/utils/safetycenter/res/layout/test_activity.xml b/tests/utils/safetycenter/res/layout/test_activity.xml index edbe3641a..b0b7523c8 100644 --- a/tests/utils/safetycenter/res/layout/test_activity.xml +++ b/tests/utils/safetycenter/res/layout/test_activity.xml @@ -19,6 +19,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" + android:fitsSystemWindows="true" android:orientation="vertical" > <Button android:id="@+id/button" android:layout_width="wrap_content" |