Merge "Add LauncherProviderChangeListener" into ub-now-mister-ugly
diff --git a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
index bbbd910..1f35622 100644
--- a/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
+++ b/WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java
@@ -366,6 +366,14 @@
getWindowManager());
// Get the crop
RectF cropRect = mCropView.getCrop();
+
+ // due to rounding errors in the cropview renderer the edges can be slightly offset
+ // therefore we ensure that the boundaries are sanely defined
+ cropRect.left = Math.max(0, cropRect.left);
+ cropRect.right = Math.min(mCropView.getWidth(), cropRect.right);
+ cropRect.top = Math.max(0, cropRect.top);
+ cropRect.bottom = Math.min(mCropView.getHeight(), cropRect.bottom);
+
int cropRotation = mCropView.getImageRotation();
float cropScale = mCropView.getWidth() / (float) cropRect.width();
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index aa8902f..05ecc9d 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -35,7 +35,7 @@
<string name="rename_folder_label" msgid="3727762225964550653">"አቃፊ ስም"</string>
<string name="rename_folder_title" msgid="3771389277707820891">"አቃፊ ዳግም ሰይም"</string>
<string name="rename_action" msgid="5559600076028658757">"እሺ"</string>
- <string name="cancel_action" msgid="7009134900002915310">"ተው"</string>
+ <string name="cancel_action" msgid="7009134900002915310">"ይቅር"</string>
<string name="menu_item_add_item" msgid="1264911265836810421">"ወደ መነሻ ማያ ገጽ ያክሉ"</string>
<string name="group_applications" msgid="3797214114206693605">"መተግበሪያዎች"</string>
<string name="group_shortcuts" msgid="6012256992764410535">"አቋራጮች"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3daa2c9..21c4135 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"الأدوات"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"الخلفيات"</string>
<string name="settings_button_text" msgid="8119458837558863227">"الإعدادات"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"انتظار"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"جارٍ التنزيل"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"جارٍ التثبيت"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"غير معروفة"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"خطأ"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index d50c59b..322777c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Приспособления"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Тапети"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Настройки"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"Изчаква"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Изтегля се"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Инсталира се"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Няма информация"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Грешка"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b965964..d6cfb83 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Baggrunde"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Indstillinger"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"Afventer"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Downloader"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Installerer"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Ukendt"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Fejl"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 12de7fb..ba2d222 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"ابزارکها"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"کاغذدیواریها"</string>
<string name="settings_button_text" msgid="8119458837558863227">"تنظیمات"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"در حال انتظار"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"در حال دانلود"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"در حال نصب"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"نامشخص"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"خطا"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8fcb221..57a3bb5 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Widgetit"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Taustakuvat"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Asetukset"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"Odottaa"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Ladataan"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Asennetaan"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Tuntematon"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Virhe"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 27fcba4..cd7d6c0 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Fonds d\'écran"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Paramètres"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"En attente"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Téléchargement..."</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Installation…"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Inconnu"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Erreur"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c69b805..f228628 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Fonds d\'écran"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Paramètres"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"En attente"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Téléchargement…"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Installation…"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Inconnu"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Erreur"</string>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index bf7afd2..23a50c6 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Վիջեթներ"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Պաստառներ"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Կարգավորումներ"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"Առկախ է"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Ներբեռնվում է"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Տեղադրվում է"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Անհայտ է"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Սխալ կա"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a3c4d53..d10089f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"ウィジェット"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"壁紙"</string>
<string name="settings_button_text" msgid="8119458837558863227">"設定"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"待機中"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"ダウンロード中"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"インストール中"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"不明"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"エラー"</string>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 1e11b6a..74d1d45 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"ვიჯეტები"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"ფონები"</string>
<string name="settings_button_text" msgid="8119458837558863227">"პარამეტრები"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"მოცდა..."</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"ჩამოტვირთვა..."</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"ინსტალაცია,,,"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"უცნობი"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"შეცდომა"</string>
</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index fc8d32b..d397cff 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"ធាតុក្រាហ្វិក"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"ផ្ទាំងរូបភាព"</string>
<string name="settings_button_text" msgid="8119458837558863227">"ការកំណត់"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"រង់ចាំ"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"ទាញយក"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"ដំឡើង"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"មិនស្គាល់"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"កំហុស"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b5ca25f..02dd6b1 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"위젯"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"배경화면"</string>
<string name="settings_button_text" msgid="8119458837558863227">"설정"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"대기 중"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"다운로드 중"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"설치 중"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"알 수 없음"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"오류"</string>
</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 2b60612..d783199 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Виджет"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Ханын зураг"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Тохиргоо"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"Хүлээж байна"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Татаж авч байна"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Суулгаж байна"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Тодорхойгүй"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Алдаа"</string>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 5152461..a659e10 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Widget"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Kertas dinding"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Tetapan"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"Menunggu"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Memuat turun"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Memasang"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Tidak diketahui"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Ralat"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9a9ff34..156ad2a 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Widgets"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Planos de fundo"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Configurações"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"Aguardando"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Transferindo"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Instalando"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Desconhecido"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Erro"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 62ebed3..ac6e6da 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Widgeturi"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Imagini de fundal"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Setări"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"În așteptare"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Se descarcă"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"În curs de instalare"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Necunoscut"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Eroare"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index cf39d3b..2575305 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Виджеты"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Обои"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Настройки"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"Ожидается"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Скачивается"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Устанавливается"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Неизвестно"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Сбой"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1c54589..0e47c5d 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Miniaplikácie"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Tapety"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Nastavenia"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"Čaká sa"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Sťahovanie"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Inštalácia"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Neznáme"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Chyba"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c3eb85d..634c33f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Pripomočki"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Ozadja"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Nastavitve"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"Čakanje"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Prenos"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Nameščanje"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Neznano"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Napaka"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 5b820d0..a79afaf 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"วิดเจ็ต"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"วอลเปเปอร์"</string>
<string name="settings_button_text" msgid="8119458837558863227">"การตั้งค่า"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"กำลังรอ"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"กำลังดาวน์โหลด"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"กำลังติดตั้ง"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"ไม่รู้จัก"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"ข้อผิดพลาด"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5fb2d62..77173bb 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Mga Widget"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Mga Wallpaper"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Mga Setting"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"Naghihintay"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Nagda-download"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Nag-i-install"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Hindi kilala"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Error"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 75fda78..d65a5d0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Widget\'lar"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Duvar Kağıtları"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Ayarlar"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"Bekliyor"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"İndiriliyor"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Yükleniyor"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Bilinmiyor"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Hata"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ab99442..7797651 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"Tiện ích con"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"Hình nền"</string>
<string name="settings_button_text" msgid="8119458837558863227">"Cài đặt"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"Đang đợi"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"Đang tải xuống"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"Đang cài đặt"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"Không xác định"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"Lỗi"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 593bac0..a4c80cc 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"小部件"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"壁纸"</string>
<string name="settings_button_text" msgid="8119458837558863227">"设置"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"正在等待"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"正在下载"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"正在安装"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"未知"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"错误"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 2525798..93e74cf 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"小工具"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"桌布"</string>
<string name="settings_button_text" msgid="8119458837558863227">"設定"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"等候中"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"下載中"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"安裝中"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"不明"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"錯誤"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 36e0d0b..5764bb7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -107,14 +107,9 @@
<string name="widget_button_text" msgid="2880537293434387943">"小工具"</string>
<string name="wallpaper_button_text" msgid="8404103075899945851">"桌布"</string>
<string name="settings_button_text" msgid="8119458837558863227">"設定"</string>
- <!-- no translation found for package_state_enqueued (6227252464303085641) -->
- <skip />
- <!-- no translation found for package_state_downloading (4088770468458724721) -->
- <skip />
- <!-- no translation found for package_state_installing (7588193972189849870) -->
- <skip />
- <!-- no translation found for package_state_unknown (7592128424511031410) -->
- <skip />
- <!-- no translation found for package_state_error (6858560020210815018) -->
- <skip />
+ <string name="package_state_enqueued" msgid="6227252464303085641">"等待中"</string>
+ <string name="package_state_downloading" msgid="4088770468458724721">"下載中…"</string>
+ <string name="package_state_installing" msgid="7588193972189849870">"安裝中"</string>
+ <string name="package_state_unknown" msgid="7592128424511031410">"不明"</string>
+ <string name="package_state_error" msgid="6858560020210815018">"發生錯誤"</string>
</resources>
diff --git a/src/com/android/launcher3/AppInfo.java b/src/com/android/launcher3/AppInfo.java
index 5e8cca8..f85f691 100644
--- a/src/com/android/launcher3/AppInfo.java
+++ b/src/com/android/launcher3/AppInfo.java
@@ -60,7 +60,7 @@
itemType = LauncherSettings.BaseLauncherColumns.ITEM_TYPE_SHORTCUT;
}
- protected Intent getIntent() {
+ public Intent getIntent() {
return intent;
}
diff --git a/src/com/android/launcher3/ItemInfo.java b/src/com/android/launcher3/ItemInfo.java
index 3dc92c9..3fe4c60 100644
--- a/src/com/android/launcher3/ItemInfo.java
+++ b/src/com/android/launcher3/ItemInfo.java
@@ -34,7 +34,7 @@
/**
* The id in the settings database for this item
*/
- long id = NO_ID;
+ public long id = NO_ID;
/**
* One of {@link LauncherSettings.Favorites#ITEM_TYPE_APPLICATION},
@@ -42,7 +42,7 @@
* {@link LauncherSettings.Favorites#ITEM_TYPE_FOLDER}, or
* {@link LauncherSettings.Favorites#ITEM_TYPE_APPWIDGET}.
*/
- int itemType;
+ public int itemType;
/**
* The id of the container that holds this item. For the desktop, this will be
@@ -50,27 +50,27 @@
* will be {@link #NO_ID} (since it is not stored in the settings DB). For user folders
* it will be the id of the folder.
*/
- long container = NO_ID;
+ public long container = NO_ID;
/**
* Iindicates the screen in which the shortcut appears.
*/
- long screenId = -1;
+ public long screenId = -1;
/**
* Indicates the X position of the associated cell.
*/
- int cellX = -1;
+ public int cellX = -1;
/**
* Indicates the Y position of the associated cell.
*/
- int cellY = -1;
+ public int cellY = -1;
/**
* Indicates the X cell span.
*/
- int spanX = 1;
+ public int spanX = 1;
/**
* Indicates the Y cell span.
@@ -80,17 +80,17 @@
/**
* Indicates the minimum X cell span.
*/
- int minSpanX = 1;
+ public int minSpanX = 1;
/**
* Indicates the minimum Y cell span.
*/
- int minSpanY = 1;
+ public int minSpanY = 1;
/**
* Indicates that this item needs to be updated in the db
*/
- boolean requiresDbUpdate = false;
+ public boolean requiresDbUpdate = false;
/**
* Title of the item
@@ -118,7 +118,7 @@
LauncherModel.checkItemInfo(this);
}
- protected Intent getIntent() {
+ public Intent getIntent() {
throw new RuntimeException("Unexpected Intent");
}
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e3b30cb..2d1d2f6 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2599,6 +2599,8 @@
}
}
+ public void onDragStarted(View view) {}
+
/**
* Called when the user stops interacting with the launcher.
* This implies that the user is now on the homescreen and is not doing housekeeping.
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 62e6f31..cab55c7 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -461,7 +461,8 @@
int startRows = out.rows;
if (DEBUG) Log.d(TAG, "starting here: " + startRows);
- String where = Favorites.ITEM_TYPE + "=" + Favorites.ITEM_TYPE_APPLICATION;
+ String where = Favorites.ITEM_TYPE + "=" + Favorites.ITEM_TYPE_APPLICATION + " OR " +
+ Favorites.ITEM_TYPE + "=" + Favorites.ITEM_TYPE_SHORTCUT;
Cursor cursor = cr.query(Favorites.CONTENT_URI, FAVORITE_PROJECTION,
where, null, null);
Set<String> currentIds = new HashSet<String>(cursor.getCount());
diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java
index ede3175..5afa784 100644
--- a/src/com/android/launcher3/ShortcutInfo.java
+++ b/src/com/android/launcher3/ShortcutInfo.java
@@ -92,7 +92,7 @@
itemType = LauncherSettings.BaseLauncherColumns.ITEM_TYPE_SHORTCUT;
}
- protected Intent getIntent() {
+ public Intent getIntent() {
return intent;
}
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index a22b025..1732e37 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2598,6 +2598,7 @@
}
public void beginDragShared(View child, DragSource source) {
+ mLauncher.onDragStarted(child);
// The drag bitmap follows the touch point around on the screen
final Bitmap b = createDragBitmap(child, new Canvas(), DRAG_BITMAP_PADDING);