From 314cd6db6a496985942d11fbc5174967afd93416 Mon Sep 17 00:00:00 2001
From: Eric Fischer <>
Date: Mon, 30 Mar 2009 15:52:27 -0700
Subject: [PATCH 01/14] AI 143547: Import revised translations. BUG=1738388
Automated import of CL 143547
---
res/values-cs/strings.xml | 21 ++++++++++++++-------
res/values-de/strings.xml | 21 ++++++++++++++-------
res/values-es/strings.xml | 21 ++++++++++++++-------
res/values-fr/strings.xml | 21 ++++++++++++++-------
res/values-it/strings.xml | 21 ++++++++++++++-------
res/values-ko/strings.xml | 21 ++++++++++++++-------
res/values-nb/strings.xml | 21 ++++++++++++++-------
res/values-nl/strings.xml | 21 ++++++++++++++-------
res/values-pl/strings.xml | 21 ++++++++++++++-------
res/values-ru/strings.xml | 21 ++++++++++++++-------
res/values-zh-rCN/strings.xml | 21 ++++++++++++++-------
res/values-zh-rTW/strings.xml | 21 ++++++++++++++-------
12 files changed, 168 insertions(+), 84 deletions(-)
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ecf67928ae..f0cc369e83 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -26,20 +26,27 @@
"OK"
"Zrušit"
"Přidat na plochu"
- "Aplikace"
- "Zástupce"
+
+
+
+
"Hledat"
- "Složka"
- "Složka Live"
- "Miniaplikace"
- "Tapeta"
+
+
+
+
+
+
+
+
"Složka"
"Hodiny"
"Rámeček fotografie"
"Vyhledávání"
"Na této ploše již není místo."
"Vyberte zástupce"
- "Vyberte složku Live"
+
+
"Přidat"
"Tapeta"
"Hledat"
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ca07fc6bca..40f3cabc8f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -26,20 +26,27 @@
"OK"
"Abbrechen"
"Zur Startseite hinzufügen"
- "Anwendung"
- "Verknüpfung"
+
+
+
+
"Suchen"
- "Ordner"
- "Live-Ordner"
- "Widget"
- "Hintergrund"
+
+
+
+
+
+
+
+
"Ordner"
"Uhr"
"Bildrahmen"
"Suchen"
"Auf der Startseite ist kein Platz mehr vorhanden."
"Tastenkürzel auswählen"
- "Live-Ordner auswählen"
+
+
"Hinzufügen"
"Hintergrund"
"Suchen"
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ecfdd98b68..b6e0cd842a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -26,20 +26,27 @@
"Aceptar"
"Cancelar"
"Añadir a pantalla de página principal"
- "Aplicación"
- "Acceso directo"
+
+
+
+
"Búsqueda"
- "Carpeta"
- "Carpeta activa"
- "Widget"
- "Fondo de pantalla"
+
+
+
+
+
+
+
+
"Carpeta"
"Reloj"
"Picture frame"
"Búsqueda de Google"
"No queda espacio en esta pantalla de página principal."
"Seleccionar acceso directo"
- "Seleccionar carpeta activa"
+
+
"Añadir"
"Fondo de pantalla"
"Buscar con Google"
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 203c37b512..a1b5e0e15d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -26,20 +26,27 @@
"OK"
"Annuler"
"Ajouter à l\'écran d\'accueil"
- "Application"
- "Raccourci"
+
+
+
+
"Recherche"
- "Dossier"
- "Dossier actif"
- "Widget"
- "Arrière-plan"
+
+
+
+
+
+
+
+
"Dossier"
"Horloge"
"Cadre d\'image"
"Rechercher"
"Plus d\'espace libre sur l\'écran d\'accueil."
"Sélectionner un raccourci"
- "Sélectionner dossier actif"
+
+
"Ajouter"
"Arrière-plan"
"Rechercher"
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c061ce7dac..346481d527 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -26,20 +26,27 @@
"OK"
"Annulla"
"Aggiungi a schermata Home"
- "Applicazione"
- "Scorciatoia"
+
+
+
+
"Ricerca"
- "Cartella"
- "Cartella dinamica"
- "Widget"
- "Sfondo"
+
+
+
+
+
+
+
+
"Cartella"
"Orologio"
"Cornice immagini"
"Ricerca"
"Spazio nella schermata Home esaurito."
"Seleziona collegamento"
- "Seleziona cartella dinamica"
+
+
"Aggiungi"
"Sfondo"
"Cerca"
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 52c7df5e59..495a7cfb6c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -26,20 +26,27 @@
"확인"
"취소"
"홈 화면에 추가"
- "응용프로그램"
- "바로가기"
+
+
+
+
"검색"
- "폴더"
- "라이브 폴더"
- "위젯"
- "배경화면"
+
+
+
+
+
+
+
+
"폴더"
"시계"
"사진 프레임"
"검색"
"홈 화면에 더 이상 공간이 없습니다."
"바로가기 선택"
- "라이브 폴더 선택"
+
+
"추가"
"배경화면"
"검색"
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8fdb3428f0..954b5d784e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -26,20 +26,27 @@
"OK"
"Avbryt"
"Legg til skrivebord"
- "Applikasjon"
- "Snarvei"
+
+
+
+
"Søk"
- "Mappe"
- "Aktiv mappe"
- "Skrivebordselement"
- "Bakgrunnsbilde"
+
+
+
+
+
+
+
+
"Mappe"
"Klokke"
"Bilderamme"
"Søk"
"Ikke nok plass på skrivebordet."
"Velg snarvei"
- "Velg aktiv mappe"
+
+
"Legg til"
"Bakgrunnsbilde"
"Søk"
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1a07fa6ecb..c646850a75 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -26,20 +26,27 @@
"OK"
"Annuleren"
"Toevoegen aan startpagina"
- "Toepassing"
- "Snelkoppeling"
+
+
+
+
"Zoeken"
- "Map"
- "Live map"
- "Widget"
- "Achtergrond"
+
+
+
+
+
+
+
+
"Map"
"Klok"
"Fotolijstje"
"Zoeken"
"Er is geen ruimte meer op dit startscherm."
"Snelkoppeling selecteren"
- "Live map selecteren"
+
+
"Toevoegen"
"Achtergrond"
"Zoeken"
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e26d72308e..24347dd907 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -26,20 +26,27 @@
"OK"
"Anuluj"
"Dodaj do strony głównej"
- "Aplikacja"
- "Skrót"
+
+
+
+
"Wyszukiwarka"
- "Folder"
- "Folder aktywny"
- "Widget"
- "Tapeta"
+
+
+
+
+
+
+
+
"Folder"
"Zegar"
"Ramka obrazu"
"Wyszukiwarka"
"Brak miejsca na tej stronie głównej"
"Wybierz skrót"
- "Wybierz folder aktywny"
+
+
"Dodaj"
"Tapeta"
"Szukaj"
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2546503bcf..5dea21322b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -26,20 +26,27 @@
"ОК"
"Отмена"
"Добавление на главный экран"
- "Приложение"
- "Ярлык"
+
+
+
+
"Поиск"
- "Папка"
- "Динамическая папка"
- "Виджет"
- "Фоновый рисунок"
+
+
+
+
+
+
+
+
"Папка"
"Часы"
"Рамка для картинки"
"Поиск"
"На главном экране больше нет места."
"Выберите ярлык"
- "Выберите активную папку"
+
+
"Добавить"
"Фоновый рисунок"
"Искать"
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a71bb3a6f7..7e359d6bda 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -26,20 +26,27 @@
"确定"
"取消"
"添加到“主页”屏幕"
- "应用程序"
- "快捷键"
+
+
+
+
"搜索"
- "文件夹"
- "活动的文件夹"
- "小工具"
- "壁纸"
+
+
+
+
+
+
+
+
"文件夹"
"时钟"
"相框"
"搜索"
"该“主页”屏幕上没有多余空间。"
"选择快捷键"
- "选择活动文件夹"
+
+
"添加"
"壁纸"
"搜索"
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 217444e571..775eb2053d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -26,20 +26,27 @@
"確定"
"取消"
"新增至首頁畫面"
- "應用程式"
- "捷徑"
+
+
+
+
"搜尋"
- "資料夾"
- "使用中的資料夾"
- "Widget"
- "桌布"
+
+
+
+
+
+
+
+
"資料夾"
"時鐘"
"相框"
"搜尋"
"首頁已無空間"
"選取捷徑"
- "選取作用中資料夾"
+
+
"新增"
"桌布"
"搜尋"
From e5b142656c8afcba1c9d045b588c7717b3a22107 Mon Sep 17 00:00:00 2001
From: Jeffrey Sharkey <>
Date: Tue, 31 Mar 2009 10:12:20 -0700
Subject: [PATCH 02/14] AI 143622: Correctly startListening() for widget
updates when first boot completes. During the first boot upgrade,
LauncherProvider will deleteHost() to clear out any old appWidgetId bindings.
During the first boot, Launcher calls AppWidgetHost.startListening() to
watch for widget updates. It also calls loadUserItems(), which loads data
from LauncherProvider, triggering the database creation and deleteHost()
call. Because deleteHost() removes any existing callbacks, any future widget
updates are dropped on the floor. (This can currently be solved by
rebooting, because there isn't an upgrade on subsequent boots.) This bug
was particularly evident on vfpioneer-userdebug builds, as there aren't any
configuration changes that cause Launcher to be destroyed and recreated.
(When destroyed and recreated, we startListening() again, and
LauncherProvider doesn't call deleteHost().) To handle this special case,
Launcher creates a ContentObserver pointing at a specific URI, which the
LauncherProvider notifies when the AppWidgetHost is reset through
deleteHost(), allowing Launcher to correctly startListening() again.
BUG=1746104
Automated import of CL 143622
---
src/com/android/launcher/Launcher.java | 28 +++++++++++++++++++
.../android/launcher/LauncherProvider.java | 20 +++++++++++++
2 files changed, 48 insertions(+)
diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index 7b7802e1f8..7dd341819a 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -168,6 +168,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On
private final BroadcastReceiver mApplicationsReceiver = new ApplicationsIntentReceiver();
private final ContentObserver mObserver = new FavoritesChangeObserver();
+ private final ContentObserver mAppWidgetResetObserver = new AppWidgetResetObserver();
private LayoutInflater mInflater;
@@ -826,6 +827,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On
sModel.abortLoaders();
getContentResolver().unregisterContentObserver(mObserver);
+ getContentResolver().unregisterContentObserver(mAppWidgetResetObserver);
unregisterReceiver(mApplicationsReceiver);
}
@@ -1156,6 +1158,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On
private void registerContentObservers() {
ContentResolver resolver = getContentResolver();
resolver.registerContentObserver(LauncherSettings.Favorites.CONTENT_URI, true, mObserver);
+ resolver.registerContentObserver(LauncherProvider.CONTENT_APPWIDGET_RESET_URI, true, mAppWidgetResetObserver);
}
@Override
@@ -1221,6 +1224,16 @@ public final class Launcher extends Activity implements View.OnClickListener, On
sModel.loadUserItems(false, this, false, false);
}
+ /**
+ * When reset, we handle by calling {@link AppWidgetHost#startListening()}
+ * to make sure our callbacks are set correctly.
+ */
+ private void onAppWidgetReset() {
+ if (mAppWidgetHost != null) {
+ mAppWidgetHost.startListening();
+ }
+ }
+
void onDesktopItemsLoaded() {
if (mDestroyed) return;
bindDesktopItems();
@@ -1877,6 +1890,21 @@ public final class Launcher extends Activity implements View.OnClickListener, On
}
}
+ /**
+ * Receives notifications when the {@link AppWidgetHost} has been reset,
+ * usually only when the {@link LauncherProvider} database is first created.
+ */
+ private class AppWidgetResetObserver extends ContentObserver {
+ public AppWidgetResetObserver() {
+ super(new Handler());
+ }
+
+ @Override
+ public void onChange(boolean selfChange) {
+ onAppWidgetReset();
+ }
+ }
+
/**
* Receives intents from other applications to change the wallpaper.
*/
diff --git a/src/com/android/launcher/LauncherProvider.java b/src/com/android/launcher/LauncherProvider.java
index e63ef3084f..a27b746672 100644
--- a/src/com/android/launcher/LauncherProvider.java
+++ b/src/com/android/launcher/LauncherProvider.java
@@ -65,6 +65,14 @@ public class LauncherProvider extends ContentProvider {
static final String TABLE_FAVORITES = "favorites";
static final String PARAMETER_NOTIFY = "notify";
+ /**
+ * {@link Uri} triggered at any registered {@link ContentObserver} when
+ * {@link AppWidgetHost#deleteHost()} is called during database creation.
+ * Use this to recall {@link AppWidgetHost#startListening()} if needed.
+ */
+ static final Uri CONTENT_APPWIDGET_RESET_URI =
+ Uri.parse("content://" + AUTHORITY + "/appWidgetReset");
+
private SQLiteOpenHelper mOpenHelper;
@Override
@@ -176,6 +184,17 @@ public class LauncherProvider extends ContentProvider {
mAppWidgetHost = new AppWidgetHost(context, Launcher.APPWIDGET_HOST_ID);
}
+ /**
+ * Send notification that we've deleted the {@link AppWidgetHost},
+ * probably as part of the initial database creation. The receiver may
+ * want to re-call {@link AppWidgetHost#startListening()} to ensure
+ * callbacks are correctly set.
+ */
+ private void sendAppWidgetResetNotify() {
+ final ContentResolver resolver = mContext.getContentResolver();
+ resolver.notifyChange(CONTENT_APPWIDGET_RESET_URI, null);
+ }
+
@Override
public void onCreate(SQLiteDatabase db) {
if (LOGD) Log.d(LOG_TAG, "creating new launcher database");
@@ -204,6 +223,7 @@ public class LauncherProvider extends ContentProvider {
// Database was just created, so wipe any previous widgets
if (mAppWidgetHost != null) {
mAppWidgetHost.deleteHost();
+ sendAppWidgetResetNotify();
}
if (!convertDatabase(db)) {
From cde747088852dbe353e09ced011e139c121c9999 Mon Sep 17 00:00:00 2001
From: Jeffrey Sharkey <>
Date: Tue, 31 Mar 2009 12:09:02 -0700
Subject: [PATCH 03/14] AI 143746: Fix search widget assets to not overlap in
landscape mode. Done by using small button framework assets, but with
manual padding adjustments to bring back to original button size.
BUG=1749120
Automated import of CL 143746
---
res/layout/widget_search.xml | 6 ++++--
res/values/styles.xml | 7 +++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/res/layout/widget_search.xml b/res/layout/widget_search.xml
index b4c455cea4..f87d30f162 100644
--- a/res/layout/widget_search.xml
+++ b/res/layout/widget_search.xml
@@ -45,17 +45,19 @@
/>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a3d3e22c78..9b06d2620b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -53,4 +53,11 @@
- 10dip
- 10dip
+
+
From 1796c48dd777b44a808944f60ca2cab601c55bd1 Mon Sep 17 00:00:00 2001
From: Jeffrey Sharkey <>
Date: Tue, 31 Mar 2009 18:24:45 -0700
Subject: [PATCH 04/14] AI 143907: Make search widget drop-down wider.
BUG=1749373
Automated import of CL 143907
---
.../spinner_dropdown_background_down.9.png | Bin 0 -> 456 bytes
.../spinner_dropdown_background_up.9.png | Bin 0 -> 415 bytes
res/drawable/spinner_dropdown_background.xml | 22 ++++++++++++++
.../spinner_dropdown_background_down.9.png | Bin 0 -> 446 bytes
.../spinner_dropdown_background_up.9.png | Bin 0 -> 421 bytes
res/layout/widget_search.xml | 2 ++
res/values/dimens.xml | 19 ++++++++++++
src/com/android/launcher/Search.java | 27 ++++++++++++++++++
8 files changed, 70 insertions(+)
create mode 100644 res/drawable-land/spinner_dropdown_background_down.9.png
create mode 100644 res/drawable-land/spinner_dropdown_background_up.9.png
create mode 100644 res/drawable/spinner_dropdown_background.xml
create mode 100644 res/drawable/spinner_dropdown_background_down.9.png
create mode 100644 res/drawable/spinner_dropdown_background_up.9.png
create mode 100644 res/values/dimens.xml
diff --git a/res/drawable-land/spinner_dropdown_background_down.9.png b/res/drawable-land/spinner_dropdown_background_down.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb64b7817f7bca08f90eea86bc46c166c0c22f81
GIT binary patch
literal 456
zcmeAS@N?(olHy`uVBq!ia0vp^DnP8k!3HF!9g27iq!^2X+?^QKos)S9l&t&u8CePIV#%XdV9S3C+b}8u4sx`{Qbo$X~!7Oi>(}45?;EG)0QpM
zjrDA6df)DzFyrC>io*x~Gu2Pus4CRyvZ!7$b^mh*ySaYyjH_0CO1fvl%kcTR7PB%xbHSvDMae`&YKLFDEc?!cgS|?;bXTsMo2JRLVEsJR{w3t?J}^fBmOMPb4QW
z=toYw>lRq@lzG|fUF}Dc3h!@wD|~@5Tl`$o1EC#kMGunf^Z6I#KRA3Y`TPOv4MoeO
z9hmd^?v>@PFv)B%{g7(AHT8zns(V{iwSAD{TRj+4l(kYjyW7y-BE_==Y)fr$gGkCiCxvXlg0}5APoldNPgg>;?A|m-wpWeNJ3TfAOOG<(;d(UR_tRv^uw*o_fz?sq^F9
zw$Fzd9Uss~+CIX&-^Nv$E9*f;LATkq{U#GtX%Eb8^zzx#fPo#1YIAgACdq`ttS&(OMEe^-1#
zBBzG~lhA|)7L^5(4ts4D#yi|oZS<>qvU?r#g4}5J)9tmB7cd4*TPl3P-@J|~YZhC>
zB8@o>Z9vggs~ApvzQdVuL)~+d3J}$re{H`1|N1}uXLiBrM!pKZz|dpxboFyt=akR{
E0K5sJ%K!iX
literal 0
HcmV?d00001
diff --git a/res/drawable/spinner_dropdown_background.xml b/res/drawable/spinner_dropdown_background.xml
new file mode 100644
index 0000000000..9c37286a2e
--- /dev/null
+++ b/res/drawable/spinner_dropdown_background.xml
@@ -0,0 +1,22 @@
+
+
+
+
+