Merge "Changed Grid layout on home. More space at the bottom." into gingerbread
diff --git a/res/drawable-hdpi/hotseat_browser_normal.png b/res/drawable-hdpi/hotseat_browser_normal.png
index ebdab62..c7f902a 100644
--- a/res/drawable-hdpi/hotseat_browser_normal.png
+++ b/res/drawable-hdpi/hotseat_browser_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/hotseat_phone_normal.png b/res/drawable-hdpi/hotseat_phone_normal.png
index 2a16f9c..391802e 100644
--- a/res/drawable-hdpi/hotseat_phone_normal.png
+++ b/res/drawable-hdpi/hotseat_phone_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/hotseat_browser_normal.png b/res/drawable-mdpi/hotseat_browser_normal.png
index 4c662fd..4a4a6e3 100644
--- a/res/drawable-mdpi/hotseat_browser_normal.png
+++ b/res/drawable-mdpi/hotseat_browser_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/hotseat_phone_normal.png b/res/drawable-mdpi/hotseat_phone_normal.png
index d759b1f..7f20428 100644
--- a/res/drawable-mdpi/hotseat_phone_normal.png
+++ b/res/drawable-mdpi/hotseat_phone_normal.png
Binary files differ
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index bad2730..45507d5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Všechny aplikace"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Plocha"</string>
<string name="menu_add" msgid="3065046628354640854">"Přidat"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Tapeta"</string>
<string name="menu_search" msgid="4826514464423239041">"Hledat"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Oznámení"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 6ec1516..ffeab05 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Alle programmer"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Start"</string>
<string name="menu_add" msgid="3065046628354640854">"Tilføj"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Tapet"</string>
<string name="menu_search" msgid="4826514464423239041">"Søg"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Meddelelser"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e4f705e..9e1c0cb 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Alle Anwendungen"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Startseite"</string>
<string name="menu_add" msgid="3065046628354640854">"Hinzufügen"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Hintergrund"</string>
<string name="menu_search" msgid="4826514464423239041">"Suchen"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Benachrichtigungen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 6514964..1a67063 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Όλες οι εφαρμογές"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Αρχική σελίδα"</string>
<string name="menu_add" msgid="3065046628354640854">"Προσθήκη"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Ταπετσαρία"</string>
<string name="menu_search" msgid="4826514464423239041">"Αναζήτηση"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Ειδοποιήσεις"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5f6b4e5..ca3cf8b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Todas las aplicaciones"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Página principal"</string>
<string name="menu_add" msgid="3065046628354640854">"Agregar"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Papel tapiz"</string>
<string name="menu_search" msgid="4826514464423239041">"Buscar"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Notificaciones"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5b46c59..b36dbd4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Todas las aplicaciones"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Inicio"</string>
<string name="menu_add" msgid="3065046628354640854">"Añadir"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Fondo de pantalla"</string>
<string name="menu_search" msgid="4826514464423239041">"Buscar con Google"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Notificaciones"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f1fb440..248f341 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Toutes les applications"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Page d\'accueil"</string>
<string name="menu_add" msgid="3065046628354640854">"Ajouter"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Fond d\'écran"</string>
<string name="menu_search" msgid="4826514464423239041">"Rechercher"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Notifications"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c94d74d..71495c6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Tutte le applicazioni"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Home"</string>
<string name="menu_add" msgid="3065046628354640854">"Aggiungi"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Sfondo"</string>
<string name="menu_search" msgid="4826514464423239041">"Cerca"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Notifiche"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 021b895..2830585 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"すべてのアプリケーション"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"ホーム"</string>
<string name="menu_add" msgid="3065046628354640854">"追加"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"壁紙"</string>
<string name="menu_search" msgid="4826514464423239041">"検索"</string>
<string name="menu_notifications" msgid="6424587053194766192">"通知"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 341c7ee..f392ebb 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"모든 애플리케이션"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"홈"</string>
<string name="menu_add" msgid="3065046628354640854">"추가"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"배경화면"</string>
<string name="menu_search" msgid="4826514464423239041">"검색"</string>
<string name="menu_notifications" msgid="6424587053194766192">"알림"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 54418e1..5397684 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Alle programmer"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Startsiden"</string>
<string name="menu_add" msgid="3065046628354640854">"Legg til"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Bakgrunnsbilde"</string>
<string name="menu_search" msgid="4826514464423239041">"Søk"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Varslinger"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f5ac90e..cd62032 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Alle toepassingen"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Startpagina"</string>
<string name="menu_add" msgid="3065046628354640854">"Toevoegen"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Achtergrond"</string>
<string name="menu_search" msgid="4826514464423239041">"Zoeken"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Meldingen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d50a59a..976a792 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Wszystkie aplikacje"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Ekran główny"</string>
<string name="menu_add" msgid="3065046628354640854">"Dodaj"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Tapeta"</string>
<string name="menu_search" msgid="4826514464423239041">"Szukaj"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Powiadomienia"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index df63f30..38bb6fd 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Todas as aplicações"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Página inicial"</string>
<string name="menu_add" msgid="3065046628354640854">"Adicionar"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Imagem de fundo"</string>
<string name="menu_search" msgid="4826514464423239041">"Pesquisar"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Notificações"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b72f7e0..7d663b0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Todos os aplicativos"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Página inicial"</string>
<string name="menu_add" msgid="3065046628354640854">"Adicionar"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Plano de fundo"</string>
<string name="menu_search" msgid="4826514464423239041">"Pesquisa"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Notificações"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b151618..a5fb686 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Все приложения"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Главная"</string>
<string name="menu_add" msgid="3065046628354640854">"Добавить"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Обои"</string>
<string name="menu_search" msgid="4826514464423239041">"Поиск"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Уведомления"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9c29ef1..3e40886 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Alla program"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Startsida"</string>
<string name="menu_add" msgid="3065046628354640854">"Lägg till"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Bakgrund"</string>
<string name="menu_search" msgid="4826514464423239041">"Sök"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Aviseringar"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 43f7520..f953246 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"Tüm uygulamalar"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Ana Sayfa"</string>
<string name="menu_add" msgid="3065046628354640854">"Ekle"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"Duvar Kağıdı"</string>
<string name="menu_search" msgid="4826514464423239041">"Ara"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Bildirimler"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0705787..cc26842 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"所有应用程序"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"主屏幕"</string>
<string name="menu_add" msgid="3065046628354640854">"添加"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"壁纸"</string>
<string name="menu_search" msgid="4826514464423239041">"搜索"</string>
<string name="menu_notifications" msgid="6424587053194766192">"通知"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index de37e19..c979f96 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -50,6 +50,8 @@
<string name="all_apps_button_label" msgid="3953036962111614813">"所有應用程式"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"主螢幕"</string>
<string name="menu_add" msgid="3065046628354640854">"新增"</string>
+ <!-- no translation found for menu_manage_apps (2864265778240958621) -->
+ <skip />
<string name="menu_wallpaper" msgid="5837429080911269832">"桌布"</string>
<string name="menu_search" msgid="4826514464423239041">"搜尋"</string>
<string name="menu_notifications" msgid="6424587053194766192">"通知"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1fcabb2..6bd16ed 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="hotseats" translatable="false">
- <item>intent:#Intent;action=android.intent.action.MAIN;component=com.android.contacts/.ContactsLaunchActivity;end</item>
+ <item>intent:#Intent;action=android.intent.action.DIAL;end</item>
<item>*BROWSER*</item>
</string-array>
<array name="hotseat_icons" translatable="false">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f4dfffb..bae50e4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -88,6 +88,8 @@
<!-- Title of dialog when user is selecting shortcut to add to homescreen -->
<string name="title_select_shortcut">Select shortcut</string>
+ <!-- Title of dialog when user is selecting an application to add to homescreen -->
+ <string name="title_select_application">Select application</string>
<!-- Title of dialog when user is selecting live folder to add to homescreen -->
<string name="title_select_live_folder">Select folder</string>
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 8c64af7..9626a2e 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1234,6 +1234,7 @@
Intent pickIntent = new Intent(Intent.ACTION_PICK_ACTIVITY);
pickIntent.putExtra(Intent.EXTRA_INTENT, mainIntent);
+ pickIntent.putExtra(Intent.EXTRA_TITLE, getText(R.string.title_select_application));
startActivityForResultSafely(pickIntent, REQUEST_PICK_APPLICATION);
} else {
startActivityForResultSafely(intent, REQUEST_CREATE_SHORTCUT);
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 06fcfb3..0978499 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -340,8 +340,9 @@
}
} else if (Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE.equals(action)) {
- String[] packages = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST);
- enqueuePackageUpdated(new PackageUpdatedTask(PackageUpdatedTask.OP_ADD, packages));
+ // When everything comes back, just reload everything. We might not
+ // have the right icons for apps on external storage.
+ startLoader(mApp, false);
} else if (Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE.equals(action)) {
String[] packages = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST);
