diff options
| author | Dan Pasanen <invisiblek@cyanogenmod.org> | 2016-12-05 20:36:34 -0600 |
|---|---|---|
| committer | Dan Pasanen <invisiblek@cyanogenmod.org> | 2016-12-05 20:36:34 -0600 |
| commit | e1bff64956c27d39fd61871ec94e00a83e1e05cd (patch) | |
| tree | 6d047fc5e0032e8a13dab5d60cfe481bd332d278 | |
| parent | 3661fe46560155fbc6ea7abb6904b6ce31385470 (diff) | |
| parent | b26b9425d700359d6ee68d45ac334fd1f2ab82d4 (diff) | |
| download | android_packages_apps_PackageInstaller-e1bff64956c27d39fd61871ec94e00a83e1e05cd.tar.gz android_packages_apps_PackageInstaller-e1bff64956c27d39fd61871ec94e00a83e1e05cd.tar.bz2 android_packages_apps_PackageInstaller-e1bff64956c27d39fd61871ec94e00a83e1e05cd.zip | |
Merge tag 'android-7.1.1_r4' into cm-14.1
Android 7.1.1 release 4
# gpg: Signature made Thu Dec 1 13:07:05 2016 CST
# gpg: using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
38 files changed, 122 insertions, 59 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 338c16a4..d09fbb04 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -23,9 +23,6 @@ <uses-permission android:name="com.google.android.permission.INSTALL_WEARABLE_PACKAGES" /> - <!-- Needed for passing extras with intent ACTION_SHOW_ADMIN_SUPPORT_DETAILS --> - <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" /> - <application android:label="@string/app_name" android:allowBackup="false" android:theme="@style/Theme.DialogWhenLarge" diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml index abb219a5..8ed9c5d6 100644 --- a/res/layout/grant_permissions.xml +++ b/res/layout/grant_permissions.xml @@ -25,6 +25,9 @@ android:paddingBottom="32dp" android:clipToPadding="false"> + <ScrollView android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <LinearLayout android:id="@+id/dialog_container" android:layout_width="wrap_content" @@ -116,4 +119,6 @@ </LinearLayout> + </ScrollView> + </com.android.packageinstaller.permission.ui.ManualLayoutFrame> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index e3bca1ff..8cb9dac4 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"ከልክል"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"ለማንኛውም ከልክል"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> ከ<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g> እንዲያደርግ ይፈቀድለት?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g> እንዲከናወን ይፈቀድለት?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"ፍቀድ"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"መተግበሪያዎች"</string> <string name="app_permissions" msgid="3146758905824597178">"የመተግበሪያ ፈቃዶች"</string> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index b4617d1c..20cc1872 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Отказване"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Отказване въпреки това"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> от <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Да се разреши ли на <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> следното действие: <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Разрешаване на <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> да <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Разрешаване"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Приложения"</string> <string name="app_permissions" msgid="3146758905824597178">"Разрешения за приложения"</string> diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index 47692973..f068b08e 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"প্রত্যাখ্যান করুন"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"যাইহোক অস্বীকার করুন"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g> এর <xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>কে <xliff:g id="ACTION">%2$s</xliff:g> এ অনুমতি দেবেন?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>কে <xliff:g id="ACTION">%2$s</xliff:g> এর অনুমতি দেবেন?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"অনুমতি দিন"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"অ্যাপ্লিকেশানগুলি"</string> <string name="app_permissions" msgid="3146758905824597178">"অ্যাপ্লিকেশানের অনুমতি"</string> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 14e7ab37..894f1c7a 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Rechazar"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Denegar de todos modos"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> de <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"¿Permitir que <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> realice la siguiente acción: <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"¿Permitir que la <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> realice la siguiente acción: <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Permitir"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplicaciones"</string> <string name="app_permissions" msgid="3146758905824597178">"Permisos de aplicaciones"</string> diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 84609795..9bb98602 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Keela"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Keela ikkagi"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>/<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>-st"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Kas lubada rakendusele <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> toiming <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Kas lubada rakendusel <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Luba"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Rakendused"</string> <string name="app_permissions" msgid="3146758905824597178">"Rakenduse load"</string> diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml index e6bb23b5..f4a14e7d 100644 --- a/res/values-eu-rES/strings.xml +++ b/res/values-eu-rES/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Ukatu"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Ukatu hala ere"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>/<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioak <xliff:g id="ACTION">%2$s</xliff:g> ahal izatea baimendu nahi duzu?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> aplikazioari <xliff:g id="ACTION">%2$s</xliff:g> baimena eman nahi diozu?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Baimendu"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplikazioak"</string> <string name="app_permissions" msgid="3146758905824597178">"Aplikaziorako baimenak"</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index b6832f69..023f1161 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -98,7 +98,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> مورد دیگر</item> </plurals> <string name="old_sdk_deny_warning" msgid="3872277112584842615">"این برنامه برای یک نسخه قدیمیتر از Android طراحی شده بود. نپذیرفتن اجازه ممکن است باعث شود که برنامه دیگر به صورتی که مورد نظر است کار نکند."</string> - <string name="default_permission_description" msgid="4992892207044156668">"انجام یک اقدام ناشناخته"</string> + <string name="default_permission_description" msgid="4992892207044156668">"انجام یک اقدام ناشناس"</string> <string name="app_permissions_group_summary" msgid="4787239772223699263">"<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="6773743421743728921">"نمایش سیستم"</string> <string name="menu_hide_system" msgid="7595471742649432977">"پنهان کردن سیستم"</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 2ab0e829..c1fff93f 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Estä"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Kiellä silti"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>/<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Sallitaanko toiminto <xliff:g id="ACTION">%2$s</xliff:g> sovellukselle <b><xliff:g id="APP_NAME">%1$s</xliff:g></b>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Saako <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Salli"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Sovellukset"</string> <string name="app_permissions" msgid="3146758905824597178">"Sovelluksen käyttöoikeudet"</string> diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml index dbc8d4a6..478d688d 100644 --- a/res/values-gl-rES/strings.xml +++ b/res/values-gl-rES/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Denegar"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Denegar igualmente"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> de <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Queres permitir que <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Queres permitir á aplicación <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Permitir"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplicacións"</string> <string name="app_permissions" msgid="3146758905824597178">"Permisos de aplicacións"</string> diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml index 4dcef19c..d5ac0341 100644 --- a/res/values-gu-rIN/strings.xml +++ b/res/values-gu-rIN/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"નકારો"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"કોઇપણ રીતે નકારો"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g> માંથી <xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ને <xliff:g id="ACTION">%2$s</xliff:g> માટેની મંજૂરી આપીએ?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ને <xliff:g id="ACTION">%2$s</xliff:g> મંજૂરી આપીએ?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"મંજૂરી આપો"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"ઍપ્લિકેશનો"</string> <string name="app_permissions" msgid="3146758905824597178">"ઍપ્લિકેશન પરવાનગીઓ"</string> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 33ac99e0..b7d5c2a2 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Մերժել"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Մերժել ամեն դեպքում"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>-ը <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>-ից"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Թույլ տա՞լ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> հավելվածին կատարել հետևյալ գործողությունը՝ <xliff:g id="ACTION">%2$s</xliff:g>:"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Թո՞ւյլ տալ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> հավելվածին <xliff:g id="ACTION">%2$s</xliff:g>:"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Թույլատրել"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Հավելվածներ"</string> <string name="app_permissions" msgid="3146758905824597178">"Հավելվածների թույլտվությունները"</string> @@ -112,7 +112,7 @@ <string name="all_permissions" msgid="5156669007784613042">"Բոլոր թույլտվությունները"</string> <string name="other_permissions" msgid="2016192512386091933">"Այլ հավելվածների հնարավորությունները"</string> <string name="permission_request_title" msgid="1204446718549121199">"Թույլտվության հարցում"</string> - <string name="screen_overlay_title" msgid="3021729846864038529">"Հայտնաբերվել է էկրանի վերադրում"</string> + <string name="screen_overlay_title" msgid="3021729846864038529">"Ցուցադրում այլ պատուհանների վրա"</string> <string name="screen_overlay_message" msgid="2141944461571677331">"Այս թույլտվության կարգավորումները փոխելու համար նախ անհրաժեշտ է անջատել էկրանի վերադրումը՝ անցնելով Կարգավորումներ > Հավելվածներ"</string> <string name="screen_overlay_button" msgid="4344544843349937743">"Բացել կարգավորումները"</string> <string name="wear_not_allowed_dlg_title" msgid="8104666773577525713">"Android Wear"</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 94a943ab..dede3082 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"許可しない"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"許可しない"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>/<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> に「<xliff:g id="ACTION">%2$s</xliff:g>」を許可しますか？"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> に<xliff:g id="ACTION">%2$s</xliff:g>を許可しますか？"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"許可"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"アプリ"</string> <string name="app_permissions" msgid="3146758905824597178">"アプリの権限"</string> @@ -117,7 +117,7 @@ <string name="screen_overlay_button" msgid="4344544843349937743">"設定を開く"</string> <string name="wear_not_allowed_dlg_title" msgid="8104666773577525713">"Android Wear"</string> <string name="wear_not_allowed_dlg_text" msgid="1322352525843583064">"Wear ではインストールやアンインストールができません"</string> - <string name="permission_review_warning_title_template_update" msgid="2569412700408535872">"「<xliff:g id="APP_NAME_0">%1$s</xliff:g>」が更新されました。「<xliff:g id="APP_NAME_1">%1$s</xliff:g>」に次の権限を許可しますか？"</string> + <string name="permission_review_warning_title_template_update" msgid="2569412700408535872">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> が更新されました。<xliff:g id="APP_NAME_1">%1$s</xliff:g> に次の権限を許可しますか？"</string> <string name="permission_review_title_template_install" msgid="6535540493936469336">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」に許可する権限の選択"</string> <string name="permission_review_title_template_update" msgid="2548815248828051885">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」が更新されました。このアプリに許可する権限を選択してください。"</string> <string name="review_button_cancel" msgid="957906817733578877">"キャンセル"</string> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index d8f9f0a7..a0610773 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -87,7 +87,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"უარყოფა"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"მაინც უარყოფა"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>-დან"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"გსურთ, დაუშვათ, რომ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b>-მა შეასრულოს <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"გსურთ, დაუშვათ, რომ <b><xliff:g id="APP_NAME">%1$s</xliff:g></b>მ შეასრულოს <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"დაშვება"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"აპები"</string> <string name="app_permissions" msgid="3146758905824597178">"აპის უფლებები"</string> diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml index 60b7948b..4a64b97c 100644 --- a/res/values-kn-rIN/strings.xml +++ b/res/values-kn-rIN/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"ನಿರಾಕರಿಸು"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"ಹೇಗಾದರೂ ನಿರಾಕರಿಸಿ"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g> ರಲ್ಲಿ <xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"<xliff:g id="ACTION">%2$s</xliff:g> ಗೆ <xliff:g id="APP_NAME">%1$s</xliff:g> ಅನ್ನು ಅನುಮತಿಸುವುದೇ?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"<xliff:g id="ACTION">%2$s</xliff:g> <xliff:g id="APP_NAME">%1$s</xliff:g> ಅನ್ನು ಅನುಮತಿಸುವುದೇ?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"ಅನುಮತಿಸು"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string> <string name="app_permissions" msgid="3146758905824597178">"ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿಗಳು"</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 54c32f7b..4e68fa26 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"거부"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"거부"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>/<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>이(가) <xliff:g id="ACTION">%2$s</xliff:g>을(를) 할 수 있도록 허용하시겠습니까?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>의 다음 작업을 허용하시겠습니까? <xliff:g id="ACTION">%2$s</xliff:g>"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"허용"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"앱"</string> <string name="app_permissions" msgid="3146758905824597178">"앱 권한"</string> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 0ec39799..2b7ee685 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Atmesti"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Vis tiek atmesti"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> iš <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Leisti <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Leisti programai <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Leisti"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Programos"</string> <string name="app_permissions" msgid="3146758905824597178">"Programos leidimai"</string> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index bcd517a9..15da1a0c 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Neatļaut"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Tomēr noraidīt"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>. no <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Vai atļaut lietotnei <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> veikt šādu darbību: <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Vai atļaut lietotnei <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Atļaut"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Lietotnes"</string> <string name="app_permissions" msgid="3146758905824597178">"Lietotnes atļaujas"</string> diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index 74e4e92a..32de1064 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"നിരസിക്കുക"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"എന്തായാലും നിരസിക്കുക"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"<xliff:g id="ACTION">%2$s</xliff:g> ചെയ്യുന്നതിന് <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> എന്ന ആപ്പിനെ അനുവദിക്കണോ?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"<xliff:g id="ACTION">%2$s</xliff:g> <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ആപ്പിനെ അനുവദിക്കണോ?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"അനുവദിക്കുക"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"ആപ്സ്"</string> <string name="app_permissions" msgid="3146758905824597178">"ആപ്പ് അനുമതികൾ"</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 9f4a34e4..cc7affcb 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Odmów"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Odmów mimo to"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> z <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Zezwolić aplikacji <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> na: <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Zezwolić aplikacji <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> na <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Zezwól"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplikacje"</string> <string name="app_permissions" msgid="3146758905824597178">"Uprawnienia aplikacji"</string> diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index d058b265..63c38351 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Negar"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Negar mesmo assim"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> de <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Permitir que o <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Permitir que o app <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Permitir"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Apps"</string> <string name="app_permissions" msgid="3146758905824597178">"Permissões do app"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index c6e1f967..279c79b9 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Recusar"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Recusar mesmo assim"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> de <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Pretende permitir a <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Pretende permitir à(ao) <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Permitir"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplicações"</string> <string name="app_permissions" msgid="3146758905824597178">"Permissões da aplicação"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index d058b265..63c38351 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Negar"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Negar mesmo assim"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> de <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Permitir que o <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Permitir que o app <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Permitir"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Apps"</string> <string name="app_permissions" msgid="3146758905824597178">"Permissões do app"</string> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 10065199..95017dd0 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -100,7 +100,7 @@ </plurals> <string name="old_sdk_deny_warning" msgid="3872277112584842615">"Această aplicație a fost creată pentru o versiune Android mai veche. Dacă nu acordați permisiunea, este posibil ca aceasta să nu mai funcționeze corespunzător."</string> <string name="default_permission_description" msgid="4992892207044156668">"efectuează o acțiune necunoscută"</string> - <string name="app_permissions_group_summary" msgid="4787239772223699263">"<xliff:g id="COUNT_0">%1$d</xliff:g> din <xliff:g id="COUNT_1">%2$d</xliff:g> (de) aplicații au această permisiune"</string> + <string name="app_permissions_group_summary" msgid="4787239772223699263">"<xliff:g id="COUNT_0">%1$d</xliff:g> din <xliff:g id="COUNT_1">%2$d</xliff:g> aplicații au această permisiune"</string> <string name="menu_show_system" msgid="6773743421743728921">"Afișați aplicațiile de sistem"</string> <string name="menu_hide_system" msgid="7595471742649432977">"Ascundeți aplicațiile de sistem"</string> <string name="permission_title" msgid="6495415273398916381">"Permisiuni pentru <xliff:g id="PERMISSION">%1$s</xliff:g>"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index babad033..ff1556e3 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -114,8 +114,8 @@ <string name="all_permissions" msgid="5156669007784613042">"Все разрешения"</string> <string name="other_permissions" msgid="2016192512386091933">"Что ещё может приложение"</string> <string name="permission_request_title" msgid="1204446718549121199">"Запрос разрешений"</string> - <string name="screen_overlay_title" msgid="3021729846864038529">"Обнаружены наложения"</string> - <string name="screen_overlay_message" msgid="2141944461571677331">"Чтобы предоставить или отменить разрешение, сначала отключите наложения. Для этого нажмите \"Настройки > Приложения\"."</string> + <string name="screen_overlay_title" msgid="3021729846864038529">"Показ поверх других окон"</string> + <string name="screen_overlay_message" msgid="2141944461571677331">"Чтобы предоставить или отменить разрешение, сначала отключите показ поверх других окон. Для этого нажмите \"Настройки > Приложения\"."</string> <string name="screen_overlay_button" msgid="4344544843349937743">"Открыть настройки"</string> <string name="wear_not_allowed_dlg_title" msgid="8104666773577525713">"Android Wear"</string> <string name="wear_not_allowed_dlg_text" msgid="1322352525843583064">"Установка и удаление не поддерживаются на Android Wear"</string> diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index 7f5b0683..be7d78f1 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"ප්රතික්ෂේප කරන්න"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"කෙසේ වෙතත් ප්රතික්ෂේප කරන්න"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g> න් <xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> හට <xliff:g id="ACTION">%2$s</xliff:g> වෙත ඉඩ දෙන්නද?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ට <xliff:g id="ACTION">%2$s</xliff:g> වෙත ඉඩ දෙන්නද?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"ඉඩ දෙන්න"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"යෙදුම්"</string> <string name="app_permissions" msgid="3146758905824597178">"යෙදුම් අවසර"</string> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index c6f61231..3cdd5d08 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Odmietnuť"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Zamietnuť"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> z <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Povoliť aplikácii <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> vykonať akciu <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Povoliť aplikácii <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Povoliť"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Aplikácie"</string> <string name="app_permissions" msgid="3146758905824597178">"Povolenia aplikácií"</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index ce8d0ac6..a5dec787 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Neka"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Neka ändå"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> av <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Tillåter du <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> att göra följande: <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Tillåter du <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> att <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Tillåt"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Appar"</string> <string name="app_permissions" msgid="3146758905824597178">"Appens behörigheter"</string> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 1c0afe25..8e8630da 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Kataa"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Kataa"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> kati ya <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"Ungependa kuruhusu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> iweze <xliff:g id="ACTION">%2$s</xliff:g>?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"Ungependa kuruhusu <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <xliff:g id="ACTION">%2$s</xliff:g>?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"Ruhusu"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Programu"</string> <string name="app_permissions" msgid="3146758905824597178">"Ruhusa za programu"</string> diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml index ef0c9f05..a0882dcf 100644 --- a/res/values-te-rIN/strings.xml +++ b/res/values-te-rIN/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"తిరస్కరించు"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"ఏదేమైనా నిరాకరించు"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>లో <xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>ని <xliff:g id="ACTION">%2$s</xliff:g> చేయడానికి అనుమతించాలా?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>ని <xliff:g id="ACTION">%2$s</xliff:g> అనుమతించాలా?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"అనుమతించు"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"అనువర్తనాలు"</string> <string name="app_permissions" msgid="3146758905824597178">"అనువర్తన అనుమతులు"</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index c7d64fde..382d6015 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -86,7 +86,7 @@ <string name="grant_dialog_button_deny" msgid="2176510645406614340">"Reddet"</string> <string name="grant_dialog_button_deny_anyway" msgid="847960499284125250">"Yine de reddet"</string> <string name="current_permission_template" msgid="6378304249516652817">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string> - <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> uygulamasına <xliff:g id="ACTION">%2$s</xliff:g> için izin verilsin mi?"</string> + <string name="permission_warning_template" msgid="7332275268559121742">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> uygulamasına <xliff:g id="ACTION">%2$s</xliff:g> izni verilsin mi?"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"İzin ver"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"Uygulamalar"</string> <string name="app_permissions" msgid="3146758905824597178">"Uygulama izinleri"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 5ec5f6c0..82b8569d 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -89,7 +89,7 @@ <string name="permission_warning_template" msgid="7332275268559121742">"要允许<b><xliff:g id="APP_NAME">%1$s</xliff:g></b><xliff:g id="ACTION">%2$s</xliff:g>吗？"</string> <string name="grant_dialog_button_allow" msgid="4616529495342337095">"允许"</string> <string name="app_permissions_breadcrumb" msgid="3390836200791539264">"应用"</string> - <string name="app_permissions" msgid="3146758905824597178">"应用访问授权"</string> + <string name="app_permissions" msgid="3146758905824597178">"应用权限"</string> <string name="never_ask_again" msgid="1089938738199748687">"不再询问"</string> <string name="no_permissions" msgid="3210542466245591574">"没有权限"</string> <string name="additional_permissions" msgid="6667573114240111763">"其他权限"</string> diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java index a2bbfc0c..49d91cf1 100755 --- a/src/com/android/packageinstaller/InstallAppProgress.java +++ b/src/com/android/packageinstaller/InstallAppProgress.java @@ -35,6 +35,7 @@ import android.content.pm.PackageInstaller; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageParser; +import android.content.pm.PackageParser.PackageLite; import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; @@ -49,6 +50,8 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.android.packageinstaller.permission.utils.IoUtils; +import com.android.internal.content.PackageHelper; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -356,9 +359,18 @@ public class InstallAppProgress extends Activity implements View.OnClickListener File file = new File(mPackageURI.getPath()); try { - params.setInstallLocation(PackageParser.parsePackageLite(file, 0).installLocation); + PackageLite pkg = PackageParser.parsePackageLite(file, 0); + params.setAppPackageName(pkg.packageName); + params.setInstallLocation(pkg.installLocation); + params.setSize( + PackageHelper.calculateInstalledSize(pkg, false, params.abiOverride)); } catch (PackageParser.PackageParserException e) { Log.e(TAG, "Cannot parse package " + file + ". Assuming defaults."); + Log.e(TAG, "Cannot calculate installed size " + file + ". Try only apk size."); + params.setSize(file.length()); + } catch (IOException e) { + Log.e(TAG, "Cannot calculate installed size " + file + ". Try only apk size."); + params.setSize(file.length()); } mInstallHandler.post(new Runnable() { diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 50ef0bf0..55a1f814 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -120,6 +120,9 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen private static final int DLG_NOT_SUPPORTED_ON_WEAR = DLG_BASE + 7; private void startInstallConfirm() { + ((TextView) findViewById(R.id.install_confirm_question)) + .setText(R.string.install_confirm_question); + findViewById(R.id.spacer).setVisibility(View.GONE); TabHost tabHost = (TabHost)findViewById(android.R.id.tabhost); tabHost.setup(); tabHost.setVisibility(View.VISIBLE); @@ -324,7 +327,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen // whether the untrusted sources setting is on. This allows partners to // implement a "allow untrusted source once" feature. if (request == REQUEST_ENABLE_UNKNOWN_SOURCES && result == RESULT_OK) { - initiateInstall(); + checkIfAllowedAndInitiateInstall(true); } else { clearCachedApkIfNeededAndFinish(); } @@ -454,11 +457,26 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen mOk.setOnClickListener(this); mCancel.setOnClickListener(this); + boolean wasSetUp = processPackageUri(packageUri); + if (!wasSetUp) { + return; + } + + checkIfAllowedAndInitiateInstall(false); + } + + /** + * Check if it is allowed to install the package and initiate install if allowed. If not allowed + * show the appropriate dialog. + * + * @param ignoreUnknownSourcesSettings Ignore {@link #isUnknownSourcesEnabled()} and proceed + * even if this would prevented installation. + */ + private void checkIfAllowedAndInitiateInstall(boolean ignoreUnknownSourcesSettings) { // Block the install attempt on the Unknown Sources setting if necessary. - final boolean requestFromUnknownSource = isInstallRequestFromUnknownSource(intent); + final boolean requestFromUnknownSource = isInstallRequestFromUnknownSource(getIntent()); if (!requestFromUnknownSource) { - processPackageUri(packageUri); - return; + initiateInstall(); } // If the admin prohibits it, or we're running in a managed profile, just show error @@ -467,7 +485,11 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen if (isUnknownSourcesDisallowed()) { if ((mUserManager.getUserRestrictionSource(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, Process.myUserHandle()) & UserManager.RESTRICTION_SOURCE_SYSTEM) != 0) { - showDialogInner(DLG_UNKNOWN_SOURCES); + if (ignoreUnknownSourcesSettings) { + initiateInstall(); + } else { + showDialogInner(DLG_UNKNOWN_SOURCES); + } } else { startActivity(new Intent(Settings.ACTION_SHOW_ADMIN_SUPPORT_DETAILS)); clearCachedApkIfNeededAndFinish(); @@ -475,11 +497,14 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen } else if (!isUnknownSourcesEnabled() && isManagedProfile) { showDialogInner(DLG_ADMIN_RESTRICTS_UNKNOWN_SOURCES); } else if (!isUnknownSourcesEnabled()) { - // Ask user to enable setting first - - showDialogInner(DLG_UNKNOWN_SOURCES); + if (ignoreUnknownSourcesSettings) { + initiateInstall(); + } else { + // Ask user to enable setting first + showDialogInner(DLG_UNKNOWN_SOURCES); + } } else { - processPackageUri(packageUri); + initiateInstall(); } } @@ -492,7 +517,14 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen super.onDestroy(); } - private void processPackageUri(final Uri packageUri) { + /** + * Parse the Uri and set up the installer for this package. + * + * @param packageUri The URI to parse + * + * @return {@code true} iff the installer could be set up + */ + private boolean processPackageUri(final Uri packageUri) { mPackageURI = packageUri; final String scheme = packageUri.getScheme(); @@ -511,7 +543,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen + " not available. Discontinuing installation"); showDialogInner(DLG_PACKAGE_ERROR); setPmResult(PackageManager.INSTALL_FAILED_INVALID_APK); - return; + return false; } as = new PackageUtil.AppSnippet(mPm.getApplicationLabel(mPkgInfo.applicationInfo), mPm.getApplicationIcon(mPkgInfo.applicationInfo)); @@ -526,7 +558,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen Log.w(TAG, "Parse error when parsing manifest. Discontinuing installation"); showDialogInner(DLG_PACKAGE_ERROR); setPmResult(PackageManager.INSTALL_FAILED_INVALID_APK); - return; + return false; } mPkgInfo = PackageParser.generatePackageInfo(parsed, null, PackageManager.GET_PERMISSIONS, 0, 0, null, @@ -537,20 +569,20 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen case SCHEME_CONTENT: { mStagingAsynTask = new StagingAsyncTask(); mStagingAsynTask.execute(packageUri); - return; + return false; } default: { Log.w(TAG, "Unsupported scheme " + scheme); setPmResult(PackageManager.INSTALL_FAILED_INVALID_URI); clearCachedApkIfNeededAndFinish(); - return; + return false; } } PackageUtil.initSnippetForNewApp(this, as, R.id.app_snippet); - initiateInstall(); + return true; } /** Get the ApplicationInfo for the calling package, if available */ @@ -776,7 +808,11 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen } mContentUriApkStagingFile = file; Uri fileUri = Uri.fromFile(file); - processPackageUri(fileUri); + + boolean wasSetUp = processPackageUri(fileUri); + if (wasSetUp) { + checkIfAllowedAndInitiateInstall(false); + } } @Override diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index c4471be6..b1347295 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -196,10 +196,12 @@ public class GrantPermissionsActivity extends OverlayTouchActivity // window height needed to show all content. We have to // re-add the window to force it to be resized if needed. View decor = getWindow().getDecorView(); - getWindowManager().removeViewImmediate(decor); - getWindowManager().addView(decor, decor.getLayoutParams()); - if (mViewHandler instanceof GrantPermissionsViewHandlerImpl) { - ((GrantPermissionsViewHandlerImpl) mViewHandler).onConfigurationChanged(); + if (decor.getParent() != null) { + getWindowManager().removeViewImmediate(decor); + getWindowManager().addView(decor, decor.getLayoutParams()); + if (mViewHandler instanceof GrantPermissionsViewHandlerImpl) { + ((GrantPermissionsViewHandlerImpl) mViewHandler).onConfigurationChanged(); + } } } diff --git a/src/com/android/packageinstaller/permission/ui/ManualLayoutFrame.java b/src/com/android/packageinstaller/permission/ui/ManualLayoutFrame.java index a20c9523..0b07c806 100644 --- a/src/com/android/packageinstaller/permission/ui/ManualLayoutFrame.java +++ b/src/com/android/packageinstaller/permission/ui/ManualLayoutFrame.java @@ -61,8 +61,13 @@ public class ManualLayoutFrame extends ViewGroup { @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { + // We want to keep the content bottom at the same place to avoid movement of the "Allow" + // button. + // Try to keep the content bottom at the same height. If this would move the dialog out of + // the top of the screen move it down as much as possible, then keep it at that position for + // the rest of the sequence of permission dialogs. View content = getChildAt(0); - if (mContentBottom == 0) { + if (mContentBottom == 0 || content.getMeasuredHeight() > mContentBottom) { mContentBottom = (getMeasuredHeight() + content.getMeasuredHeight()) / 2; } final int contentLeft = (getMeasuredWidth() - content.getMeasuredWidth()) / 2; diff --git a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java index 1a21f2de..8fe96c97 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java @@ -177,6 +177,8 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple setPreferenceScreen(screen); } + screen.setOrderingAsAdded(false); + ArraySet<String> preferencesToRemove = new ArraySet<>(); for (int i = 0, n = screen.getPreferenceCount(); i < n; i++) { preferencesToRemove.add(screen.getPreference(i).getKey()); @@ -195,6 +197,10 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple continue; } + if (!app.getAppInfo().enabled) { + continue; + } + String key = app.getKey(); preferencesToRemove.remove(key); Preference existingPref = screen.findPreference(key); |