am 0663d1d9: am fd1e757f: Update imports to android-common
Merge commit '0663d1d90dc943e8bfaadb27f270f600d7d2e0a0'
* commit '0663d1d90dc943e8bfaadb27f270f600d7d2e0a0':
Update imports to android-common
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a591ff7..6890e26 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="4588446541914685904">"Složka"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Vybrat tapetu ze složky"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Nastavit tapetu"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Galerie tapet"</string>
<string name="activity_not_found" msgid="3571057450431950427">"Aplikace není v telefonu nainstalována."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurace..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Název složky"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Přejmenovat složku"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"zápis nastavení a odkazů plochy"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Povoluje aplikaci změnit nastavení a odkazy plochy."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Problém s načtením widgetu"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ec98ea6..6e04539 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Android-kerneprogrammer"</string>
<string name="folder_name" msgid="4588446541914685904">"Mappe"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Vælg tapet fra"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Angiv tapet"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Tapetgalleri"</string>
<string name="activity_not_found" msgid="3571057450431950427">"Programmet er ikke installeret på din telefon."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurer ..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Mappenavn"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Omdøb mappe"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"skriv indstillinger og genveje for Start"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Tillader et program at ændre indstillingerne og genvejene i Start."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Der er problemer med at indlæse widget"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 48b5944..d1df5d3 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="4588446541914685904">"Ordner"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Hintergrund auswählen"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Hintergrund festlegen"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Galerie"</string>
<string name="activity_not_found" msgid="3571057450431950427">"Anwendung ist nicht auf dem Telefon installiert."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurieren..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Ordnername"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Ordner umbenennen"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"Einstellungen und Shortcuts für Startseite schreiben"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Ermöglicht einer Anwendung, die Einstellungen und Shortcuts auf der Startseite zu ändern."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Problem beim Laden des Widgets"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7a6a108..6cfa373 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Βασικές εφαρμογές Android"</string>
<string name="folder_name" msgid="4588446541914685904">"Φάκελος"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Επιλογή ταπετσαρίας από"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Ορισμός ταπετσαρίας"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Συλλογή ταπετσαριών"</string>
<string name="activity_not_found" msgid="3571057450431950427">"Η εφαρμογή δεν έχει εγκατασταθεί στο τηλέφωνό σας."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Διαμόρφωση..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Όνομα φακέλου"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Μετονομασία φακέλου"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"εγγραφή ρυθμίσεων και συντομεύσεων αρχικής οθόνης"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Επιτρέπει σε μια εφαρμογή την αλλαγή των ρυθμίσεων και των συντομεύσεων στην αρχική οθόνη."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Παρουσιάστηκε πρόβλημα στη φόρτωση του γραφικού στοιχείου"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ef6720b..06dc273 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -22,6 +22,7 @@
<string name="wallpaper_instructions" msgid="4215640646180727542">"Definir papel tapiz"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Galería de papel tapiz"</string>
<string name="activity_not_found" msgid="3571057450431950427">"La aplicación no está instalada en tu computadora."</string>
+ <string name="live_wallpaper_picker_title" msgid="7738370557178100072">"Fondo de pantalla animado"</string>
<string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Nombre de carpeta"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Cambiar nombre de carpeta"</string>
@@ -58,4 +59,6 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"escribir configuración y accesos directos de la página principal"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Permite a una aplicación cambiar la configuración y los accesos directos de la página principal."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Problema al cargar el widget"</string>
+ <string name="live_wallpaper_empty" msgid="4278728108785853407">"No hay ningún fondo de pantalla animado."</string>
+ <string name="set_live_wallpaper" msgid="2381437614949033266">"Establecer fondo de pantalla"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 23a3eb4..6864f10 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Aplicaciones básicas de Android"</string>
<string name="folder_name" msgid="4588446541914685904">"Carpeta"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Seleccionar fondo de pantalla de"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Establecer fondo de pantalla"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Galería de fondos de pantalla"</string>
<string name="activity_not_found" msgid="3571057450431950427">"La aplicación no está instalada en el teléfono."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Nombre de carpeta"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Cambiar nombre de carpeta"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"escribir información de accesos directos y de configuración de la página principal"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Permite que una aplicación modifique la configuración y los accesos directos de la página principal."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Problema al cargar el widget"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index de5023c..41a3478 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Applications de base Android"</string>
<string name="folder_name" msgid="4588446541914685904">"Dossier"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Sélectionner à partir de..."</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Sélectionner"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Galerie"</string>
<string name="activity_not_found" msgid="3571057450431950427">"L\'application n\'est pas installée sur votre téléphone."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Configurer..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Nom du dossier"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Renommer le dossier"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"Enregistrer les paramètres de la page d\'accueil et des raccourcis"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Permet à une application de modifier les paramètres et les raccourcis de la page d\'accueil."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Problème lors du chargement du widget"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 485bd8a..bf215da 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="4588446541914685904">"Cartella"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Seleziona sfondo da"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Imposta sfondo"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Galleria sfondi"</string>
<string name="activity_not_found" msgid="3571057450431950427">"Applicazione non installata sul telefono."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Configura..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Nome cartella"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Rinomina cartella"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"creare impostazioni e scorciatoie in Home"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Consente a un\'applicazione di modificare le impostazioni e le scorciatoie in Home."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Errore durante il caricamento del widget"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e5209c9..bcef3d6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="4588446541914685904">"フォルダ"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"壁紙を選択"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"壁紙に設定"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"壁紙ギャラリー"</string>
<string name="activity_not_found" msgid="3571057450431950427">"アプリケーションがインストールされていません。"</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"設定..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"フォルダ名"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"フォルダ名を変更"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"ホームの設定とショートカットの書き込み"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"ホームの設定とショートカットの変更をアプリケーションに許可します。"</string>
<string name="gadget_error_text" msgid="8359351016167075858">"ウィジェットを表示できません"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b3442f9..8c10744 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Android Core 애플리케이션"</string>
<string name="folder_name" msgid="4588446541914685904">"폴더"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"배경화면 선택"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"배경화면 설정"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"배경화면 갤러리"</string>
<string name="activity_not_found" msgid="3571057450431950427">"휴대전화에 설치되어 있지 않은 응용프로그램입니다."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"구성..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"폴더 이름"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"폴더 이름 바꾸기"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"홈 설정 및 바로가기 쓰기"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"응용프로그램이 홈에 있는 설정 및 바로가기를 변경할 수 있도록 합니다."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"위젯을 로드하는 중 문제가 발생했습니다."</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 20df495..03c3228 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"Hjem"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Android-kjerneapplikasjoner"</string>
<string name="folder_name" msgid="4588446541914685904">"Mappe"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Velg bakgrunnsbilde fra"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Velg bakgrunnsbilde"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Bildegalleri"</string>
<string name="activity_not_found" msgid="3571057450431950427">"Applikasjonen er ikke installert."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurer"</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Mappenavn"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Gi nytt navn til mappe"</string>
@@ -40,7 +43,7 @@
<string name="out_of_space" msgid="8365249326091984698">"Ikke nok plass på skrivebordet."</string>
<string name="shortcut_installed" msgid="7071557296331322355">"Opprettet snarveien «<xliff:g id="NAME">%s</xliff:g>»."</string>
<string name="shortcut_uninstalled" msgid="2129499669449749995">"Fjernet snarveien «<xliff:g id="NAME">%s</xliff:g>»."</string>
- <string name="shortcut_duplicate" msgid="4757756326465060694">"Snarveien «<xliff:g id="NAME">%s</xliff:g>» fins allerede."</string>
+ <string name="shortcut_duplicate" msgid="4757756326465060694">"Snarveien «<xliff:g id="NAME">%s</xliff:g>» finnes allerede."</string>
<string name="title_select_shortcut" msgid="2858897527672831763">"Velg snarvei"</string>
<string name="title_select_live_folder" msgid="3753447798805166749">"Velg mappe"</string>
<string name="menu_add" msgid="3065046628354640854">"Legg til"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"skrive skrivebordsinnstillinger og -snarveier"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Lar applikasjonen endre innstillinger og snarveier på skrivebordet."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Problem under lasting av gadget"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 892e405..4df6546 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Android-kerntoepassingen"</string>
<string name="folder_name" msgid="4588446541914685904">"Map"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Achtergrond selecteren in"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Achtergrond instellen"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Achtergrondgalerij"</string>
<string name="activity_not_found" msgid="3571057450431950427">"Deze toepassing is niet geïnstalleerd op uw telefoon."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Configureren..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Mapnaam"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Naam van map wijzigen"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"instellingen en snelkoppelingen voor de startpagina schrijven"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Hiermee kan een toepassing de instellingen en snelkoppelingen op de startpagina wijzigen."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Probleem bij het laden van widget"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9710038..47e7059 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Aplikacje główne systemu Android"</string>
<string name="folder_name" msgid="4588446541914685904">"Folder"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Wybierz tapetę"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Ustaw tapetę"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Galeria tapet"</string>
<string name="activity_not_found" msgid="3571057450431950427">"Aplikacja nie jest zainstalowana w telefonie."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Konfiguruj..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Nazwa folderu"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Zmień nazwę folderu"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"zapisywanie ustawień i skrótów strony głównej"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Umożliwia aplikacji zmianę ustawień i skrótów strony głównej."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Problem podczas ładowania widżetu"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index bc6256a..f17c1a8 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Aplicações Principais do Android"</string>
<string name="folder_name" msgid="4588446541914685904">"Pasta"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Seleccionar imagem de fundo a partir de"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Definir imagem de fundo"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Galeria de imagens de fundo"</string>
<string name="activity_not_found" msgid="3571057450431950427">"A aplicação não está instalada no telefone."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Nome da pasta"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Mudar o nome da pasta"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"escrever definições e atalhos do ecrã principal"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Permite que uma aplicação altere as definições e os atalhos do ecrã principal."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Erro ao carregar o widget"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 49d773a..a89bef8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Principais aplicativos do Android"</string>
<string name="folder_name" msgid="4588446541914685904">"Pasta"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Selecionar papel de parede de"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Definir papel de parede"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Galeria de papel de parede"</string>
<string name="activity_not_found" msgid="3571057450431950427">"O aplicativo não está instalado no seu telefone."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Configurar..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Nome da pasta"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Renomear pasta"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"gravar configurações e atalhos da Página inicial"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Permite que um aplicativo altere as configurações e atalhos na Página inicial."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Problema ao carregar o widget"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 81a839f..ba016d6 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Основные приложения Android"</string>
<string name="folder_name" msgid="4588446541914685904">"Папка"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Выбрать обои из:"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Установить обои"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Фотоальбом: обои"</string>
<string name="activity_not_found" msgid="3571057450431950427">"Приложение не установлено на телефоне."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Настроить..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Название папки"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Переименовать папку"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"изменять настройки и ярлыки главного экрана"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Позволяет приложению изменять настройки и ярлыки на главном экране."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Не удалось загрузить виджет"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f6fe34f..153d663 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="4588446541914685904">"Mapp"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Välj bakgrund från"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Ange bakgrund"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Bakgrundsgalleri"</string>
<string name="activity_not_found" msgid="3571057450431950427">"Programmet är inte installerat på din telefon."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Konfigurera..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Mappnamn"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Byt namn på mapp"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"skriva inställningar och genvägar för startsidan"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Tillåter att ett program ändrar inställningar och genvägar på startsidan."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Det gick inte att läsa in widgeten"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index eda50b1..96f57a7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
<string name="folder_name" msgid="4588446541914685904">"Klasör"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"Buradan duvar kağıdını seçin:"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Duvar kağıdını ayarla"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"Duvar kağıdı galerisi"</string>
<string name="activity_not_found" msgid="3571057450431950427">"Uygulama telefonunuza yüklenmemiş."</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"Yapılandır..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"Klasör adı"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"Klasörü yeniden adlandır"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"Ana Sayfa ayarlarını ve kısayollarını yaz"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"Bir uygulamaya Ana Sayfadaki ayarları ve kısayolları değiştirme izni verir."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Widget yüklenirken sorun oluştu"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 77db80c..8adfbc5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Android 核心应用程序"</string>
<string name="folder_name" msgid="4588446541914685904">"文件夹"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"选择壁纸来源"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"设置壁纸"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"壁纸图库"</string>
<string name="activity_not_found" msgid="3571057450431950427">"您的手机上未安装应用程序。"</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"配置..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"文件夹名称"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"重命名文件夹"</string>
@@ -38,8 +41,8 @@
<string name="add_clock" msgid="2337943840175865746">"时钟"</string>
<string name="add_photo_frame" msgid="3154058437359487954">"相框"</string>
<string name="out_of_space" msgid="8365249326091984698">"此主屏幕上已没有更多空间。"</string>
- <string name="shortcut_installed" msgid="7071557296331322355">"已创建“<xliff:g id="NAME">%s</xliff:g>”快捷方式。"</string>
- <string name="shortcut_uninstalled" msgid="2129499669449749995">"已删除“<xliff:g id="NAME">%s</xliff:g>”快捷方式。"</string>
+ <string name="shortcut_installed" msgid="7071557296331322355">"“<xliff:g id="NAME">%s</xliff:g>”快捷方式已创建。"</string>
+ <string name="shortcut_uninstalled" msgid="2129499669449749995">"“<xliff:g id="NAME">%s</xliff:g>”快捷方式已删除。"</string>
<string name="shortcut_duplicate" msgid="4757756326465060694">"“<xliff:g id="NAME">%s</xliff:g>”快捷方式已存在。"</string>
<string name="title_select_shortcut" msgid="2858897527672831763">"选择快捷方式"</string>
<string name="title_select_live_folder" msgid="3753447798805166749">"选择文件夹"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"写入主屏幕设置和快捷方式"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"允许应用程序更改主屏幕上的设置和快捷方式。"</string>
<string name="gadget_error_text" msgid="8359351016167075858">"载入窗口小部件时出现问题"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index fabb826..dbe82b4 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -15,13 +15,16 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="application_name" msgid="4528470563311667177">"_Launcher2"</string>
+ <!-- no translation found for application_name (4528470563311667177) -->
+ <skip />
<string name="uid_name" msgid="3371120195364560632">"Android 核心應用程式"</string>
<string name="folder_name" msgid="4588446541914685904">"資料夾"</string>
<string name="chooser_wallpaper" msgid="5988031014201479733">"從…選取桌布"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"設定桌布"</string>
<string name="pick_wallpaper" msgid="2674908923379130941">"桌布集"</string>
<string name="activity_not_found" msgid="3571057450431950427">"應用程式未安裝到手機。"</string>
+ <!-- no translation found for live_wallpaper_picker_title (7738370557178100072) -->
+ <skip />
<string name="configure_wallpaper" msgid="2820186271419674623">"設定..."</string>
<string name="rename_folder_label" msgid="5646236631298452787">"資料夾名稱"</string>
<string name="rename_folder_title" msgid="4544573104191526550">"重新命名資料夾"</string>
@@ -40,7 +43,7 @@
<string name="out_of_space" msgid="8365249326091984698">"首頁已無空間"</string>
<string name="shortcut_installed" msgid="7071557296331322355">"已建立「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
<string name="shortcut_uninstalled" msgid="2129499669449749995">"已移除「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
- <string name="shortcut_duplicate" msgid="4757756326465060694">"「<xliff:g id="NAME">%s</xliff:g>」捷徑已經存在。"</string>
+ <string name="shortcut_duplicate" msgid="4757756326465060694">"已有「<xliff:g id="NAME">%s</xliff:g>」捷徑。"</string>
<string name="title_select_shortcut" msgid="2858897527672831763">"選取捷徑"</string>
<string name="title_select_live_folder" msgid="3753447798805166749">"選取資料夾"</string>
<string name="menu_add" msgid="3065046628354640854">"新增"</string>
@@ -58,4 +61,8 @@
<string name="permlab_write_settings" msgid="1360567537236705628">"寫入首頁設定和捷徑"</string>
<string name="permdesc_write_settings" msgid="1098648778383349818">"允許應用程式變更首頁中的設定和捷徑。"</string>
<string name="gadget_error_text" msgid="8359351016167075858">"載入小工具時發生問題"</string>
+ <!-- no translation found for live_wallpaper_empty (4278728108785853407) -->
+ <skip />
+ <!-- no translation found for set_live_wallpaper (2381437614949033266) -->
+ <skip />
</resources>
diff --git a/src/com/android/launcher2/ActivityPicker.java b/src/com/android/launcher2/ActivityPicker.java
deleted file mode 100644
index b6da08e..0000000
--- a/src/com/android/launcher2/ActivityPicker.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * Copyright (C) 2009 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.launcher2;
-
-import com.android.internal.app.AlertActivity;
-import com.android.internal.app.AlertController;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.Intent.ShortcutIconResource;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PaintFlagsDrawFilter;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.PaintDrawable;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Displays a list of all activities matching the incoming
- * {@link android.content.Intent#EXTRA_INTENT} query, along with any injected items.
- */
-public class ActivityPicker extends AlertActivity implements
- DialogInterface.OnClickListener, DialogInterface.OnCancelListener {
-
- /**
- * Adapter of items that are displayed in this dialog.
- */
- private PickAdapter mAdapter;
-
- /**
- * Base {@link android.content.Intent} used when building list.
- */
- private Intent mBaseIntent;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- final Intent intent = getIntent();
-
- // Read base intent from extras, otherwise assume default
- Parcelable parcel = intent.getParcelableExtra(Intent.EXTRA_INTENT);
- if (parcel instanceof Intent) {
- mBaseIntent = (Intent) parcel;
- } else {
- mBaseIntent = new Intent(Intent.ACTION_MAIN, null);
- mBaseIntent.addCategory(Intent.CATEGORY_DEFAULT);
- }
-
- // Create dialog parameters
- AlertController.AlertParams params = mAlertParams;
- params.mOnClickListener = this;
- params.mOnCancelListener = this;
-
- // Use custom title if provided, otherwise default window title
- if (intent.hasExtra(Intent.EXTRA_TITLE)) {
- params.mTitle = intent.getStringExtra(Intent.EXTRA_TITLE);
- } else {
- params.mTitle = getTitle();
- }
-
- // Build list adapter of pickable items
- List<PickAdapter.Item> items = getItems();
- mAdapter = new PickAdapter(this, items);
- params.mAdapter = mAdapter;
-
- setupAlert();
- }
-
- /**
- * Handle clicking of dialog item by passing back
- * {@link #getIntentForPosition(int)} in {@link #setResult(int, android.content.Intent)}.
- */
- public void onClick(DialogInterface dialog, int which) {
- Intent intent = getIntentForPosition(which);
- setResult(Activity.RESULT_OK, intent);
- finish();
- }
-
- /**
- * Handle canceled dialog by passing back {@link android.app.Activity#RESULT_CANCELED}.
- */
- public void onCancel(DialogInterface dialog) {
- setResult(Activity.RESULT_CANCELED);
- finish();
- }
-
- /**
- * Build the specific {@link android.content.Intent} for a given list position. Convenience
- * method that calls through to {@link PickAdapter.Item#getIntent(android.content.Intent)}.
- */
- protected Intent getIntentForPosition(int position) {
- PickAdapter.Item item = (PickAdapter.Item) mAdapter.getItem(position);
- return item.getIntent(mBaseIntent);
- }
-
- /**
- * Build and return list of items to be shown in dialog. Default
- * implementation mixes activities matching {@link #mBaseIntent} from
- * {@link #putIntentItems(android.content.Intent, java.util.List)} with any injected items from
- * {@link android.content.Intent#EXTRA_SHORTCUT_NAME}. Override this method in subclasses to
- * change the items shown.
- */
- protected List<PickAdapter.Item> getItems() {
- PackageManager packageManager = getPackageManager();
- List<PickAdapter.Item> items = new ArrayList<PickAdapter.Item>();
-
- // Add any injected pick items
- final Intent intent = getIntent();
- ArrayList<String> labels =
- intent.getStringArrayListExtra(Intent.EXTRA_SHORTCUT_NAME);
- ArrayList<ShortcutIconResource> icons =
- intent.getParcelableArrayListExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE);
-
- if (labels != null && icons != null && labels.size() == icons.size()) {
- for (int i = 0; i < labels.size(); i++) {
- String label = labels.get(i);
- Drawable icon = null;
-
- try {
- // Try loading icon from requested package
- ShortcutIconResource iconResource = icons.get(i);
- Resources res = packageManager.getResourcesForApplication(
- iconResource.packageName);
- icon = res.getDrawable(res.getIdentifier(
- iconResource.resourceName, null, null));
- } catch (NameNotFoundException e) {
- // Ignore
- }
-
- items.add(new PickAdapter.Item(this, label, icon));
- }
- }
-
- // Add any intent items if base was given
- if (mBaseIntent != null) {
- putIntentItems(mBaseIntent, items);
- }
-
- return items;
- }
-
- /**
- * Fill the given list with any activities matching the base {@link android.content.Intent}.
- */
- protected void putIntentItems(Intent baseIntent, List<PickAdapter.Item> items) {
- PackageManager packageManager = getPackageManager();
- List<ResolveInfo> list = packageManager.queryIntentActivities(baseIntent,
- 0 /* no flags */);
- Collections.sort(list, new ResolveInfo.DisplayNameComparator(packageManager));
-
- final int listSize = list.size();
- for (int i = 0; i < listSize; i++) {
- ResolveInfo resolveInfo = list.get(i);
- items.add(new PickAdapter.Item(this, packageManager, resolveInfo));
- }
- }
-
- /**
- * Adapter which shows the set of activities that can be performed for a
- * given {@link android.content.Intent}.
- */
- protected static class PickAdapter extends BaseAdapter {
-
- /**
- * Item that appears in a {@link PickAdapter} list.
- */
- public static class Item {
- protected static IconResizer sResizer;
-
- protected IconResizer getResizer(Context context) {
- if (sResizer == null) {
- sResizer = new IconResizer(context);
- }
- return sResizer;
- }
-
- CharSequence label;
- Drawable icon;
- String packageName;
- String className;
- Bundle extras;
-
- /**
- * Create a list item from given label and icon.
- */
- Item(Context context, CharSequence label, Drawable icon) {
- this.label = label;
- this.icon = getResizer(context).createIconThumbnail(icon);
- }
-
- /**
- * Create a list item and fill it with details from the given
- * {@link android.content.pm.ResolveInfo} object.
- */
- Item(Context context, PackageManager pm, ResolveInfo resolveInfo) {
- label = resolveInfo.loadLabel(pm);
- if (label == null && resolveInfo.activityInfo != null) {
- label = resolveInfo.activityInfo.name;
- }
-
- icon = getResizer(context).createIconThumbnail(resolveInfo.loadIcon(pm));
- packageName = resolveInfo.activityInfo.applicationInfo.packageName;
- className = resolveInfo.activityInfo.name;
- }
-
- Intent getIntent(Intent baseIntent) {
- Intent intent = new Intent(baseIntent);
- if (packageName != null && className != null) {
- // Valid package and class, so fill details as normal intent
- intent.setClassName(packageName, className);
- if (extras != null) {
- intent.putExtras(extras);
- }
- } else {
- // No valid package or class, so treat as shortcut with label
- intent.setAction(Intent.ACTION_CREATE_SHORTCUT);
- intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, label);
- }
- return intent;
- }
- }
-
- private final LayoutInflater mInflater;
-
- private List<Item> mItems;
- private int mLayoutRes = R.layout.pick_item;
-
- /**
- * Create an adapter for the given items.
- */
- public PickAdapter(Context context, List<Item> items) {
- mInflater = (LayoutInflater)
- context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- mItems = items;
- }
-
- /**
- * {@inheritDoc}
- */
- public int getCount() {
- return mItems.size();
- }
-
- /**
- * {@inheritDoc}
- */
- public Object getItem(int position) {
- return mItems.get(position);
- }
-
- /**
- * {@inheritDoc}
- */
- public long getItemId(int position) {
- return position;
- }
-
- /**
- * {@inheritDoc}
- */
- public View getView(int position, View convertView, ViewGroup parent) {
- if (convertView == null) {
- convertView = mInflater.inflate(mLayoutRes, parent, false);
- }
-
- Item item = (Item) getItem(position);
- TextView textView = (TextView) convertView;
- textView.setText(item.label);
- textView.setCompoundDrawablesWithIntrinsicBounds(item.icon, null, null, null);
-
- return convertView;
- }
- }
-
- /**
- * Utility class to resize icons to match default icon size. Code is mostly
- * borrowed from Launcher.
- */
- private static class IconResizer {
- private int mIconWidth = -1;
- private int mIconHeight = -1;
-
- private final Rect mOldBounds = new Rect();
- private Canvas mCanvas = new Canvas();
- private Resources mResources;
-
- public IconResizer(Context context) {
- mCanvas.setDrawFilter(new PaintFlagsDrawFilter(Paint.DITHER_FLAG,
- Paint.FILTER_BITMAP_FLAG));
-
- mResources = context.getResources();
- mIconWidth = mIconHeight = (int) mResources.getDimension(
- android.R.dimen.app_icon_size);
- }
-
- /**
- * Returns a Drawable representing the thumbnail of the specified Drawable.
- * The size of the thumbnail is defined by the dimension
- * android.R.dimen.launcher_application_icon_size.
- *
- * This method is not thread-safe and should be invoked on the UI thread only.
- *
- * @param icon The icon to get a thumbnail of.
- *
- * @return A thumbnail for the specified icon or the icon itself if the
- * thumbnail could not be created.
- */
- public Drawable createIconThumbnail(Drawable icon) {
- int width = mIconWidth;
- int height = mIconHeight;
-
- if (icon == null) {
- return null;
- }
-
- final int iconWidth = icon.getIntrinsicWidth();
- final int iconHeight = icon.getIntrinsicHeight();
-
- if (icon instanceof PaintDrawable) {
- PaintDrawable painter = (PaintDrawable) icon;
- painter.setIntrinsicWidth(width);
- painter.setIntrinsicHeight(height);
- }
-
- if (width > 0 && height > 0) {
- if (width < iconWidth || height < iconHeight) {
- final float ratio = (float) iconWidth / iconHeight;
-
- if (iconWidth > iconHeight) {
- height = (int) (width / ratio);
- } else if (iconHeight > iconWidth) {
- width = (int) (height * ratio);
- }
-
- final Bitmap.Config c = icon.getOpacity() != PixelFormat.OPAQUE ?
- Bitmap.Config.ARGB_8888 : Bitmap.Config.RGB_565;
- final Bitmap thumb = Bitmap.createBitmap(mIconWidth, mIconHeight, c);
- final Canvas canvas = mCanvas;
- canvas.setBitmap(thumb);
- // Copy the old bounds to restore them later
- // If we were to do oldBounds = icon.getBounds(),
- // the call to setBounds() that follows would
- // change the same instance and we would lose the
- // old bounds
- mOldBounds.set(icon.getBounds());
- final int x = (mIconWidth - width) / 2;
- final int y = (mIconHeight - height) / 2;
- icon.setBounds(x, y, x + width, y + height);
- icon.draw(canvas);
- icon.setBounds(mOldBounds);
- icon = new BitmapDrawable(mResources, thumb);
- } else if (iconWidth < width && iconHeight < height) {
- final Bitmap.Config c = Bitmap.Config.ARGB_8888;
- final Bitmap thumb = Bitmap.createBitmap(mIconWidth, mIconHeight, c);
- final Canvas canvas = mCanvas;
- canvas.setBitmap(thumb);
- mOldBounds.set(icon.getBounds());
- final int x = (width - iconWidth) / 2;
- final int y = (height - iconHeight) / 2;
- icon.setBounds(x, y, x + iconWidth, y + iconHeight);
- icon.draw(canvas);
- icon.setBounds(mOldBounds);
- icon = new BitmapDrawable(mResources, thumb);
- }
- }
-
- return icon;
- }
- }
-}
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 8d24ea3..b3d8c3e 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -189,7 +189,6 @@
@Override
public void surfaceDestroyed(SurfaceHolder holder) {
super.surfaceDestroyed(holder);
- mRollo.mHasSurface = false;
// Without this, we leak mMessageCallback which leaks the context.
mRS.mMessageCallback = null;
}
@@ -202,7 +201,6 @@
if (mRollo == null) {
mRollo = new RolloRS();
- mRollo.mHasSurface = true;
mRollo.init(getResources(), w, h);
if (mAllAppsList != null) {
mRollo.setApps(mAllAppsList);
@@ -211,8 +209,6 @@
gainFocus();
mShouldGainFocus = false;
}
- } else {
- mRollo.mHasSurface = true;
}
mRollo.dirtyCheck();
mRollo.resize(w, h);
@@ -271,7 +267,7 @@
}
if (gainFocus) {
- if (mRollo != null && mRollo.mHasSurface) {
+ if (mRollo != null) {
gainFocus();
} else {
mShouldGainFocus = true;
@@ -637,7 +633,7 @@
*/
public void zoom(float zoom, boolean animate) {
cancelLongPress();
- if (mRollo == null || !mRollo.mHasSurface) {
+ if (mRollo == null) {
mZoomDirty = true;
mZoom = zoom;
mAnimateNextZoom = animate;
@@ -799,9 +795,6 @@
private Bitmap mSelectionBitmap;
private Canvas mSelectionCanvas;
- boolean mHasSurface = false;
- private boolean mAppsDirty = true;
-
Params mParams;
State mState;
@@ -948,12 +941,12 @@
sb.setMag(Sampler.Value.NEAREST);
Sampler nearest = sb.create();
- ProgramFragment.Builder bf = new ProgramFragment.Builder(mRS, null, null);
+ ProgramFragment.Builder bf = new ProgramFragment.Builder(mRS);
//mPFColor = bf.create();
//mPFColor.setName("PFColor");
- bf.setTexEnable(true, 0);
- bf.setTexEnvMode(ProgramFragment.EnvMode.MODULATE, 0);
+ bf.setTexture(ProgramFragment.Builder.EnvMode.REPLACE,
+ ProgramFragment.Builder.Format.RGBA, 0);
mPFTexMip = bf.create();
mPFTexMip.setName("PFTexMip");
mPFTexMip.bindSampler(linear, 0);
@@ -1046,17 +1039,8 @@
}
void dirtyCheck() {
- if (mHasSurface) {
- if (mAppsDirty && mAllAppsList != null) {
- for (int i=0; i < mState.iconCount; i++) {
- uploadAppIcon(i, mAllAppsList.get(i));
- }
- saveAppsList();
- mAppsDirty = false;
- }
- if (mZoomDirty) {
- setZoom(mZoom, mAnimateNextZoom);
- }
+ if (mZoomDirty) {
+ setZoom(mZoom, mAnimateNextZoom);
}
}
@@ -1081,12 +1065,8 @@
for (int i=0; i < mState.iconCount; i++) {
createAppIconAllocations(i, list.get(i));
}
- if (mHasSurface) {
- for (int i=0; i < mState.iconCount; i++) {
- uploadAppIcon(i, list.get(i));
- }
- } else {
- mRollo.mAppsDirty = true;
+ for (int i=0; i < mState.iconCount; i++) {
+ uploadAppIcon(i, list.get(i));
}
saveAppsList();
}
@@ -1187,13 +1167,7 @@
System.arraycopy(mLabelIds, index, mLabelIds, dest, count);
createAppIconAllocations(index, item);
-
- if (mHasSurface) {
- uploadAppIcon(index, item);
- } else {
- mAppsDirty = true;
- }
-
+ uploadAppIcon(index, item);
mRollo.mState.iconCount++;
}
@@ -1405,8 +1379,6 @@
Log.d(TAG, "mRollo.mLabelIds=" + Arrays.toString(mLabelIds));
Log.d(TAG, "mRollo.mTouchXBorders=" + Arrays.toString(mTouchXBorders));
Log.d(TAG, "mRollo.mTouchYBorders=" + Arrays.toString(mTouchYBorders));
- Log.d(TAG, "mRollo.mHasSurface=" + mHasSurface);
- Log.d(TAG, "mRollo.mAppsDirty=" + mAppsDirty);
Log.d(TAG, "mRollo.mState.newPositionX=" + mState.newPositionX);
Log.d(TAG, "mRollo.mState.newTouchDown=" + mState.newTouchDown);
Log.d(TAG, "mRollo.mState.flingVelocity=" + mState.flingVelocity);
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index f07810d..50be606 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -179,6 +179,7 @@
private boolean mWorkspaceLoading = true;
+ private boolean mPaused = true;
private boolean mRestoring;
private boolean mWaitingForResult;
@@ -237,6 +238,9 @@
// For handling default keys
mDefaultKeySsb = new SpannableStringBuilder();
Selection.setSelection(mDefaultKeySsb, 0);
+
+ IntentFilter filter = new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
+ registerReceiver(mCloseSystemDialogsReceiver, filter);
}
private void checkForLocaleChange() {
@@ -393,8 +397,7 @@
protected void onResume() {
super.onResume();
- IntentFilter filter = new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
- registerReceiver(mCloseSystemDialogsReceiver, filter);
+ mPaused = false;
if (mRestoring) {
mWorkspaceLoading = true;
@@ -409,7 +412,6 @@
dismissPreview(mPreviousView);
dismissPreview(mNextView);
mDragController.cancelDrag();
- unregisterReceiver(mCloseSystemDialogsReceiver);
}
@Override
@@ -908,6 +910,8 @@
dismissPreview(mPreviousView);
dismissPreview(mNextView);
+
+ unregisterReceiver(mCloseSystemDialogsReceiver);
}
@Override
@@ -1730,7 +1734,11 @@
* - from center screen
* - from other screens
* - Home from all apps
+ * - from center screen
+ * - from other screens
* - Back from all apps
+ * - from center screen
+ * - from other screens
* - Launch app from workspace and quit
* - with back
* - with home
@@ -1751,7 +1759,7 @@
* - On all apps, power off
* - Launch an app and turn off the screen while in that app
* - Go back with home key
- * - Go back with back key
+ * - Go back with back key TODO: make this not go to workspace
* - From all apps
* - From workspace
*/
@@ -1886,13 +1894,9 @@
String reason = intent.getStringExtra("reason");
if (!"homekey".equals(reason)) {
boolean animate = true;
- /*
- if ("globalactions".equals(reason)) {
- // For some reason (probably the fading), this animation is
- // choppy, so don't show it.
+ if (mPaused || "lock".equals(reason)) {
animate = false;
}
- */
closeAllApps(animate);
}
}
diff --git a/src/com/android/launcher2/LauncherProvider.java b/src/com/android/launcher2/LauncherProvider.java
index f17ce5b..ed1c72c 100644
--- a/src/com/android/launcher2/LauncherProvider.java
+++ b/src/com/android/launcher2/LauncherProvider.java
@@ -465,28 +465,19 @@
/**
* Upgrade existing clock and photo frame widgets into their new widget
- * equivalents. This method allocates appWidgetIds, and then hands off to
- * LauncherAppWidgetBinder to finish the actual binding.
+ * equivalents.
*/
private void convertWidgets(SQLiteDatabase db) {
+ final AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(mContext);
final int[] bindSources = new int[] {
Favorites.ITEM_TYPE_WIDGET_CLOCK,
Favorites.ITEM_TYPE_WIDGET_PHOTO_FRAME,
Favorites.ITEM_TYPE_WIDGET_SEARCH,
};
-
- final ArrayList<ComponentName> bindTargets = new ArrayList<ComponentName>();
- bindTargets.add(new ComponentName("com.android.alarmclock",
- "com.android.alarmclock.AnalogAppWidgetProvider"));
- bindTargets.add(new ComponentName("com.android.camera",
- "com.android.camera.PhotoAppWidgetProvider"));
- bindTargets.add(new ComponentName("com.android.quicksearchbox",
- "com.android.quicksearchbox.SearchWidgetProvider"));
final String selectWhere = buildOrWhereString(Favorites.ITEM_TYPE, bindSources);
Cursor c = null;
- boolean allocatedAppWidgets = false;
db.beginTransaction();
try {
@@ -524,8 +515,21 @@
String updateWhere = Favorites._ID + "=" + favoriteId;
db.update(TABLE_FAVORITES, values, updateWhere, null);
-
- allocatedAppWidgets = true;
+
+ ComponentName cn = null;
+ if (favoriteType == Favorites.ITEM_TYPE_WIDGET_CLOCK) {
+ appWidgetManager.bindAppWidgetId(appWidgetId,
+ new ComponentName("com.android.alarmclock",
+ "com.android.alarmclock.AnalogAppWidgetProvider"));
+ } else if (favoriteType == Favorites.ITEM_TYPE_WIDGET_PHOTO_FRAME) {
+ appWidgetManager.bindAppWidgetId(appWidgetId,
+ new ComponentName("com.android.camera",
+ "com.android.camera.PhotoAppWidgetProvider"));
+ } else if (favoriteType == Favorites.ITEM_TYPE_WIDGET_SEARCH) {
+ appWidgetManager.bindAppWidgetId(appWidgetId,
+ new ComponentName("com.android.quicksearchbox",
+ "com.android.quicksearchbox.SearchWidgetProvider"));
+ }
} catch (RuntimeException ex) {
Log.e(TAG, "Problem allocating appWidgetId", ex);
}
@@ -540,34 +544,9 @@
c.close();
}
}
-
- // If any appWidgetIds allocated, then launch over to binder
- if (allocatedAppWidgets) {
- launchAppWidgetBinder(bindSources, bindTargets);
- }
}
/**
- * Launch the widget binder that walks through the Launcher database,
- * binding any matching widgets to the corresponding targets. We can't
- * bind ourselves because our parent process can't obtain the
- * BIND_APPWIDGET permission.
- */
- private void launchAppWidgetBinder(int[] bindSources, ArrayList<ComponentName> bindTargets) {
- final Intent intent = new Intent();
- intent.setComponent(new ComponentName("com.android.settings",
- "com.android.settings.LauncherAppWidgetBinder"));
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
- final Bundle extras = new Bundle();
- extras.putIntArray(EXTRA_BIND_SOURCES, bindSources);
- extras.putParcelableArrayList(EXTRA_BIND_TARGETS, bindTargets);
- intent.putExtras(extras);
-
- mContext.startActivity(intent);
- }
-
- /**
* Loads the default set of favorite packages from an xml file.
*
* @param db The database to write the values into
@@ -667,37 +646,9 @@
}
private boolean addClockWidget(SQLiteDatabase db, ContentValues values) {
- final int[] bindSources = new int[] {
- Favorites.ITEM_TYPE_WIDGET_CLOCK,
- };
-
- final ArrayList<ComponentName> bindTargets = new ArrayList<ComponentName>();
- bindTargets.add(new ComponentName("com.android.alarmclock",
- "com.android.alarmclock.AnalogAppWidgetProvider"));
-
- boolean allocatedAppWidgets = false;
-
- // Try binding to an analog clock widget
- try {
- int appWidgetId = mAppWidgetHost.allocateAppWidgetId();
-
- values.put(Favorites.ITEM_TYPE, Favorites.ITEM_TYPE_WIDGET_CLOCK);
- values.put(Favorites.SPANX, 2);
- values.put(Favorites.SPANY, 2);
- values.put(Favorites.APPWIDGET_ID, appWidgetId);
- db.insert(TABLE_FAVORITES, null, values);
-
- allocatedAppWidgets = true;
- } catch (RuntimeException ex) {
- Log.e(TAG, "Problem allocating appWidgetId", ex);
- }
-
- // If any appWidgetIds allocated, then launch over to binder
- if (allocatedAppWidgets) {
- launchAppWidgetBinder(bindSources, bindTargets);
- }
-
- return allocatedAppWidgets;
+ ComponentName cn = new ComponentName("com.android.alarmclock",
+ "com.android.alarmclock.AnalogAppWidgetProvider");
+ return addAppWidget(db, values, cn, 2, 2);
}
private boolean addAppWidget(SQLiteDatabase db, ContentValues values, TypedArray a) {
diff --git a/src/com/android/launcher2/LauncherSettings.java b/src/com/android/launcher2/LauncherSettings.java
index a438d47..9c685ce 100644
--- a/src/com/android/launcher2/LauncherSettings.java
+++ b/src/com/android/launcher2/LauncherSettings.java
@@ -91,8 +91,7 @@
}
/**
- * Favorites. When changing these values, be sure to update
- * {@link com.android.settings.LauncherAppWidgetBinder} as needed.
+ * Favorites.
*/
static final class Favorites implements BaseLauncherColumns {
/**