diff --git a/res/drawable-hdpi/wallpaper_bluegray.jpg b/res/drawable-hdpi/wallpaper_bluegray.jpg new file mode 100644 index 0000000000..a07a25f987 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_bluegray.jpg differ diff --git a/res/drawable-hdpi/wallpaper_bluegray_small.jpg b/res/drawable-hdpi/wallpaper_bluegray_small.jpg new file mode 100644 index 0000000000..8ae3771d1a Binary files /dev/null and b/res/drawable-hdpi/wallpaper_bluegray_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_brown_small.jpg b/res/drawable-hdpi/wallpaper_brown_small.jpg index 99bfec8690..153305b568 100644 Binary files a/res/drawable-hdpi/wallpaper_brown_small.jpg and b/res/drawable-hdpi/wallpaper_brown_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_cloud.jpg b/res/drawable-hdpi/wallpaper_cloud.jpg new file mode 100644 index 0000000000..f3b5545cde Binary files /dev/null and b/res/drawable-hdpi/wallpaper_cloud.jpg differ diff --git a/res/drawable-hdpi/wallpaper_cloud_small.jpg b/res/drawable-hdpi/wallpaper_cloud_small.jpg new file mode 100644 index 0000000000..3487c0c0c1 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_cloud_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_darkgraylined.jpg b/res/drawable-hdpi/wallpaper_darkgraylined.jpg deleted file mode 100644 index 42c8fd1eac..0000000000 Binary files a/res/drawable-hdpi/wallpaper_darkgraylined.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_field.jpg b/res/drawable-hdpi/wallpaper_field.jpg new file mode 100644 index 0000000000..1163b585d7 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_field.jpg differ diff --git a/res/drawable-hdpi/wallpaper_field_small.jpg b/res/drawable-hdpi/wallpaper_field_small.jpg new file mode 100644 index 0000000000..c63afa4ffe Binary files /dev/null and b/res/drawable-hdpi/wallpaper_field_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_gray.jpg b/res/drawable-hdpi/wallpaper_gray.jpg new file mode 100644 index 0000000000..6ccbaca057 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_gray.jpg differ diff --git a/res/drawable-hdpi/wallpaper_darkgraylined_small.jpg b/res/drawable-hdpi/wallpaper_gray_small.jpg similarity index 62% rename from res/drawable-hdpi/wallpaper_darkgraylined_small.jpg rename to res/drawable-hdpi/wallpaper_gray_small.jpg index 8f5433a1fa..3464142126 100644 Binary files a/res/drawable-hdpi/wallpaper_darkgraylined_small.jpg and b/res/drawable-hdpi/wallpaper_gray_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_greencorr.jpg b/res/drawable-hdpi/wallpaper_greencorr.jpg deleted file mode 100644 index 93707a9201..0000000000 Binary files a/res/drawable-hdpi/wallpaper_greencorr.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_greencorr_small.jpg b/res/drawable-hdpi/wallpaper_greencorr_small.jpg deleted file mode 100644 index 5776deebde..0000000000 Binary files a/res/drawable-hdpi/wallpaper_greencorr_small.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_greengray.jpg b/res/drawable-hdpi/wallpaper_greengray.jpg new file mode 100644 index 0000000000..dedaa6ff16 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_greengray.jpg differ diff --git a/res/drawable-hdpi/wallpaper_greengray_small.jpg b/res/drawable-hdpi/wallpaper_greengray_small.jpg new file mode 100644 index 0000000000..e80421111e Binary files /dev/null and b/res/drawable-hdpi/wallpaper_greengray_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_hazybluedots_small.jpg b/res/drawable-hdpi/wallpaper_hazybluedots_small.jpg index 273b7acc91..7ac0932cd2 100644 Binary files a/res/drawable-hdpi/wallpaper_hazybluedots_small.jpg and b/res/drawable-hdpi/wallpaper_hazybluedots_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_lavadark_small.jpg b/res/drawable-hdpi/wallpaper_lavadark_small.jpg index 4134d2531c..e5c1d83cc0 100644 Binary files a/res/drawable-hdpi/wallpaper_lavadark_small.jpg and b/res/drawable-hdpi/wallpaper_lavadark_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_leaves.jpg b/res/drawable-hdpi/wallpaper_leaves.jpg new file mode 100644 index 0000000000..a287f18d8d Binary files /dev/null and b/res/drawable-hdpi/wallpaper_leaves.jpg differ diff --git a/res/drawable-hdpi/wallpaper_leaves_small.jpg b/res/drawable-hdpi/wallpaper_leaves_small.jpg new file mode 100644 index 0000000000..56dcfbc7d8 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_leaves_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_nexusrain_small.jpg b/res/drawable-hdpi/wallpaper_nexusrain_small.jpg index 42e9ca4621..66e4ec84ae 100644 Binary files a/res/drawable-hdpi/wallpaper_nexusrain_small.jpg and b/res/drawable-hdpi/wallpaper_nexusrain_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_nexuswallpaper1.png b/res/drawable-hdpi/wallpaper_nexuswallpaper1.png new file mode 100644 index 0000000000..2856da02b9 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_nexuswallpaper1.png differ diff --git a/res/drawable-hdpi/wallpaper_nexuswallpaper1_small.jpg b/res/drawable-hdpi/wallpaper_nexuswallpaper1_small.jpg new file mode 100644 index 0000000000..abc0016fc0 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_nexuswallpaper1_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_noexpectsthe.jpg b/res/drawable-hdpi/wallpaper_noexpectsthe.jpg deleted file mode 100644 index 3532bf31cb..0000000000 Binary files a/res/drawable-hdpi/wallpaper_noexpectsthe.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_noexpectsthe_small.jpg b/res/drawable-hdpi/wallpaper_noexpectsthe_small.jpg deleted file mode 100644 index 309fb1d66b..0000000000 Binary files a/res/drawable-hdpi/wallpaper_noexpectsthe_small.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_pcut_small.jpg b/res/drawable-hdpi/wallpaper_pcut_small.jpg index c6dc8d11f6..81454e8625 100644 Binary files a/res/drawable-hdpi/wallpaper_pcut_small.jpg and b/res/drawable-hdpi/wallpaper_pcut_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_purple.jpg b/res/drawable-hdpi/wallpaper_purple.jpg deleted file mode 100644 index 8c2b027443..0000000000 Binary files a/res/drawable-hdpi/wallpaper_purple.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_purple_small.jpg b/res/drawable-hdpi/wallpaper_purple_small.jpg deleted file mode 100644 index d4e89ebe22..0000000000 Binary files a/res/drawable-hdpi/wallpaper_purple_small.jpg and /dev/null differ diff --git a/res/drawable-hdpi/wallpaper_redgray.jpg b/res/drawable-hdpi/wallpaper_redgray.jpg new file mode 100644 index 0000000000..74c8432265 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_redgray.jpg differ diff --git a/res/drawable-hdpi/wallpaper_redgray_small.jpg b/res/drawable-hdpi/wallpaper_redgray_small.jpg new file mode 100644 index 0000000000..d50049714b Binary files /dev/null and b/res/drawable-hdpi/wallpaper_redgray_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_ropelights_small.jpg b/res/drawable-hdpi/wallpaper_ropelights_small.jpg index f8c949d81c..6d1a56726d 100644 Binary files a/res/drawable-hdpi/wallpaper_ropelights_small.jpg and b/res/drawable-hdpi/wallpaper_ropelights_small.jpg differ diff --git a/res/drawable-hdpi/wallpaper_x67.jpg b/res/drawable-hdpi/wallpaper_x67.jpg new file mode 100644 index 0000000000..d0fc791f45 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_x67.jpg differ diff --git a/res/drawable-hdpi/wallpaper_x67_small.jpg b/res/drawable-hdpi/wallpaper_x67_small.jpg new file mode 100644 index 0000000000..1037fcaa41 Binary files /dev/null and b/res/drawable-hdpi/wallpaper_x67_small.jpg differ diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index debfc8ba3a..c8e362b9d1 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Launcher" "Android Core Apps" "Složka" "Vybrat tapetu ze složky" @@ -45,6 +45,10 @@ "Zástupce %s již existuje." "Vyberte zástupce" "Vybrat složku" + + + + "Přidat" "Tapeta" "Hledat" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 95d43fd863..22d28354bc 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Launcher" "Android-kerneprogrammer" "Mappe" "Vælg tapet fra" @@ -45,6 +45,10 @@ "Genvejen \"%s\" findes allerede." "Vælg genvej" "Vælg mappe" + + + + "Tilføj" "Tapet" "Søg" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 117dedefa7..4f72fd1cb2 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Launcher" "Android Core Apps" "Ordner" "Hintergrund auswählen" @@ -45,6 +45,10 @@ "\"%s\"-Verknüpfung ist bereits vorhanden." "Tastenkürzel auswählen" "Ordner auswählen" + + + + "Hinzufügen" "Hintergrund" "Suchen" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index de44fcd8ef..4f921e30ea 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Launcher" "Βασικές εφαρμογές Android" "Φάκελος" "Επιλογή ταπετσαρίας από" @@ -45,6 +45,10 @@ "Η συντόμευση \"%s\" υπάρχει ήδη." "Επιλογή συντόμευσης" "Επιλογή φακέλου" + + + + "Προσθήκη" "Ταπετσαρία" "Αναζήτηση" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 22ecb7b862..32f41bbac3 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Launcher" "Aplicaciones del núcleo de Android" "Carpeta" "Seleccionar papel tapiz desde" @@ -45,6 +45,10 @@ "El acceso directo \"%s\" ya existe." "Seleccionar acceso directo" "Seleccionar carpeta" + + + + "Agregar" "Papel tapiz" "Buscar" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 5af29896f1..530e7b6a80 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Launcher" "Aplicaciones básicas de Android" "Carpeta" "Seleccionar fondo de pantalla de" @@ -45,6 +45,10 @@ "El acceso directo \"%s\" ya existe." "Seleccionar acceso directo" "Seleccionar carpeta" + + + + "Añadir" "Fondo de pantalla" "Buscar con Google" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 63a146cde1..adb5da9a46 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Lanceur d\'applications" "Applications de base Android" "Dossier" "Sélectionner à partir de..." @@ -45,6 +45,10 @@ "Le raccourci \"%s\" existe déjà." "Sélectionner un raccourci" "Sélectionner le dossier" + + + + "Ajouter" "Fond d\'écran" "Rechercher" diff --git a/res/values-hdpi/wallpapers.xml b/res/values-hdpi/wallpapers.xml index 37d542f5f9..08c6dc191d 100644 --- a/res/values-hdpi/wallpapers.xml +++ b/res/values-hdpi/wallpapers.xml @@ -18,22 +18,27 @@ wallpaper_nexusrain - wallpaper_darkgraylined + wallpaper_nexuswallpaper1 + wallpaper_x67 + wallpaper_bluegray + wallpaper_gray + wallpaper_greengray + wallpaper_redgray wallpaper_brown - wallpaper_noexpectsthe wallpaper_lavadark - wallpaper_greencorr wallpaper_pcut wallpaper_hazybluedots - wallpaper_purple wallpaper_ropelights wallpaper_electric wallpaper_grass + wallpaper_canyon wallpaper_monumentvalley wallpaper_tree wallpaper_zanzibar + wallpaper_field + wallpaper_leaves + wallpaper_cloud wallpaper_desert - wallpaper_canyon wallpaper_goldengate wallpaper_grass_night wallpaper_galaxy diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 518507e576..8ec7907bd6 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Launcher" "Android Core Apps" "Cartella" "Seleziona sfondo da" @@ -45,6 +45,10 @@ "Collegamento \"%s\" già presente." "Seleziona collegamento" "Seleziona cartella" + + + + "Aggiungi" "Sfondo" "Cerca" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index dd17bd1a73..d49afe1b64 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "ランチャー" "Android Core Apps" "フォルダ" "壁紙を選択" @@ -45,6 +45,10 @@ "ショートカット「%s」は既に存在します。" "ショートカットを選択" "フォルダの選択" + + + + "追加" "壁紙" "検索" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index b5bd1dd0cf..cb24ead38c 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Launcher" "Android Core 애플리케이션" "폴더" "배경화면 선택" @@ -45,6 +45,10 @@ "바로가기(\'%s\')가 이미 있습니다." "바로가기 선택" "폴더 선택" + + + + "추가" "배경화면" "검색" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index fe22f69de7..16111b2ee9 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -15,7 +15,7 @@ --> - "Hjem" + "Utskytingsrampe" "Android-kjerneapplikasjoner" "Mappe" "Velg bakgrunnsbilde fra" @@ -45,6 +45,10 @@ "Snarveien «%s» fins allerede." "Velg snarvei" "Velg mappe" + + + + "Legg til" "Bakgrunnsbilde" "Søk" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index ffe5dae2d1..e8b8fc354a 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Launcher" "Android-kerntoepassingen" "Map" "Achtergrond selecteren in" @@ -45,6 +45,10 @@ "Snelkoppeling \'%s\' bestaat al." "Snelkoppeling selecteren" "Map selecteren" + + + + "Toevoegen" "Achtergrond" "Zoeken" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index a2b81c1817..532c7a9aa3 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Program uruchamiający" "Aplikacje główne systemu Android" "Folder" "Wybierz tapetę" @@ -45,6 +45,10 @@ "Skrót „%s” już istnieje." "Wybierz skrót" "Wybierz folder" + + + + "Dodaj" "Tapeta" "Szukaj" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index f619526085..d99878ac81 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Launcher" "Aplicações Principais do Android" "Pasta" "Seleccionar imagem de fundo a partir de" @@ -45,6 +45,10 @@ "O atalho \"%s\" já existe." "Seleccione o atalho" "Seleccione a pasta" + + + + "Adicionar" "Imagem de fundo" "Pesquisar" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 03547d1f70..cd85646c03 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Launcher" "Principais aplicativos do Android" "Pasta" "Selecionar papel de parede de" @@ -45,6 +45,10 @@ "O atalho \"%s\" já existe." "Selecionar atalho" "Selecionar pasta" + + + + "Adicionar" "Papel de parede" "Pesquisar" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index f74b5e5ddb..7de782ecf7 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Launcher" "Основные приложения Android" "Папка" "Выбрать обои из:" @@ -45,6 +45,10 @@ "Ярлык \"%s\" уже существует." "Выберите ярлык" "Выбор папки" + + + + "Добавить" "Обои" "Поиск" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index cf448ad60b..e7f7588fab 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Startbild" "Android Core Apps" "Mapp" "Välj bakgrund från" @@ -45,6 +45,10 @@ "Genvägen \"%s\" finns redan." "Välj genväg" "Välj mapp" + + + + "Lägg till" "Bakgrund" "Sök" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 9d116ff7f8..fe83debb7a 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "Launcher" "Android Core Apps" "Klasör" "Buradan duvar kağıdını seçin:" @@ -45,6 +45,10 @@ "\"%s\" kısayolu zaten var." "Kısayolu seçin" "Klasörü seçin" + + + + "Ekle" "Duvar Kağıdı" "Ara" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index ff7f489635..4b40054ee9 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -15,7 +15,8 @@ --> - "_Launcher2" + + "Android 核心应用程序" "文件夹" "选择壁纸来源" @@ -45,6 +46,10 @@ "“%s”快捷方式已存在。" "选择快捷方式" "选择文件夹" + + + + "添加" "壁纸" "搜索" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index b75995eb9c..6b8d3bbdbc 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -15,7 +15,7 @@ --> - "_Launcher2" + "發射器" "Android 核心應用程式" "資料夾" "從…選取桌布" @@ -45,6 +45,10 @@ "「%s」捷徑已經存在。" "選取捷徑" "選取資料夾" + + + + "新增" "桌布" "搜尋" diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index dc8a5ccdec..8853158101 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -483,6 +483,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag @Override protected void dispatchDraw(Canvas canvas) { + /* final boolean allAppsOpaque = mLauncher.isAllAppsOpaque(); if (mFading == allAppsOpaque) { invalidate(); @@ -494,6 +495,7 @@ public class Workspace extends ViewGroup implements DropTarget, DragSource, Drag canvas.drawARGB(0xff, 0, 0, 0); return; } + */ boolean restore = false; int restoreCount = 0;