am 13ad7985: am cfa1a75b: Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1
* commit '13ad79852f3e18bc1456bf93fe1afe030be65d51':
Part of fixing issue #6006757: Keyboard dismissal lags
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index d4e7f51..2cd55df 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -89,7 +89,7 @@
<string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Programme-bladsy %1$d van %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Legstukke-bladsy %1$d van %2$d"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"Maak jouself tuis"</string>
- <string name="workspace_cling_move_item" msgid="791013895761065070">"Jy kan jou gunsteling programme hier berg."</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"Jy kan jou gunsteling-apps hier berg."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Om al jou programme te sien, raak die sirkel."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Kies \'n paar programme"</string>
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"Om \'n program by jou Tuisskerm te voeg, raak en hou dit."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6633402..656fca1 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -55,7 +55,7 @@
<string name="delete_target_uninstall_label" msgid="748894921183769150">"Poista"</string>
<string name="info_target_label" msgid="4019495079517426980">"Sovelluksen tiedot"</string>
<string name="accessibility_search_button" msgid="816822994629942611">"Haku"</string>
- <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Puhehaku"</string>
+ <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Äänihaku"</string>
<string name="accessibility_all_apps_button" msgid="8803738611398979849">"Sovellukset"</string>
<string name="accessibility_delete_button" msgid="3628162007991023603">"Poista"</string>
<string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Poista päivitys"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 75deb12..6d4b63e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -23,7 +23,7 @@
<string name="uid_name" msgid="3371120195364560632">"Alap Android-alkalmazások"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
<string name="chooser_wallpaper" msgid="6063168087625352235">"Válasszon tapétát innen:"</string>
- <string name="wallpaper_instructions" msgid="4215640646180727542">"Háttérkép kiválasztása"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"Háttérkép beállítása"</string>
<string name="pick_wallpaper" msgid="5630222540525626723">"Háttérképek"</string>
<string name="activity_not_found" msgid="217823393239365967">"Az alkalmazás nincs telepítve."</string>
<string name="widgets_tab_label" msgid="9145860100000983599">"Modulok"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 18c5ac3..4b6065c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -23,7 +23,7 @@
<string name="uid_name" msgid="3371120195364560632">"Android-kjerneapplikasjoner"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
<string name="chooser_wallpaper" msgid="6063168087625352235">"Velg bakgrunnsbilde fra"</string>
- <string name="wallpaper_instructions" msgid="4215640646180727542">"Velg som bakgrunnsbilde"</string>
+ <string name="wallpaper_instructions" msgid="4215640646180727542">"Velg bakgrunnsbilde"</string>
<string name="pick_wallpaper" msgid="5630222540525626723">"Bakgrunner"</string>
<string name="activity_not_found" msgid="217823393239365967">"Appen er ikke installert."</string>
<string name="widgets_tab_label" msgid="9145860100000983599">"Moduler"</string>
@@ -73,13 +73,13 @@
<string name="cab_folder_selection_text" msgid="8916111874189565067">"1 mappe valgt"</string>
<string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 snarvei valgt"</string>
<string name="permlab_install_shortcut" msgid="1201690825493376489">"installere snarveier"</string>
- <string name="permdesc_install_shortcut" msgid="8634424803272077038">"Gir apper tillatelse til å legge til snarveier uten innblanding fra brukeren."</string>
+ <string name="permdesc_install_shortcut" msgid="8634424803272077038">"Gir en app tillatelse til å legge til snarveier uten innblanding fra brukeren."</string>
<string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"avinstallere snarveier"</string>
- <string name="permdesc_uninstall_shortcut" msgid="7811223557950931994">"Gir apper tillatelse til å fjerne snarveier uten innblanding fra brukeren."</string>
+ <string name="permdesc_uninstall_shortcut" msgid="7811223557950931994">"Gir en app tillatelse til å fjerne snarveier uten innblanding fra brukeren."</string>
<string name="permlab_read_settings" msgid="3452408290738106747">"lese skrivebordsinnstillinger og -snarveier"</string>
- <string name="permdesc_read_settings" msgid="1836104524215167383">"Gir apper tillatelse til å lese innstillingene og snarveiene på startsiden."</string>
+ <string name="permdesc_read_settings" msgid="1836104524215167383">"Gir en app tillatelse til å lese innstillingene og snarveiene på startsiden."</string>
<string name="permlab_write_settings" msgid="1360567537236705628">"skrive skrivebordsinnstillinger og -snarveier"</string>
- <string name="permdesc_write_settings" msgid="6763846563231494591">"Gir apper tillatelse til å endre innstillingene og snarveiene på startsiden."</string>
+ <string name="permdesc_write_settings" msgid="6763846563231494591">"Gir en app tillatelse til å endre innstillingene og snarveiene på startsiden."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Problem under lasting av gadget"</string>
<string name="uninstall_system_app_text" msgid="6429814133777046491">"Dette er en systemapp som ikke kan avinstalleres."</string>
<string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index b4249c6..4d6c187 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -22,12 +22,10 @@
<string name="application_name" msgid="8424725141379931883">"Lantschader"</string>
<string name="uid_name" msgid="3371120195364560632">"Applicaziuns da basa dad Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
- <!-- no translation found for chooser_wallpaper (6063168087625352235) -->
- <skip />
+ <!-- outdated translation 5988031014201479733 --> <string name="chooser_wallpaper" msgid="6063168087625352235">"Tscherner in fund davos"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Definir in fund davos"</string>
<string name="pick_wallpaper" msgid="5630222540525626723">"Maletgs da fund davos"</string>
- <!-- no translation found for activity_not_found (217823393239365967) -->
- <skip />
+ <!-- outdated translation 3571057450431950427 --> <string name="activity_not_found" msgid="217823393239365967">"L\'applicaziun n\'è betg installada sin quest telefonin."</string>
<!-- no translation found for widgets_tab_label (9145860100000983599) -->
<skip />
<!-- no translation found for long_press_widget_to_add (7395697462851217506) -->
@@ -43,8 +41,7 @@
<string name="rename_action" msgid="6016003384693240896">"OK"</string>
<string name="cancel_action" msgid="3811860427489435048">"Interrumper"</string>
<string name="menu_item_add_item" msgid="6233177331075781114">"Agiuntar al visur da partenza"</string>
- <!-- no translation found for group_applications (2103752818818161976) -->
- <skip />
+ <!-- outdated translation 4118484163419674240 --> <string name="group_applications" msgid="2103752818818161976">"Applicaziuns"</string>
<string name="group_shortcuts" msgid="9133529424900391877">"Scursanidas"</string>
<string name="group_widgets" msgid="6704978494073105844">"Widgets"</string>
<string name="group_wallpapers" msgid="1568191644272224858">"Funds davos"</string>
@@ -57,8 +54,7 @@
<string name="title_select_shortcut" msgid="2858897527672831763">"Tscherner ina cumbinaziun da tastas"</string>
<!-- no translation found for title_select_application (1793455815754848652) -->
<skip />
- <!-- no translation found for all_apps_button_label (2578400570124163469) -->
- <skip />
+ <!-- outdated translation 3953036962111614813 --> <string name="all_apps_button_label" msgid="2578400570124163469">"Tut las applicaziuns"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Pagina da partenza"</string>
<!-- no translation found for delete_zone_label_workspace (7153615831493049150) -->
<skip />
@@ -86,8 +82,7 @@
<string name="menu_wallpaper" msgid="5837429080911269832">"Fund davos"</string>
<string name="menu_search" msgid="4826514464423239041">"Tschertgar"</string>
<string name="menu_notifications" msgid="6424587053194766192">"Avis"</string>
- <!-- no translation found for menu_settings (3946232973327980394) -->
- <skip />
+ <!-- outdated translation 6233960148378443661 --> <string name="menu_settings" msgid="3946232973327980394">"Parameters"</string>
<!-- no translation found for menu_help (4901160661634590633) -->
<skip />
<!-- no translation found for cab_menu_delete_app (4089398025537640349) -->
@@ -103,17 +98,13 @@
<!-- no translation found for cab_shortcut_selection_text (8115847384500412878) -->
<skip />
<string name="permlab_install_shortcut" msgid="1201690825493376489">"Installar scursanidas"</string>
- <!-- no translation found for permdesc_install_shortcut (8634424803272077038) -->
- <skip />
+ <!-- outdated translation 7429365847558984148 --> <string name="permdesc_install_shortcut" msgid="8634424803272077038">"Pussibilitescha ch\'ina applicaziun agiunta scursanidas senza l\'intervenziun da l\'utilisader."</string>
<string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"deinstallar scursanidas"</string>
- <!-- no translation found for permdesc_uninstall_shortcut (7811223557950931994) -->
- <skip />
+ <!-- outdated translation 959972195916090900 --> <string name="permdesc_uninstall_shortcut" msgid="7811223557950931994">"Pussibilitescha ch\'ina applicaziun possia stizzar scursanidas senza ina intervenziun da l\'utilisader."</string>
<string name="permlab_read_settings" msgid="3452408290738106747">"Leger ils parameters e las scursanidas da la pagina da partenza"</string>
- <!-- no translation found for permdesc_read_settings (1836104524215167383) -->
- <skip />
+ <!-- outdated translation 8377434937176025492 --> <string name="permdesc_read_settings" msgid="1836104524215167383">"Pussibilitescha ch\'ina applicaziun possia leger ils parameters e las scursanidas da la pagina da partenza."</string>
<string name="permlab_write_settings" msgid="1360567537236705628">"Definir ils parameters e las scursanidas per la pagina da partenza"</string>
- <!-- no translation found for permdesc_write_settings (6763846563231494591) -->
- <skip />
+ <!-- outdated translation 1098648778383349818 --> <string name="permdesc_write_settings" msgid="6763846563231494591">"Pussibilitescha ch\'ina applicaziun possia midar ils parameters e las scursanidas sin la pagina da partenza."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Problems cun chargiar il widget"</string>
<!-- no translation found for uninstall_system_app_text (6429814133777046491) -->
<skip />
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 84085fe..c0abcbf 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -88,7 +88,7 @@
<string name="workspace_scroll_format" msgid="7911126267695001437">"Рабочая область %1$d из %2$d"</string>
<string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Приложения: стр. %1$d из %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Виджеты: стр. %1$d из %2$d"</string>
- <string name="workspace_cling_title" msgid="738396473989890567">"Будьте как дома"</string>
+ <string name="workspace_cling_title" msgid="738396473989890567">"Чувствуйте себя как дома"</string>
<string name="workspace_cling_move_item" msgid="791013895761065070">"Добавляйте сюда любимые приложения."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Чтобы открыть список приложений, нажмите на круг."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Выберите приложения"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 886a123..490979e 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -89,7 +89,7 @@
<string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Ukurasa wa programu %1$d ya %2$d"</string>
<string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Ukurasa wa wijeti %1$d ya %2$d"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"Jisikie huru"</string>
- <string name="workspace_cling_move_item" msgid="791013895761065070">"Unaweza kuweka prog zako uzipendazo hapa."</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"Unaweza kuweka programu unazozipenda zaidi hapa."</string>
<string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Kutazama programu zako zote, gusa duara."</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"Chagua programu kadhaa"</string>
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"Ili kuongeza programu kwa skrini yako ya Nyumbani, iguse na uishikilie."</string>
diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java
index 2430a6b..1e8379d 100644
--- a/src/com/android/launcher2/IconCache.java
+++ b/src/com/android/launcher2/IconCache.java
@@ -16,7 +16,9 @@
package com.android.launcher2;
+import android.app.ActivityManager;
import android.content.ComponentName;
+import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
@@ -24,7 +26,6 @@
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
-import android.util.DisplayMetrics;
import java.util.HashMap;
@@ -49,23 +50,13 @@
private int mIconDpi;
public IconCache(LauncherApplication context) {
+ ActivityManager activityManager =
+ (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+
mContext = context;
mPackageManager = context.getPackageManager();
- int density = context.getResources().getDisplayMetrics().densityDpi;
- if (LauncherApplication.isScreenLarge()) {
- if (density == DisplayMetrics.DENSITY_LOW) {
- mIconDpi = DisplayMetrics.DENSITY_MEDIUM;
- } else if (density == DisplayMetrics.DENSITY_MEDIUM) {
- mIconDpi = DisplayMetrics.DENSITY_HIGH;
- } else if (density == DisplayMetrics.DENSITY_HIGH) {
- mIconDpi = DisplayMetrics.DENSITY_XHIGH;
- } else if (density == DisplayMetrics.DENSITY_XHIGH) {
- // We'll need to use a denser icon, or some sort of a mipmap
- mIconDpi = DisplayMetrics.DENSITY_XHIGH;
- }
- } else {
- mIconDpi = context.getResources().getDisplayMetrics().densityDpi;
- }
+ mIconDpi = activityManager.getLauncherLargeIconDensity();
+
// need to set mIconDpi before getting default icon
mDefaultIcon = makeDefaultIcon();
}
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 41e8a46..7ba3950 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -279,9 +279,11 @@
// landscape
TypedArray actionBarSizeTypedArray =
context.obtainStyledAttributes(new int[] { android.R.attr.actionBarSize });
+ DisplayMetrics displayMetrics = res.getDisplayMetrics();
final float actionBarHeight = actionBarSizeTypedArray.getDimension(0, 0f);
final float systemBarHeight = res.getDimension(R.dimen.status_bar_height);
- final float smallestScreenDim = res.getConfiguration().smallestScreenWidthDp;
+ final float smallestScreenDim = res.getConfiguration().smallestScreenWidthDp *
+ displayMetrics.density;
cellCountX = 1;
while (CellLayout.widthInPortrait(res, cellCountX + 1) <= smallestScreenDim) {