diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:32:47 +0100 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:32:47 +0100 |
commit | f587ad6fd760c78eae8fe7a59104f43a7ea84f3d (patch) | |
tree | 1c8f9d691d69b893902c7c2d467a3df0555b2615 | |
parent | a4b300d057b74e848de622c33c2206281d0df631 (diff) | |
parent | b1a5960af6814e38ae7dcd771d25c1d8ab1dcae6 (diff) | |
download | android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.tar.gz android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.tar.bz2 android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.zip |
Merge tag 'android-4.3_r2.1' into cm-10.2
Android 4.3 release 2.1
Conflicts:
res/values-nl/strings.xml
Change-Id: I6b4a88abd08a4a2f2cecbc4ea5b86bbc736d2dd6
62 files changed, 516 insertions, 186 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index de117950..8b04c7fa 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -11,9 +11,11 @@ <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.MANAGE_USERS" /> + <uses-permission android:name="android.permission.GRANT_REVOKE_PERMISSIONS" /> <application android:label="@string/app_name" android:allowBackup="false" - android:theme="@android:style/Theme.DeviceDefault.DialogWhenLarge.NoActionBar"> + android:theme="@android:style/Theme.DeviceDefault.DialogWhenLarge.NoActionBar" + android:supportsRtl="true"> <activity android:name=".PackageInstallerActivity" android:configChanges="orientation|keyboardHidden|screenSize" android:excludeFromRecents="true"> @@ -48,6 +50,15 @@ <activity android:name=".UninstallAppProgress" android:configChanges="orientation|keyboardHidden|screenSize"> </activity> + <activity android:name=".GrantActivity" + android:configChanges="orientation|keyboardHidden|screenSize" + android:excludeFromRecents="true" + android:theme="@android:style/Theme.DeviceDefault.Dialog.NoActionBar"> + <intent-filter> + <action android:name="android.content.pm.action.REQUEST_PERMISSION" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> <!-- <receiver android:name=".RemoveReceiver"> <intent-filter> diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml index 7f35d729..0e2cd071 100644 --- a/res/layout/app_details.xml +++ b/res/layout/app_details.xml @@ -24,17 +24,17 @@ installation screens android:id="@+id/app_snippet" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="16dip" - android:paddingRight="16dip" + android:paddingStart="16dip" + android:paddingEnd="16dip" android:paddingTop="24dip" > <ImageView android:id="@+id/app_icon" android:layout_width="32dip" android:layout_height="32dip" - android:layout_marginLeft="8dip" + android:layout_marginStart="8dip" android:background="@color/transparent" - android:layout_alignParentLeft="true" - android:gravity="left" + android:layout_alignParentStart="true" + android:gravity="start" android:scaleType="centerCrop"/> <TextView android:id="@+id/app_name" android:layout_width="wrap_content" @@ -44,12 +44,12 @@ installation screens android:textColor="?android:attr/textColorPrimary" android:shadowColor="@color/shadow" android:shadowRadius="2" - android:layout_toRightOf="@id/app_icon" + android:layout_toEndOf="@id/app_icon" android:singleLine="true" android:layout_centerInParent="true" - android:paddingRight="16dip" + android:paddingEnd="16dip" android:paddingTop="3dip" - android:paddingLeft="16dip" + android:paddingStart="16dip" android:ellipsize="end"/> <FrameLayout android:id="@+id/top_divider" diff --git a/res/layout/install_confirm.xml b/res/layout/install_confirm.xml index f9fb3591..86ea1652 100644 --- a/res/layout/install_confirm.xml +++ b/res/layout/install_confirm.xml @@ -120,7 +120,7 @@ <Button android:id="@+id/cancel_button" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_gravity="left" + android:layout_gravity="start" android:layout_weight="1" android:text="@string/cancel" android:maxLines="2" @@ -129,7 +129,7 @@ <Button android:id="@+id/ok_button" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_gravity="right" + android:layout_gravity="end" android:layout_weight="1" android:text="@string/next" android:maxLines="2" diff --git a/res/layout/op_progress.xml b/res/layout/op_progress.xml index 6b269403..1c2cef53 100644 --- a/res/layout/op_progress.xml +++ b/res/layout/op_progress.xml @@ -45,7 +45,7 @@ <Button android:id="@+id/done_button" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_gravity="left" + android:layout_gravity="start" android:layout_weight="1" android:text="@string/done" android:maxLines="2" @@ -54,7 +54,7 @@ <Button android:id="@+id/launch_button" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_gravity="right" + android:layout_gravity="end" android:layout_weight="1" android:text="@string/launch" android:maxLines="2" @@ -82,11 +82,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/app_snippet" - android:gravity="left" + android:gravity="start" android:text="@string/installing" android:paddingTop="16dip" - android:paddingLeft="32dip" - android:paddingRight="32dip" + android:paddingStart="32dip" + android:paddingEnd="32dip" android:textAppearance="?android:attr/textAppearanceMedium" /> <!-- This explanation text is shown only after the progress bar below goes away. --> @@ -96,7 +96,7 @@ android:layout_above="@id/buttons_panel" android:layout_below="@id/center_text" android:paddingTop="8dip" - android:paddingLeft="16dip" + android:paddingStart="16dip" android:paddingBottom="16dip"> <TextView android:id="@+id/center_explanation" diff --git a/res/layout/uninstall_confirm.xml b/res/layout/uninstall_confirm.xml index 9ef0036c..f604023f 100644 --- a/res/layout/uninstall_confirm.xml +++ b/res/layout/uninstall_confirm.xml @@ -57,8 +57,8 @@ android:layout_height="wrap_content" android:textColor="?android:attr/textColorSecondary" android:textAppearance="?android:attr/textAppearanceMedium" - android:paddingLeft="24dip" - android:paddingRight="24dip" /> + android:paddingStart="24dip" + android:paddingEnd="24dip" /> </LinearLayout> @@ -88,7 +88,7 @@ <Button android:id="@+id/cancel_button" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_gravity="left" + android:layout_gravity="start" android:layout_weight="1" android:text="@string/cancel" android:maxLines="2" @@ -97,7 +97,7 @@ <Button android:id="@+id/ok_button" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_gravity="right" + android:layout_gravity="end" android:layout_weight="1" android:text="@string/ok" android:maxLines="2" diff --git a/res/layout/uninstall_progress.xml b/res/layout/uninstall_progress.xml index bd1854b1..ff80fe11 100644 --- a/res/layout/uninstall_progress.xml +++ b/res/layout/uninstall_progress.xml @@ -82,8 +82,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:paddingLeft="24dip" - android:paddingRight="24dip" + android:paddingStart="24dip" + android:paddingEnd="24dip" android:paddingTop="8dip" android:paddingBottom="8dip" android:fillViewport="false"> @@ -92,7 +92,7 @@ android:id="@+id/center_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="left" + android:gravity="start" android:text="@string/uninstalling" android:textAppearance="?android:attr/textAppearanceMedium"/> </ScrollView> diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 32fa8f2a..eed2a4b3 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privaatheid"</string> <string name="devicePerms" msgid="6733560207731294504">"Toesteltoegang"</string> <string name="no_new_perms" msgid="6657813692169565975">"Hierdie opdatering vereis geen nuwe toestemmings nie."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Wil jy die volgende toestemmings toestaan? Dit sal toegang kry tot:"</string> </resources> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index f23481f0..8a00e1fb 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -35,7 +35,7 @@ <string name="install_failed_invalid_apk" msgid="1287935707565682604">"ፓኬጁ ብልሹ ሆኖ ተገኝቷል።"</string> <string name="install_failed_inconsistent_certificates" msgid="1517751954440692054">"በተመሳሳይ ስም ያለፓኬጅ በሚያምታታ ፊርማ አስቀድሞ ተጭኗል።"</string> <string name="install_failed_older_sdk" msgid="7947925824732917665">"ፓኬጁ በአዲሱ የAndroid ሥሪቶች ላይ ብቻ ይሰራል።"</string> - <string name="install_failed_cpu_abi_incompatible" product="tablet" msgid="7098684468842750800">"ይህ ትግበራ ከአንተ ጡባዊ ተኮ ጋር ተኳኋኝ አይደለም፡፡"</string> + <string name="install_failed_cpu_abi_incompatible" product="tablet" msgid="7098684468842750800">"ይህ ትግበራ ከእርስዎ ጡባዊ ተኮ ጋር ተኳኋኝ አይደለም።"</string> <string name="install_failed_cpu_abi_incompatible" product="default" msgid="4433316303249711331">"ይህ ትግበራ ከአንተ ስልክ ጋር ተኳኋኝ አይደለም፡፡"</string> <string name="install_failed_file_not_found" msgid="1958430133396322619">"የተጠቀሰው ፓኬጅ ጫን መጠናቀቅ ከመቻሉ በፊት ተሰርዞ ነበር።"</string> <string name="install_failed_verify_failed" msgid="5567372439890440205">"ፓኬጁ ማረጋገጫውን አላለፈም እና መጫን አይችልም።"</string> @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"ግላዊነት"</string> <string name="devicePerms" msgid="6733560207731294504">"የመሳሪያ መዳረሻ"</string> <string name="no_new_perms" msgid="6657813692169565975">"ይህ ዝማኔ ምንም አዲስ ፈቃድ አያስፈልገውም።"</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"የሚከተሉት ፍቃዶችን መስጠት ይፈልጋሉ? የእነዚህ መዳረሻዎችን ይሰጣል፦"</string> </resources> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index a2501ee6..42c8ae64 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"الخصوصية"</string> <string name="devicePerms" msgid="6733560207731294504">"الدخول إلى الجهاز"</string> <string name="no_new_perms" msgid="6657813692169565975">"لا يتطلب هذا التحديث أي أذونات جديدة."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"هل ترغب في منح الأذونات التالية؟ علمًا بأنها تتيح الدخول إلى:"</string> </resources> diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 115223ce..531a6600 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Прыватнасць"</string> <string name="devicePerms" msgid="6733560207731294504">"Доступ да прылады"</string> <string name="no_new_perms" msgid="6657813692169565975">"Гэтае абнаўленне не патрабуе ніякіх новых дазволаў."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Даць наступны дазвол? Ён будзе атрымліваць доступ да:"</string> </resources> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 3a0c297a..53208e44 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Поверителност"</string> <string name="devicePerms" msgid="6733560207731294504">"Достъп до у-вото"</string> <string name="no_new_perms" msgid="6657813692169565975">"Тази актуализация не изисква нови разрешения."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Искате ли да предоставите следните разрешения? Така ще се получи достъп до:"</string> </resources> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 5b921ae0..0e52e5f1 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -45,7 +45,7 @@ <string name="launch" msgid="4826921505917605463">"Obre"</string> <string name="unknown_apps_dlg_title" msgid="2855558586206583032">"Instal·lació bloquejada"</string> <string name="unknown_apps_dlg_text" product="tablet" msgid="7504186369474734767">"Per seguretat, la tauleta està def. per bloq. instal·lació d\'apl. que s\'obtenen de fonts desconegud."</string> - <string name="unknown_apps_dlg_text" product="default" msgid="133213135679009316">"Per seguretat, el telèfon està def. per bloq. instal·lació d\'apl. que s\'obtenen de fonts desconeg."</string> + <string name="unknown_apps_dlg_text" product="default" msgid="133213135679009316">"Per seguretat, el telèfon està configurat per bloquejar les aplicacions que procedeixin de fonts desconegudes."</string> <string name="ok" msgid="3468756155452870475">"D\'acord"</string> <string name="settings" msgid="6743583734099755409">"Configuració"</string> <string name="allow_source_dlg_title" msgid="7568985073502399415">"Nova font per a aplicacions"</string> @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privadesa"</string> <string name="devicePerms" msgid="6733560207731294504">"Accés al dispositiu"</string> <string name="no_new_perms" msgid="6657813692169565975">"Aquesta actualització no requereix permisos nous."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Vols concedir els permisos següents? S\'obtindrà accés a:"</string> </resources> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index bfc362e9..e92a25cd 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -27,11 +27,11 @@ <string name="install_done" msgid="3682715442154357097">"Aplikace je nainstalována."</string> <string name="install_confirm_question" msgid="7295206719219043890">"Chcete tuto aplikaci nainstalovat? Aplikace získá přístup k těmto oprávněním:"</string> <string name="install_confirm_question_no_perms" msgid="5918305641302873520">"Chcete tuto aplikaci nainstalovat? Aplikace nevyžaduje žádná zvláštní oprávnění."</string> - <string name="install_confirm_question_update" msgid="4624159567361487964">"Chcete nainstalovat aktualizaci této existující aplikace? Stávající data nebudu ztracena. Aktualizovaná aplikace získá přístup k následujícímu:"</string> + <string name="install_confirm_question_update" msgid="4624159567361487964">"Chcete nainstalovat aktualizaci této existující aplikace? Stávající data nebudou ztracena. Aktualizovaná aplikace získá přístup k následujícímu:"</string> <string name="install_confirm_question_update_system" msgid="1302330093676416336">"Chcete nainstalovat aktualizaci této integrované aplikace? Stávající data nebudou ztracena. Aktualizovaná aplikace získá přístup k následujícímu:"</string> <string name="install_confirm_question_update_no_perms" msgid="4885928136844618944">"Chcete nainstalovat aktualizaci této existující aplikace? Vaše existující data nebudou ztracena. Není vyžadován žádný zvláštní přístup."</string> <string name="install_confirm_question_update_system_no_perms" msgid="7676593512694724374">"Chcete nainstalovat aktualizaci této integrované aplikace? Vaše existující data nebudou ztracena. Není vyžadován žádný zvláštní přístup."</string> - <string name="install_failed" msgid="6579998651498970899">"Aplikace není nainstalována."</string> + <string name="install_failed" msgid="6579998651498970899">"Aplikaci nelze nainstalovat."</string> <string name="install_failed_invalid_apk" msgid="1287935707565682604">"Zdá se, že je balíček poškozen."</string> <string name="install_failed_inconsistent_certificates" msgid="1517751954440692054">"Již je nainstalován balíček se stejným názvem a konfliktním podpisem."</string> <string name="install_failed_older_sdk" msgid="7947925824732917665">"Balíček funguje pouze v novějších verzích systému Android."</string> @@ -73,9 +73,10 @@ <string name="uninstall_failed_msg" msgid="8969754702803951175">"Aplikaci <xliff:g id="APP_NAME">%1$s</xliff:g> nelze odinstalovat."</string> <string name="Parse_error_dlg_title" msgid="6079580916889596257">"Chyba analýzy"</string> <string name="Parse_error_dlg_text" msgid="7623286983621067011">"Při analýze balíčku došlo k chybě."</string> - <string name="newPerms" msgid="6039428254474104210">"Nové"</string> + <string name="newPerms" msgid="6039428254474104210">"Nově"</string> <string name="allPerms" msgid="1024385515840703981">"Vše"</string> <string name="privacyPerms" msgid="1850527049572617">"Ochrana soukromí"</string> <string name="devicePerms" msgid="6733560207731294504">"Přístup k zařízení"</string> <string name="no_new_perms" msgid="6657813692169565975">"Tato aktualizace nevyžaduje žádná nová oprávnění."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Chcete udělit následující oprávnění? Získáte přístup k:"</string> </resources> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 006f1c80..a252e410 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privatliv"</string> <string name="devicePerms" msgid="6733560207731294504">"Adgang til enheden"</string> <string name="no_new_perms" msgid="6657813692169565975">"Denne opdatering kræver ingen nye tilladelser."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Vil du give følgende tilladelser? Det vil få adgang til:"</string> </resources> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 463076ef..672bb874 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -25,7 +25,7 @@ <string name="unknown" msgid="4742479012767208045">"Unbekannt"</string> <string name="installing" msgid="8613631001631998372">"Wird installiert..."</string> <string name="install_done" msgid="3682715442154357097">"App wurde installiert."</string> - <string name="install_confirm_question" msgid="7295206719219043890">"Möchten Sie diese App installieren? Sie erhält dann Zugriff auf:"</string> + <string name="install_confirm_question" msgid="7295206719219043890">"Möchten Sie diese App installieren? Sie erhält dann folgende Berechtigungen:"</string> <string name="install_confirm_question_no_perms" msgid="5918305641302873520">"Möchten Sie diese App installieren? Sie benötigt keinen besonderen Zugriff."</string> <string name="install_confirm_question_update" msgid="4624159567361487964">"Möchten Sie ein Update für diese vorhandene App installieren? Ihre vorhandenen Daten bleiben erhalten. Die aktualisierte App erhält Zugriff auf:"</string> <string name="install_confirm_question_update_system" msgid="1302330093676416336">"Möchten Sie ein Update für diese integrierte App installieren? Ihre vorhandenen Daten bleiben erhalten. Die aktualisierte App erhält Zugriff auf:"</string> @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Datenschutz"</string> <string name="devicePerms" msgid="6733560207731294504">"Gerätezugriff"</string> <string name="no_new_perms" msgid="6657813692169565975">"Für dieses Update sind keine neuen Berechtigungen erforderlich."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Möchten Sie die folgenden Berechtigungen gewähren? Diese ermöglichen den Zugriff auf Folgendes:"</string> </resources> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index f5da539e..5463d120 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Απόρρητο"</string> <string name="devicePerms" msgid="6733560207731294504">"Πρόσβαση συσκευής"</string> <string name="no_new_perms" msgid="6657813692169565975">"Αυτή η ενημέρωση δεν απαιτεί νέες άδειες."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Θέλετε να εκχωρήσετε τα ακόλουθα δικαιώματα; Συνεπάγεται πρόσβαση σε:"</string> </resources> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index ddedabac..2e3920c1 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privacy"</string> <string name="devicePerms" msgid="6733560207731294504">"Device Access"</string> <string name="no_new_perms" msgid="6657813692169565975">"This update requires no new permissions."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Do you want to grant the following permissions? It will get access to:"</string> </resources> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index d787f79f..01cb5291 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privacidad"</string> <string name="devicePerms" msgid="6733560207731294504">"Acceso al dispositivo"</string> <string name="no_new_perms" msgid="6657813692169565975">"Esta actualización no requiere permisos nuevos."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"¿Quieres conceder los permisos indicados a continuación? Esto dará acceso a:"</string> </resources> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 5521043a..de884f74 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privacidad"</string> <string name="devicePerms" msgid="6733560207731294504">"Acceso dispositivo"</string> <string name="no_new_perms" msgid="6657813692169565975">"Esta actualización no requiere permisos nuevos."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"¿Quieres conceder los siguientes permisos? Podrá acceder a:"</string> </resources> diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index ef3711f6..56e36e7f 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privaatsus"</string> <string name="devicePerms" msgid="6733560207731294504">"Seadme juurdepääs"</string> <string name="no_new_perms" msgid="6657813692169565975">"See värskendus ei nõua uusi lube."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Kas soovite anda järgmise loa? See annab juurdepääsu järgmisele:"</string> </resources> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 09e2f24c..b7e95a75 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"حریم خصوصی"</string> <string name="devicePerms" msgid="6733560207731294504">"دسترسی به دستگاه"</string> <string name="no_new_perms" msgid="6657813692169565975">"این بهروزرسانی به مجوز جدیدی نیاز ندارد."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"آیا میخواهید مجوزهای زیر را اعطا کنید؟ این مجوزها دسترسی به این موارد را بوجود میآورند:"</string> </resources> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index de201222..05aefd84 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Tietosuoja"</string> <string name="devicePerms" msgid="6733560207731294504">"Laitteen käyttö"</string> <string name="no_new_perms" msgid="6657813692169565975">"Tämä päivitys ei vaadi uusia käyttöoikeuksia."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Haluatko antaa seuraavat käyttöoikeudet? Sovellus saa käyttöönsä nämä kohteet:"</string> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 66b4f53a..ac537856 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -25,7 +25,7 @@ <string name="unknown" msgid="4742479012767208045">"Inconnu"</string> <string name="installing" msgid="8613631001631998372">"Installation..."</string> <string name="install_done" msgid="3682715442154357097">"Application installée."</string> - <string name="install_confirm_question" msgid="7295206719219043890">"Voulez-vous installer cette application ? Elle aura accès à :"</string> + <string name="install_confirm_question" msgid="7295206719219043890">"Voulez-vous installer cette application ? Elle pourra :"</string> <string name="install_confirm_question_no_perms" msgid="5918305641302873520">"Voulez-vous installer cette application ? Elle n\'exige aucun accès particulier."</string> <string name="install_confirm_question_update" msgid="4624159567361487964">"Voulez-vous installer une mise à jour pour cette application ? Vos données existantes seront conservées. L\'application mise à jour aura accès à :"</string> <string name="install_confirm_question_update_system" msgid="1302330093676416336">"Voulez-vous installer une mise à jour pour cette application intégrée ? Vos données existantes seront conservées. L\'application mise à jour aura accès à :"</string> @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Confidentialité"</string> <string name="devicePerms" msgid="6733560207731294504">"Accès à l\'appareil"</string> <string name="no_new_perms" msgid="6657813692169565975">"Cette mise à jour n\'exige pas de nouvelles autorisations."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Voulez-vous accorder les autorisations suivantes ? L\'utilisateur aura accès aux éléments suivants :"</string> </resources> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index ad29534c..cbf1ef74 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"गोपनीयता"</string> <string name="devicePerms" msgid="6733560207731294504">"उपकरण पहुंच"</string> <string name="no_new_perms" msgid="6657813692169565975">"इस अपडेट के लिए अनुमति की आवश्यकता नहीं है."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"क्या आप निम्नलिखित के लिए अनुमति देना चाहते हैं ? इसे इन पर एक्सेस प्राप्त होगी:"</string> </resources> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 13991ef5..55e7f65f 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privatnost"</string> <string name="devicePerms" msgid="6733560207731294504">"Pristup uređaja"</string> <string name="no_new_perms" msgid="6657813692169565975">"Ovo ažuriranje ne zahtijeva nove dozvole."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Želite li dati sljedeće dozvole? Odobrit će se pristup sljedećem:"</string> </resources> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index ede25e3c..94dc434a 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Adatvédelem"</string> <string name="devicePerms" msgid="6733560207731294504">"Eszközhozzáférés"</string> <string name="no_new_perms" msgid="6657813692169565975">"A frissítés nem igényel új engedélyeket."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Megadja a következő engedélyeket? A következőkhöz biztosít hozzáférést:"</string> </resources> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 7ad1abc1..d226dbae 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privasi"</string> <string name="devicePerms" msgid="6733560207731294504">"Akses Perangkat"</string> <string name="no_new_perms" msgid="6657813692169565975">"Pembaruan ini tidak memerlukan izin baru."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Ingin memberikan izin ini? Akses akan diberikan ke:"</string> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 2642aca9..19387354 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privacy"</string> <string name="devicePerms" msgid="6733560207731294504">"Accesso dispositivo"</string> <string name="no_new_perms" msgid="6657813692169565975">"Questo aggiornamento non richiede nuove autorizzazioni."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Vuoi concedere le autorizzazioni che seguono? Concederai l\'accesso a:"</string> </resources> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 68d540a7..48aaa26c 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"פרטיות"</string> <string name="devicePerms" msgid="6733560207731294504">"גישה למכשיר"</string> <string name="no_new_perms" msgid="6657813692169565975">"עדכון זה לא דורש הרשאות חדשות."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"האם ברצונך להעניק את ההרשאות הבאות? תוענק גישה אל:"</string> </resources> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 40824117..71415c69 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"プライバシー"</string> <string name="devicePerms" msgid="6733560207731294504">"端末アクセス"</string> <string name="no_new_perms" msgid="6657813692169565975">"このアップデートでは新たな許可は必要ありません。"</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"次の権限を許可してもよろしいですか?許可すると、次にアクセスされます:"</string> </resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 83e42ef4..2bb9120b 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"개인정보 보호"</string> <string name="devicePerms" msgid="6733560207731294504">"기기 액세스"</string> <string name="no_new_perms" msgid="6657813692169565975">"이 업데이트에는 새로운 권한이 필요하지 않습니다."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"다음 권한을 부여하시겠습니까? 권한이 부여되면 다음에 액세스할 수 있습니다."</string> </resources> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index ff8ed253..f9aad1a0 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privatumas"</string> <string name="devicePerms" msgid="6733560207731294504">"Prieiga prie įreng."</string> <string name="no_new_perms" msgid="6657813692169565975">"Šiam naujiniui nereikalingi nauji leidimai."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Ar norite suteikti šiuos leidimus? Bus suteikta prieiga prie:"</string> </resources> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 1368facb..80c003bc 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Konfidencialitāte"</string> <string name="devicePerms" msgid="6733560207731294504">"Piekļuve ierīcei"</string> <string name="no_new_perms" msgid="6657813692169565975">"Šim atjauninājumam nav nepieciešamas jaunas atļaujas."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Vai vēlaties piešķirt tālāk norādītās atļaujas? Tiks piešķirta šāda piekļuve:"</string> </resources> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 4964c57c..a2d48b04 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privasi"</string> <string name="devicePerms" msgid="6733560207731294504">"Akses Peranti"</string> <string name="no_new_perms" msgid="6657813692169565975">"Kemas kini ini tidak memerlukan kebenaran baharu."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Adakah anda ingin memberikan kebenaran berikut? Apl akan mendapat akses ke:"</string> </resources> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 86a5ebea..f7ff672e 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Personvern"</string> <string name="devicePerms" msgid="6733560207731294504">"Enhetstilgang"</string> <string name="no_new_perms" msgid="6657813692169565975">"Denne oppdateringen krever ingen nye tillatelser."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Ønsker du å gi følgende tillatelser? Dette gir tilgang til:"</string> </resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 5e77004f..0caa7de4 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privacy"</string> <string name="devicePerms" msgid="6733560207731294504">"Apparaattoegang"</string> <string name="no_new_perms" msgid="6657813692169565975">"Voor deze update zijn geen nieuwe machtigingen vereist."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Wilt u de volgende rechten verlenen? Hiermee kan toegang worden verkregen tot:"</string> </resources> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index d5ff956e..d94a0e23 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -25,7 +25,7 @@ <string name="unknown" msgid="4742479012767208045">"Nieznane"</string> <string name="installing" msgid="8613631001631998372">"Instalowanie..."</string> <string name="install_done" msgid="3682715442154357097">"Aplikacja została zainstalowana."</string> - <string name="install_confirm_question" msgid="7295206719219043890">"Zainstalować tę aplikację? Będzie miała dostęp do tych rzeczy:"</string> + <string name="install_confirm_question" msgid="7295206719219043890">"Zainstalować tę aplikację? Będzie miała następujące uprawnienia:"</string> <string name="install_confirm_question_no_perms" msgid="5918305641302873520">"Zainstalować tę aplikację? Nie ma specjalnych wymagań co do dostępu."</string> <string name="install_confirm_question_update" msgid="4624159567361487964">"Zainstalować aktualizację tej aplikacji? Nie utracisz wcześniejszych danych. Zaktualizowana aplikacja będzie miała następujące uprawnienia:"</string> <string name="install_confirm_question_update_system" msgid="1302330093676416336">"Zainstalować aktualizację fabrycznej aplikacji? Nie utracisz wcześniejszych danych. Zaktualizowana aplikacja będzie miała następujące uprawnienia:"</string> @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Prywatność"</string> <string name="devicePerms" msgid="6733560207731294504">"Dostęp do urządzenia"</string> <string name="no_new_perms" msgid="6657813692169565975">"Ta aktualizacja nie wymaga nowych uprawnień."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Chcesz przyznać te uprawnienia? Dają one dostęp do:"</string> </resources> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 47a2779e..d5bbed0e 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -27,10 +27,10 @@ <string name="install_done" msgid="3682715442154357097">"Aplicação instalada."</string> <string name="install_confirm_question" msgid="7295206719219043890">"Pretende instalar esta aplicação? Terá acesso a:"</string> <string name="install_confirm_question_no_perms" msgid="5918305641302873520">"Pretende instalar esta aplicação? Não requer qualquer acesso especial."</string> - <string name="install_confirm_question_update" msgid="4624159567361487964">"Pretende instalar uma atualização para esta aplicação existente? Os dados existentes não serão perdidos. A aplicação atualizada terá acesso a:"</string> - <string name="install_confirm_question_update_system" msgid="1302330093676416336">"Pretende instalar uma atualização para esta aplicação incorporada? Os dados existentes não serão perdidos. A aplicação atualizada terá acesso a:"</string> - <string name="install_confirm_question_update_no_perms" msgid="4885928136844618944">"Pretende instalar uma atualização para esta aplicação existente? Os dados existentes não serão perdidos. Não é necessário um acesso específico."</string> - <string name="install_confirm_question_update_system_no_perms" msgid="7676593512694724374">"Pretende instalar uma atualização para esta aplicação integrada? Os dados existentes não serão perdidos. Não é necessário um acesso específico."</string> + <string name="install_confirm_question_update" msgid="4624159567361487964">"Pretende instalar uma atualização para a aplicação existente? Os dados existentes não serão perdidos. A aplicação atualizada terá acesso a:"</string> + <string name="install_confirm_question_update_system" msgid="1302330093676416336">"Pretende instalar uma atualização para a aplicação existente? Os dados existentes não serão perdidos. A aplicação atualizada terá acesso a:"</string> + <string name="install_confirm_question_update_no_perms" msgid="4885928136844618944">"Pretende instalar uma atualização para a aplicação existente? Os dados existentes não serão perdidos. Não é necessário um acesso específico."</string> + <string name="install_confirm_question_update_system_no_perms" msgid="7676593512694724374">"Pretende instalar uma atualização para a aplicação integrada? Os dados existentes não serão perdidos. Não é necessário um acesso específico."</string> <string name="install_failed" msgid="6579998651498970899">"Aplicação não instalada."</string> <string name="install_failed_invalid_apk" msgid="1287935707565682604">"O pacote parece estar danificado."</string> <string name="install_failed_inconsistent_certificates" msgid="1517751954440692054">"Já está instalado um pacote com o mesmo nome e com uma assinatura em conflito."</string> @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privacidade"</string> <string name="devicePerms" msgid="6733560207731294504">"Acesso ao Dispositivo"</string> <string name="no_new_perms" msgid="6657813692169565975">"Esta atualização não requer novas permissões."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Pretende conceder as seguintes permissões? Permitirão acesso a:"</string> </resources> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 6030c2b9..54e4a040 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privacidade"</string> <string name="devicePerms" msgid="6733560207731294504">"Acesso ao dispositivo"</string> <string name="no_new_perms" msgid="6657813692169565975">"Esta atualização não requer novas permissões."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Deseja conceder as permissões a seguir? Será concedido acesso para:"</string> </resources> diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index 1d677210..dded8e04 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -126,4 +126,6 @@ <skip /> <!-- no translation found for no_new_perms (6657813692169565975) --> <skip /> + <!-- no translation found for grant_confirm_question (4690289297029223742) --> + <skip /> </resources> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index e2e4ad8f..cea8295b 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Confidenţialitate"</string> <string name="devicePerms" msgid="6733560207731294504">"Acces la dispozitiv"</string> <string name="no_new_perms" msgid="6657813692169565975">"Această actualizare nu necesită permisiuni noi."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Doriți să acordați următoarele permisiuni? Utilizatorul va avea acces la:"</string> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index aad736c0..ffff1139 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -25,10 +25,10 @@ <string name="unknown" msgid="4742479012767208045">"Неизвестно"</string> <string name="installing" msgid="8613631001631998372">"Установка..."</string> <string name="install_done" msgid="3682715442154357097">"Приложение установлено."</string> - <string name="install_confirm_question" msgid="7295206719219043890">"Это приложение получит доступ к указанным ниже данным. Установить его?"</string> + <string name="install_confirm_question" msgid="7295206719219043890">"Хотите ли вы установить это приложение? Оно получит следующие разрешения:"</string> <string name="install_confirm_question_no_perms" msgid="5918305641302873520">"Это приложение не требует специальных разрешений. Установить его?"</string> - <string name="install_confirm_question_update" msgid="4624159567361487964">"После обновления это приложение получит доступ к указанным ниже данным. При этом текущая информация сохранится. Обновить?"</string> - <string name="install_confirm_question_update_system" msgid="1302330093676416336">"После обновления это приложение получит доступ к указанным ниже данным. При этом текущая информация сохранится. Обновить?"</string> + <string name="install_confirm_question_update" msgid="4624159567361487964">"Хотите установить обновление для этого приложения? После обновления оно сможет выполнять следующие действия:"</string> + <string name="install_confirm_question_update_system" msgid="1302330093676416336">"Хотите установить обновление для этого приложения? После обновления оно сможет выполнять следующие действия:"</string> <string name="install_confirm_question_update_no_perms" msgid="4885928136844618944">"Установить обновление этого приложения? На текущих данных это никак не отразится. Специальных прав доступа не требуется."</string> <string name="install_confirm_question_update_system_no_perms" msgid="7676593512694724374">"Установить обновление этого встроенного приложения? На текущих данных это никак не отразится. Специальных прав доступа не требуется."</string> <string name="install_failed" msgid="6579998651498970899">"Приложение не установлено."</string> @@ -75,7 +75,8 @@ <string name="Parse_error_dlg_text" msgid="7623286983621067011">"Ошибка при синтаксическом анализе пакета."</string> <string name="newPerms" msgid="6039428254474104210">"Новые"</string> <string name="allPerms" msgid="1024385515840703981">"Все"</string> - <string name="privacyPerms" msgid="1850527049572617">"Конфиденциальность"</string> + <string name="privacyPerms" msgid="1850527049572617">"Личные данные"</string> <string name="devicePerms" msgid="6733560207731294504">"Доступ к устройству"</string> - <string name="no_new_perms" msgid="6657813692169565975">"Установка этого обновления не требует специальных разрешений."</string> + <string name="no_new_perms" msgid="6657813692169565975">"Установка этого обновления не требует новых разрешений."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Предоставить следующие разрешения? Вот к чему будет получен доступ:"</string> </resources> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index c3cf6600..0717d6c0 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Ochrana osob. údajov"</string> <string name="devicePerms" msgid="6733560207731294504">"Prístup k zariadeniu"</string> <string name="no_new_perms" msgid="6657813692169565975">"Táto aktualizácia nevyžaduje žiadne nové povolenia."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Chcete udeliť nasledujúce povolenia? Získate prístup k:"</string> </resources> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index d0774fca..e6e73261 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Zasebnost"</string> <string name="devicePerms" msgid="6733560207731294504">"Dostop do naprave"</string> <string name="no_new_perms" msgid="6657813692169565975">"Za to posodobitev niso potrebna nova dovoljenja."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Ali želite odobriti naslednja dovoljenja? S tem bo omogočen dostop do:"</string> </resources> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 4ea79923..510e8046 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Приватност"</string> <string name="devicePerms" msgid="6733560207731294504">"Приступ уређају"</string> <string name="no_new_perms" msgid="6657813692169565975">"Ово ажурирање не захтева нове дозволе."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Да ли желите да одобрите следеће дозволе? Одобрићете приступ за:"</string> </resources> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 8bac71da..4791ff85 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -40,7 +40,7 @@ <string name="install_failed_file_not_found" msgid="1958430133396322619">"Paketet som angavs togs bort innan installationen var slutförd."</string> <string name="install_failed_verify_failed" msgid="5567372439890440205">"Paketet klarade inte verifieringen och får inte installeras."</string> <string name="install_failed_verify_timeout" msgid="7083090219270140373">"En timeout inträffade när paketet skulle verifieras. Prova att installera paketet senare."</string> - <string name="install_failed_msg" product="tablet" msgid="8368835262605608787">"Det gick inte att installera <xliff:g id="APP_NAME">%1$s</xliff:g> på pekdatorn."</string> + <string name="install_failed_msg" product="tablet" msgid="8368835262605608787">"Det gick inte att installera <xliff:g id="APP_NAME">%1$s</xliff:g> på surfplattan."</string> <string name="install_failed_msg" product="default" msgid="8554909560982962052">"Det gick inte att installera <xliff:g id="APP_NAME">%1$s</xliff:g> på mobilen."</string> <string name="launch" msgid="4826921505917605463">"Öppna"</string> <string name="unknown_apps_dlg_title" msgid="2855558586206583032">"Installation blockerad"</string> @@ -55,7 +55,7 @@ <string name="dlg_app_replacement_statement" msgid="2992911899989907492">"Appen du installerar kommer att ersätta en annan app."\n\n"Alla tidigare användardata sparas."</string> <string name="dlg_sys_app_replacement_statement" msgid="1900046590819605929">"Det här är en systemapp."\n\n"Alla tidigare användardata sparas."</string> <string name="out_of_space_dlg_title" msgid="7843674437613797326">"Slut på utrymme"</string> - <string name="out_of_space_dlg_text" msgid="4774775404294282216">"Det gick inte att avinstallera <xliff:g id="APP_NAME">%1$s</xliff:g>. Frigör minne och försök igen."</string> + <string name="out_of_space_dlg_text" msgid="4774775404294282216">"Det gick inte att installera <xliff:g id="APP_NAME">%1$s</xliff:g>. Frigör minne och försök igen."</string> <string name="dlg_ok" msgid="6944357727705699232">"OK"</string> <string name="app_not_found_dlg_title" msgid="2692335460569505484">"Appen hittades inte"</string> <string name="app_not_found_dlg_text" msgid="6107465056055095930">"Appen fanns inte i listan över installerade appar."</string> @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Sekretess"</string> <string name="devicePerms" msgid="6733560207731294504">"Enhetsåtkomst"</string> <string name="no_new_perms" msgid="6657813692169565975">"Det krävs inga nya behörigheter för den här uppdateringen."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Vill du bevilja följande behörigheter? Då godkänner du åtkomst till:"</string> </resources> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 2d6a1da8..d50f9dd6 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -77,5 +77,6 @@ <string name="allPerms" msgid="1024385515840703981">"Zote"</string> <string name="privacyPerms" msgid="1850527049572617">"Faragha"</string> <string name="devicePerms" msgid="6733560207731294504">"Kifaa cha Ufikivu"</string> - <string name="no_new_perms" msgid="6657813692169565975">"Sasishi hii haihitaji vibali vipya.."</string> + <string name="no_new_perms" msgid="6657813692169565975">"Sasisho hili halihitaji vibali vipya."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Je, unataka kupeana idhini zifuatazo? Itakuwa na ufikiaji kwa:"</string> </resources> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index e6176540..07e789c2 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"ข้อมูลส่วนบุคคล"</string> <string name="devicePerms" msgid="6733560207731294504">"การเข้าถึงอุปกรณ์"</string> <string name="no_new_perms" msgid="6657813692169565975">"การอัปเดตนี้ไม่จำเป็นต้องมีการอนุญาตใหม่"</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"คุณต้องการให้อนุญาตรายการต่อไปนี้หรือไม่ ระบบจะให้สิทธิ์การเข้าถึงแก่"</string> </resources> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 8b93d729..efe916e3 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Privacy"</string> <string name="devicePerms" msgid="6733560207731294504">"Access sa Device"</string> <string name="no_new_perms" msgid="6657813692169565975">"Walang kinakailangang mga bagong pagpapahintulot ang update na ito."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Gusto mo bang ibigay ang mga sumusunod na pahintulot? Magkakaroon ito ng access sa:"</string> </resources> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index e9be8d69..24be82a8 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Gizlilik"</string> <string name="devicePerms" msgid="6733560207731294504">"Cihaz Erişimi"</string> <string name="no_new_perms" msgid="6657813692169565975">"Bu güncelleme yeni izin gerektirmiyor."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Aşağıdaki izinleri vermek istiyor musunuz? Şunlara erişebilecektir:"</string> </resources> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 761ee94f..76cddf9a 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -47,7 +47,7 @@ <string name="unknown_apps_dlg_text" product="tablet" msgid="7504186369474734767">"Задля безпеки планшет. ПК налаштовано блокувати встановлення програм, отриманих із невідомих джерел."</string> <string name="unknown_apps_dlg_text" product="default" msgid="133213135679009316">"Задля безпеки ваш телефон налаштовано блокувати встановлення програм, отриманих із невідомих джерел."</string> <string name="ok" msgid="3468756155452870475">"OK"</string> - <string name="settings" msgid="6743583734099755409">"Налаштув-ня"</string> + <string name="settings" msgid="6743583734099755409">"Налаштування"</string> <string name="allow_source_dlg_title" msgid="7568985073502399415">"Нове джерело для програм"</string> <string name="allow_source_dlg_text" msgid="3927580956764099076">"<xliff:g id="APP_NAME">%1$s</xliff:g> хоче встановити інші програми. "\n\n"Дозволити це зараз і надалі?"</string> <string name="manage_applications" msgid="4033876279091996596">"Керувати програмами"</string> @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Конфіденційність"</string> <string name="devicePerms" msgid="6733560207731294504">"Доступ до пристрою"</string> <string name="no_new_perms" msgid="6657813692169565975">"Для цього оновлення не потрібні нові дозволи."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Надати перелічені нижче дозволи? Програма отримає доступ до:"</string> </resources> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index c228bc05..c17c32f0 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Bảo mật"</string> <string name="devicePerms" msgid="6733560207731294504">"Truy cập thiết bị"</string> <string name="no_new_perms" msgid="6657813692169565975">"Bản cập nhật này không yêu cầu quyền mới."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Bạn có muốn cấp quyền sau không? Ứng dụng sẽ có quyền truy cập:"</string> </resources> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 4ea1f2b2..e6b49d8a 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -25,10 +25,10 @@ <string name="unknown" msgid="4742479012767208045">"未知"</string> <string name="installing" msgid="8613631001631998372">"正在安装..."</string> <string name="install_done" msgid="3682715442154357097">"应用已安装。"</string> - <string name="install_confirm_question" msgid="7295206719219043890">"您要安装此应用吗?它将获得以下方面的权限:"</string> + <string name="install_confirm_question" msgid="7295206719219043890">"要安装此应用吗?它将获得以下权限:"</string> <string name="install_confirm_question_no_perms" msgid="5918305641302873520">"您要安装此应用吗?该应用不需要任何特殊的访问权限。"</string> - <string name="install_confirm_question_update" msgid="4624159567361487964">"您要安装针对此现有应用的更新吗?您的现有数据不会丢失。更新后的应用将可以访问:"</string> - <string name="install_confirm_question_update_system" msgid="1302330093676416336">"您要安装针对此内置应用的更新吗?您的现有数据不会丢失。更新后的应用将可以访问:"</string> + <string name="install_confirm_question_update" msgid="4624159567361487964">"您要安装此应用的新版本吗?您现有的数据不会丢失。更新后的应用将具备以下权限:"</string> + <string name="install_confirm_question_update_system" msgid="1302330093676416336">"您要安装此内置应用的新版本吗?您现有的数据不会丢失。更新后的应用将具备以下权限:"</string> <string name="install_confirm_question_update_no_perms" msgid="4885928136844618944">"是否要为这一现有应用安装更新?您现有的数据不会丢失,且安装过程无需任何特殊权限。"</string> <string name="install_confirm_question_update_system_no_perms" msgid="7676593512694724374">"是否要为这一内置应用安装更新?您现有的数据不会丢失,且安装过程无需任何特殊权限。"</string> <string name="install_failed" msgid="6579998651498970899">"应用未安装。"</string> @@ -77,5 +77,6 @@ <string name="allPerms" msgid="1024385515840703981">"全部"</string> <string name="privacyPerms" msgid="1850527049572617">"隐私相关权限"</string> <string name="devicePerms" msgid="6733560207731294504">"设备相关权限"</string> - <string name="no_new_perms" msgid="6657813692169565975">"此更新不需要任何新的权限。"</string> + <string name="no_new_perms" msgid="6657813692169565975">"新版本不需要任何新的权限。"</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"要向该应用授予以下权限吗?"</string> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 2f6d98b9..1c438204 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"隱私權"</string> <string name="devicePerms" msgid="6733560207731294504">"裝置存取權"</string> <string name="no_new_perms" msgid="6657813692169565975">"這項更新不需新權限。"</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"您要授予下列權限嗎?將會開放下列存取權:"</string> </resources> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index ea419e1d..c26efc58 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -78,4 +78,5 @@ <string name="privacyPerms" msgid="1850527049572617">"Ubumfihlo"</string> <string name="devicePerms" msgid="6733560207731294504">"Ukufinyelela kwedivayisi"</string> <string name="no_new_perms" msgid="6657813692169565975">"Lesi sibuyekezo asidingi zimvume."</string> + <string name="grant_confirm_question" msgid="4690289297029223742">"Ufuna ukunikeza lezi zimvume ezilandelayo? Izothola ukufinyelela ku-:"</string> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index db43792a..a43af793 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -142,4 +142,8 @@ <!-- Body text for new tab when there are no new permissions [CHAR LIMIT=NONE] --> <string name="no_new_perms">This update requires no new permissions.</string> + + <string name="grant_confirm_question">Do you want to grant the following permissions? + It will get access to:</string> + </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 5a5cb7e0..f935675f 100755 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -16,8 +16,8 @@ <resources> <style name="padded"> - <item name="android:paddingLeft">16dip</item> - <item name="android:paddingRight">16dip</item> + <item name="android:paddingStart">16dip</item> + <item name="android:paddingEnd">16dip</item> </style> <style name="DialogWhenLarge" parent="@android:style/Theme.DeviceDefault.NoActionBar"> </style> diff --git a/src/com/android/packageinstaller/GrantActivity.java b/src/com/android/packageinstaller/GrantActivity.java new file mode 100644 index 00000000..a3f7f5c9 --- /dev/null +++ b/src/com/android/packageinstaller/GrantActivity.java @@ -0,0 +1,229 @@ +/* +** Copyright 2013, 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.packageinstaller; + +import android.app.Activity; +import android.content.Context; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.PermissionInfo; +import android.os.Bundle; +import android.support.v4.view.ViewPager; +import android.view.LayoutInflater; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.ViewGroup; +import android.widget.AppSecurityPermissions; +import android.widget.Button; +import android.widget.TabHost; +import android.widget.TextView; + +import java.util.ArrayList; +import java.util.List; + +/* + * The activity which is responsible for asking the user to grant permissions + * to applications. + */ +public class GrantActivity extends Activity implements OnClickListener { + private Button mOk; + private Button mCancel; + private PackageManager mPm; + private String mRequestingPackage; + private String[] requested_permissions; + + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + mPm = getPackageManager(); + mRequestingPackage = this.getCallingPackage(); + + requested_permissions = getRequestedPermissions(); + if (requested_permissions.length == 0) { + // The grant request was empty. Return success + setResult(RESULT_OK); + finish(); + return; + } + + PackageInfo pkgInfo = getUpdatedPackageInfo(); + AppSecurityPermissions perms = new AppSecurityPermissions(this, pkgInfo); + if (perms.getPermissionCount(AppSecurityPermissions.WHICH_NEW) == 0) { + // The updated permissions dialog said there are no new permissions. + // This should never occur if requested_permissions.length > 0, + // but we check for it anyway, just in case. + setResult(RESULT_OK); + finish(); + return; + } + + setContentView(R.layout.install_start); + ((TextView)findViewById(R.id.install_confirm_question)).setText(R.string.grant_confirm_question); + PackageUtil.AppSnippet as = new PackageUtil.AppSnippet(mPm.getApplicationLabel(pkgInfo.applicationInfo), + mPm.getApplicationIcon(pkgInfo.applicationInfo)); + PackageUtil.initSnippetForNewApp(this, as, R.id.app_snippet); + mOk = (Button)findViewById(R.id.ok_button); + mOk.setText(R.string.ok); + mCancel = (Button)findViewById(R.id.cancel_button); + mOk.setOnClickListener(this); + mCancel.setOnClickListener(this); + + TabHost tabHost = (TabHost)findViewById(android.R.id.tabhost); + tabHost.setup(); + ViewPager viewPager = (ViewPager) findViewById(R.id.pager); + TabsAdapter adapter = new TabsAdapter(this, tabHost, viewPager); + + View newTab = perms.getPermissionsView(AppSecurityPermissions.WHICH_NEW); + View allTab = getPermissionList(perms); + + adapter.addTab(tabHost.newTabSpec("new").setIndicator( + getText(R.string.newPerms)), newTab); + adapter.addTab(tabHost.newTabSpec("all").setIndicator( + getText(R.string.allPerms)), allTab); + } + + /** + * Returns a PackageInfo object representing the results of adding all the permissions + * in {@code requested_permissions} to {@code mRequestingPackage}. This is the package + * permissions the user will have if they accept the grant request. + */ + private PackageInfo getUpdatedPackageInfo() { + try { + PackageInfo pkgInfo = mPm.getPackageInfo(mRequestingPackage, PackageManager.GET_PERMISSIONS); + for (int i = 0; i < pkgInfo.requestedPermissions.length; i++) { + for (String requested_permission : requested_permissions) { + if (requested_permission.equals(pkgInfo.requestedPermissions[i])) { + pkgInfo.requestedPermissionsFlags[i] |= PackageInfo.REQUESTED_PERMISSION_GRANTED; + } + } + } + + return pkgInfo; + } catch (NameNotFoundException e) { + throw new RuntimeException(e); // will never occur + } + } + + private View getPermissionList(AppSecurityPermissions perms) { + LayoutInflater inflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE); + View root = inflater.inflate(R.layout.permissions_list, null); + View personalPermissions = perms.getPermissionsView(AppSecurityPermissions.WHICH_PERSONAL); + View devicePermissions = perms.getPermissionsView(AppSecurityPermissions.WHICH_DEVICE); + + ((ViewGroup)root.findViewById(R.id.privacylist)).addView(personalPermissions); + ((ViewGroup)root.findViewById(R.id.devicelist)).addView(devicePermissions); + + return root; + } + + /** + * Return an array of permissions requested by the caller, filtered to exclude + * irrelevant or otherwise malicious permission requests from untrusted callers. + */ + private String[] getRequestedPermissions() { + String[] permissions = getIntent() + .getStringArrayExtra(PackageManager.EXTRA_REQUEST_PERMISSION_PERMISSION_LIST); + if (permissions == null) { + return new String[0]; + } + permissions = keepNormalDangerousPermissions(permissions); + permissions = keepRequestingPackagePermissions(permissions); + return permissions; + + } + + /** + * Remove any permissions in {@code permissions} which are not present + * in {@code mRequestingPackage} and return the result. We also filter out + * permissions which are required by {@code mRequestingPackage}, and permissions + * which have already been granted to {@code mRequestingPackage}, as those permissions + * are useless to change. + */ + private String[] keepRequestingPackagePermissions(String[] permissions) { + List<String> result = new ArrayList<String>(); + try { + PackageInfo pkgInfo = mPm.getPackageInfo(mRequestingPackage, PackageManager.GET_PERMISSIONS); + if (pkgInfo.requestedPermissions == null) { + return new String[0]; + } + for (int i = 0; i < pkgInfo.requestedPermissions.length; i++) { + for (String permission : permissions) { + final boolean isRequired = + ((pkgInfo.requestedPermissionsFlags[i] + & PackageInfo.REQUESTED_PERMISSION_REQUIRED) != 0); + final boolean isGranted = + ((pkgInfo.requestedPermissionsFlags[i] + & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0); + + /* + * We ignore required permissions, and permissions which have already + * been granted, as it's useless to grant those permissions. + */ + if (permission.equals(pkgInfo.requestedPermissions[i]) + && !isRequired && !isGranted) { + result.add(permission); + break; + } + } + } + } catch (NameNotFoundException e) { + throw new RuntimeException(e); // should never happen + } + return result.toArray(new String[result.size()]); + } + + /** + * Filter the permissions in {@code permissions}, keeping only the NORMAL or DANGEROUS + * permissions. + * + * @param permissions the permissions to filter + * @return A subset of {@code permissions} with only the + * NORMAL or DANGEROUS permissions kept + */ + private String[] keepNormalDangerousPermissions(String[] permissions) { + List<String> result = new ArrayList<String>(); + for (String permission : permissions) { + try { + PermissionInfo pInfo = mPm.getPermissionInfo(permission, 0); + final int base = pInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE; + if ((base != PermissionInfo.PROTECTION_NORMAL) + && (base != PermissionInfo.PROTECTION_DANGEROUS)) { + continue; + } + result.add(permission); + } catch (NameNotFoundException e) { + // ignore + } + } + return result.toArray(new String[result.size()]); + } + + @Override + public void onClick(View v) { + if (v == mOk) { + for (String permission : requested_permissions) { + mPm.grantPermission(mRequestingPackage, permission); + } + setResult(RESULT_OK); + } + if (v == mCancel) { + setResult(RESULT_CANCELED); + } + finish(); + } +} diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java index fc820782..71c792ee 100755 --- a/src/com/android/packageinstaller/InstallAppProgress.java +++ b/src/com/android/packageinstaller/InstallAppProgress.java @@ -24,6 +24,7 @@ import android.content.DialogInterface.OnCancelListener; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.IPackageInstallObserver; +import android.content.pm.ManifestDigest; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; @@ -54,6 +55,8 @@ import java.util.List; public class InstallAppProgress extends Activity implements View.OnClickListener, OnCancelListener { private final String TAG="InstallAppProgress"; private boolean localLOGV = false; + static final String EXTRA_MANIFEST_DIGEST = + "com.android.packageinstaller.extras.manifest_digest"; private ApplicationInfo mAppInfo; private Uri mPackageURI; private ProgressBar mProgressBar; @@ -254,8 +257,9 @@ public class InstallAppProgress extends Activity implements View.OnClickListener Uri referrer = getIntent().getParcelableExtra(Intent.EXTRA_REFERRER); int originatingUid = getIntent().getIntExtra(Intent.EXTRA_ORIGINATING_UID, VerificationParams.NO_UID); + ManifestDigest manifestDigest = getIntent().getParcelableExtra(EXTRA_MANIFEST_DIGEST); VerificationParams verificationParams = new VerificationParams(null, originatingURI, - referrer, originatingUid, null); + referrer, originatingUid, manifestDigest); PackageInstallObserver observer = new PackageInstallObserver(); if ("package".equals(mPackageURI.getScheme())) { diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 4a6db210..afe6e012 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -26,17 +26,16 @@ import android.content.DialogInterface.OnCancelListener; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; +import android.content.pm.ManifestDigest; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; -import android.content.pm.PackageUserState; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageParser; +import android.content.pm.PackageUserState; import android.content.pm.VerificationParams; -import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; import android.provider.Settings; -import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.util.Log; import android.view.LayoutInflater; @@ -45,13 +44,10 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.AppSecurityPermissions; import android.widget.Button; -import android.widget.ScrollView; import android.widget.TabHost; -import android.widget.TabWidget; import android.widget.TextView; import java.io.File; -import java.util.ArrayList; /* * This activity is launched when a new application is installed via side loading @@ -69,6 +65,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen private Uri mOriginatingURI; private Uri mReferrerURI; private int mOriginatingUid = VerificationParams.NO_UID; + private ManifestDigest mPkgDigest; private boolean localLOGV = false; PackageManager mPm; @@ -96,132 +93,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen private static final int DLG_INSTALL_ERROR = DLG_BASE + 4; private static final int DLG_ALLOW_SOURCE = DLG_BASE + 5; - /** - * This is a helper class that implements the management of tabs and all - * details of connecting a ViewPager with associated TabHost. It relies on a - * trick. Normally a tab host has a simple API for supplying a View or - * Intent that each tab will show. This is not sufficient for switching - * between pages. So instead we make the content part of the tab host - * 0dp high (it is not shown) and the TabsAdapter supplies its own dummy - * view to show as the tab content. It listens to changes in tabs, and takes - * care of switch to the correct paged in the ViewPager whenever the selected - * tab changes. - */ - public static class TabsAdapter extends PagerAdapter - implements TabHost.OnTabChangeListener, ViewPager.OnPageChangeListener { - private final Context mContext; - private final TabHost mTabHost; - private final ViewPager mViewPager; - private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>(); - private final Rect mTempRect = new Rect(); - - static final class TabInfo { - private final String tag; - private final View view; - - TabInfo(String _tag, View _view) { - tag = _tag; - view = _view; - } - } - - static class DummyTabFactory implements TabHost.TabContentFactory { - private final Context mContext; - - public DummyTabFactory(Context context) { - mContext = context; - } - - @Override - public View createTabContent(String tag) { - View v = new View(mContext); - v.setMinimumWidth(0); - v.setMinimumHeight(0); - return v; - } - } - - public TabsAdapter(Activity activity, TabHost tabHost, ViewPager pager) { - mContext = activity; - mTabHost = tabHost; - mViewPager = pager; - mTabHost.setOnTabChangedListener(this); - mViewPager.setAdapter(this); - mViewPager.setOnPageChangeListener(this); - } - - public void addTab(TabHost.TabSpec tabSpec, View view) { - tabSpec.setContent(new DummyTabFactory(mContext)); - String tag = tabSpec.getTag(); - - TabInfo info = new TabInfo(tag, view); - mTabs.add(info); - mTabHost.addTab(tabSpec); - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mTabs.size(); - } - - @Override - public Object instantiateItem(ViewGroup container, int position) { - View view = mTabs.get(position).view; - container.addView(view); - return view; - } - - @Override - public void destroyItem(ViewGroup container, int position, Object object) { - container.removeView((View)object); - } - - @Override - public boolean isViewFromObject(View view, Object object) { - return view == object; - } - - @Override - public void onTabChanged(String tabId) { - int position = mTabHost.getCurrentTab(); - mViewPager.setCurrentItem(position); - } - - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - } - - @Override - public void onPageSelected(int position) { - // Unfortunately when TabHost changes the current tab, it kindly - // also takes care of putting focus on it when not in touch mode. - // The jerk. - // This hack tries to prevent this from pulling focus out of our - // ViewPager. - TabWidget widget = mTabHost.getTabWidget(); - int oldFocusability = widget.getDescendantFocusability(); - widget.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS); - mTabHost.setCurrentTab(position); - widget.setDescendantFocusability(oldFocusability); - - // Scroll the current tab into visibility if needed. - View tab = widget.getChildTabViewAt(position); - mTempRect.set(tab.getLeft(), tab.getTop(), tab.getRight(), tab.getBottom()); - widget.requestRectangleOnScreen(mTempRect, false); - - // Make sure the scrollbars are visible for a moment after selection - final View contentView = mTabs.get(position).view; - if (contentView instanceof CaffeinatedScrollView) { - ((CaffeinatedScrollView) contentView).awakenScrollBars(); - } - } - - @Override - public void onPageScrollStateChanged(int state) { - } - } - private void startInstallConfirm() { TabHost tabHost = (TabHost)findViewById(android.R.id.tabhost); tabHost.setup(); @@ -520,6 +391,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen mPkgInfo = PackageParser.generatePackageInfo(parsed, null, PackageManager.GET_PERMISSIONS, 0, 0, null, new PackageUserState()); + mPkgDigest = parsed.manifestDigest; as = PackageUtil.getAppSnippet(this, mPkgInfo.applicationInfo, sourceFile); } @@ -656,6 +528,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen mPkgInfo.applicationInfo); newIntent.setData(mPackageURI); newIntent.setClass(this, InstallAppProgress.class); + newIntent.putExtra(InstallAppProgress.EXTRA_MANIFEST_DIGEST, mPkgDigest); String installerPackageName = getIntent().getStringExtra( Intent.EXTRA_INSTALLER_PACKAGE_NAME); if (mOriginatingURI != null) { diff --git a/src/com/android/packageinstaller/PackageUtil.java b/src/com/android/packageinstaller/PackageUtil.java index 8681bfc7..650e7fb1 100644 --- a/src/com/android/packageinstaller/PackageUtil.java +++ b/src/com/android/packageinstaller/PackageUtil.java @@ -72,8 +72,12 @@ public class PackageUtil { metrics.setToDefaults(); PackageParser.Package pkg = packageParser.parsePackage(sourceFile, archiveFilePath, metrics, 0); - // Nuke the parser reference. - packageParser = null; + if (pkg == null) { + return null; + } + if (!packageParser.collectManifestDigest(pkg)) { + return null; + } return pkg; } diff --git a/src/com/android/packageinstaller/TabsAdapter.java b/src/com/android/packageinstaller/TabsAdapter.java new file mode 100644 index 00000000..3509e092 --- /dev/null +++ b/src/com/android/packageinstaller/TabsAdapter.java @@ -0,0 +1,155 @@ +/* +** +** Copyright 2013, 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.packageinstaller; + +import android.app.Activity; +import android.content.Context; +import android.graphics.Rect; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TabHost; +import android.widget.TabWidget; + +import java.util.ArrayList; + +/** + * This is a helper class that implements the management of tabs and all + * details of connecting a ViewPager with associated TabHost. It relies on a + * trick. Normally a tab host has a simple API for supplying a View or + * Intent that each tab will show. This is not sufficient for switching + * between pages. So instead we make the content part of the tab host + * 0dp high (it is not shown) and the TabsAdapter supplies its own dummy + * view to show as the tab content. It listens to changes in tabs, and takes + * care of switch to the correct paged in the ViewPager whenever the selected + * tab changes. + */ +public class TabsAdapter extends PagerAdapter + implements TabHost.OnTabChangeListener, ViewPager.OnPageChangeListener { + private final Context mContext; + private final TabHost mTabHost; + private final ViewPager mViewPager; + private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>(); + private final Rect mTempRect = new Rect(); + + static final class TabInfo { + private final String tag; + private final View view; + + TabInfo(String _tag, View _view) { + tag = _tag; + view = _view; + } + } + + static class DummyTabFactory implements TabHost.TabContentFactory { + private final Context mContext; + + public DummyTabFactory(Context context) { + mContext = context; + } + + @Override + public View createTabContent(String tag) { + View v = new View(mContext); + v.setMinimumWidth(0); + v.setMinimumHeight(0); + return v; + } + } + + public TabsAdapter(Activity activity, TabHost tabHost, ViewPager pager) { + mContext = activity; + mTabHost = tabHost; + mViewPager = pager; + mTabHost.setOnTabChangedListener(this); + mViewPager.setAdapter(this); + mViewPager.setOnPageChangeListener(this); + } + + public void addTab(TabHost.TabSpec tabSpec, View view) { + tabSpec.setContent(new DummyTabFactory(mContext)); + String tag = tabSpec.getTag(); + + TabInfo info = new TabInfo(tag, view); + mTabs.add(info); + mTabHost.addTab(tabSpec); + notifyDataSetChanged(); + } + + @Override + public int getCount() { + return mTabs.size(); + } + + @Override + public Object instantiateItem(ViewGroup container, int position) { + View view = mTabs.get(position).view; + container.addView(view); + return view; + } + + @Override + public void destroyItem(ViewGroup container, int position, Object object) { + container.removeView((View)object); + } + + @Override + public boolean isViewFromObject(View view, Object object) { + return view == object; + } + + @Override + public void onTabChanged(String tabId) { + int position = mTabHost.getCurrentTab(); + mViewPager.setCurrentItem(position); + } + + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + } + + @Override + public void onPageSelected(int position) { + // Unfortunately when TabHost changes the current tab, it kindly + // also takes care of putting focus on it when not in touch mode. + // The jerk. + // This hack tries to prevent this from pulling focus out of our + // ViewPager. + TabWidget widget = mTabHost.getTabWidget(); + int oldFocusability = widget.getDescendantFocusability(); + widget.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS); + mTabHost.setCurrentTab(position); + widget.setDescendantFocusability(oldFocusability); + + // Scroll the current tab into visibility if needed. + View tab = widget.getChildTabViewAt(position); + mTempRect.set(tab.getLeft(), tab.getTop(), tab.getRight(), tab.getBottom()); + widget.requestRectangleOnScreen(mTempRect, false); + + // Make sure the scrollbars are visible for a moment after selection + final View contentView = mTabs.get(position).view; + if (contentView instanceof CaffeinatedScrollView) { + ((CaffeinatedScrollView) contentView).awakenScrollBars(); + } + } + + @Override + public void onPageScrollStateChanged(int state) { + } +} |