diff options
47 files changed, 3 insertions, 819 deletions
diff --git a/res/drawable-hdpi/ic_iconpacks.png b/res/drawable-hdpi/ic_iconpacks.png Binary files differdeleted file mode 100644 index 7985c1847..000000000 --- a/res/drawable-hdpi/ic_iconpacks.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_iconpacks.png b/res/drawable-mdpi/ic_iconpacks.png Binary files differdeleted file mode 100644 index 36e35c215..000000000 --- a/res/drawable-mdpi/ic_iconpacks.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_iconpacks.png b/res/drawable-xhdpi/ic_iconpacks.png Binary files differdeleted file mode 100644 index 207d68a35..000000000 --- a/res/drawable-xhdpi/ic_iconpacks.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_iconpacks.png b/res/drawable-xxhdpi/ic_iconpacks.png Binary files differdeleted file mode 100644 index d1aea29da..000000000 --- a/res/drawable-xxhdpi/ic_iconpacks.png +++ /dev/null diff --git a/res/drawable/iconpack_button.xml b/res/drawable/iconpack_button.xml deleted file mode 100644 index fedfb7a8e..000000000 --- a/res/drawable/iconpack_button.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:drawable="@drawable/ic_iconpacks_pressed" /> - <item android:state_pressed="true" android:drawable="@drawable/ic_iconpacks_pressed" /> - <item android:drawable="@drawable/ic_iconpacks" /> -</selector> diff --git a/res/layout/iconpack_chooser.xml b/res/layout/iconpack_chooser.xml deleted file mode 100644 index 6caf9f765..000000000 --- a/res/layout/iconpack_chooser.xml +++ /dev/null @@ -1,28 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:orientation="horizontal"> - <ImageView - android:id="@+id/icon" - android:layout_gravity="center_vertical" - android:layout_width="@dimen/app_icon_size" - android:layout_height="@dimen/app_icon_size" - android:layout_margin="8dp"/> - <TextView - android:id="@+id/title" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:paddingStart="8dip" - android:paddingEnd="8dip" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceLarge"/> - <ImageView - android:src="@*android:drawable/ic_cab_done_holo_dark" - android:id="@+id/check" - android:layout_gravity="center_vertical" - android:layout_width="@dimen/app_icon_size" - android:layout_height="@dimen/app_icon_size" - android:layout_margin="8dp"/> - -</LinearLayout> diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml index b6707417c..cf9f616d7 100644 --- a/res/layout/overview_panel.xml +++ b/res/layout/overview_panel.xml @@ -2,7 +2,7 @@ <!-- Copyright (C) 2013 The Android Open Source Project - Licensed under the Apache License, Version 2.0 (the "License"); + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -47,4 +47,4 @@ <include layout="@layout/settings_pane" /> -</com.android.launcher3.SlidingUpPanelLayout>
\ No newline at end of file +</com.android.launcher3.SlidingUpPanelLayout> diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml index 726e87b72..a8748cdbb 100644 --- a/res/values-af/cm_strings.xml +++ b/res/values-af/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Gebruik ekstra groot toepassing ikone in tuis skerm en laai</string> <string name="preferences_interface_general_icons_text_style_title">Teksfont styl</string> <string name="preferences_interface_general_icons_text_style_summary">Variant en styl van font om te gebruik vir ikoon teks</string> - <string name="dialog_pick_iconpack_title">Kies ikoon stel</string> - <string name="default_iconpack_title">Standaard ikone</string> - <string name="icon_packs_title">Ikoon stelle</string> - <string name="no_iconpacks_summary">Geen ikoon stelle geïnstalleer</string> <string name="menu_hidden_apps_delete">Herstel</string> <string name="hidden_apps_title">Versteekte programme</string> <string name="launcher_settings">LANSEERDER INSTELLINGS</string> diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml index 42e60ca80..6087fb04a 100644 --- a/res/values-ar/cm_strings.xml +++ b/res/values-ar/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">استخدام الرموز إضافية كبيرة لي التطبيق في الشاشة الرئيسية و الفراغ</string> <string name="preferences_interface_general_icons_text_style_title">نمط خط النص</string> <string name="preferences_interface_general_icons_text_style_summary">شكل ونمط الخط لاستخدامه لرمز النص</string> - <string name="dialog_pick_iconpack_title">اختر حزمة الأيقونة</string> - <string name="default_iconpack_title">الإيقونات الافتراضية</string> - <string name="icon_packs_title">حزم الإيقونات</string> - <string name="no_iconpacks_summary">لا توجد حزم أيقونات لتثبيت</string> <string name="menu_hidden_apps_delete">إعادة تعيين</string> <string name="hidden_apps_title">تطبيقات المخفية</string> <string name="launcher_settings">إعدادات اللنشر</string> diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml index cd17423a6..e89a04c6c 100644 --- a/res/values-ca/cm_strings.xml +++ b/res/values-ca/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Utilitza icones d\'aplicació extra grans a la pantalla d\'inici i al calaix</string> <string name="preferences_interface_general_icons_text_style_title">Estil del tipus de lletra del text</string> <string name="preferences_interface_general_icons_text_style_summary">Variant i estil del tipus de lletra pel text de les icones</string> - <string name="dialog_pick_iconpack_title">Escull un paquet d\'icones</string> - <string name="default_iconpack_title">Icones per defecte</string> - <string name="icon_packs_title">Paquets d\'icones</string> - <string name="no_iconpacks_summary">No hi ha paquets d\'icones instal·lats</string> <string name="menu_hidden_apps_delete">Reinicia</string> <string name="hidden_apps_title">Apps amagades</string> <string name="launcher_settings">CONFIGURACIÓ DEL LLANÇADOR</string> diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml index 41877d4eb..4575242b2 100644 --- a/res/values-cs/cm_strings.xml +++ b/res/values-cs/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Použít větší ikony aplikací na plochách a aplikační složce</string> <string name="preferences_interface_general_icons_text_style_title">Vzhled písma</string> <string name="preferences_interface_general_icons_text_style_summary">Vzhled a varianta pro popis ikon</string> - <string name="dialog_pick_iconpack_title">Vyberte balíček ikon</string> - <string name="default_iconpack_title">Výchozí ikony</string> - <string name="icon_packs_title">Balíčky ikon</string> - <string name="no_iconpacks_summary">Není nainstalován žádný balíček ikon</string> <string name="menu_hidden_apps_delete">Obnovit</string> <string name="hidden_apps_title">Skryté aplikace</string> <string name="launcher_settings">NASTAVENÍ SPOUŠTĚČE</string> diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml index 0740e7652..3fa5a8835 100644 --- a/res/values-da/cm_strings.xml +++ b/res/values-da/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Brug ekstra store app-ikoner på startskærm og i oversigten</string> <string name="preferences_interface_general_icons_text_style_title">Font til tekster</string> <string name="preferences_interface_general_icons_text_style_summary">Fontvariant og -stilart til ikontekster</string> - <string name="dialog_pick_iconpack_title">Vælg ikonpakke</string> - <string name="default_iconpack_title">Standardikoner</string> - <string name="icon_packs_title">Ikonpakker</string> - <string name="no_iconpacks_summary">Ingen ikonpakker installeret</string> <string name="menu_hidden_apps_delete">Nulstil</string> <string name="hidden_apps_title">Skjulte apps</string> <string name="launcher_settings">INDSTILLINGER FOR LAUNCHER</string> diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml index 172403daa..bf9136a90 100644 --- a/res/values-de/cm_strings.xml +++ b/res/values-de/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Große Symbole für Apps im Startbildschirm und der App-Übersicht verwenden</string> <string name="preferences_interface_general_icons_text_style_title">Schriftstil</string> <string name="preferences_interface_general_icons_text_style_summary">Schriftart und Schriftstil der Symbolbeschriftung</string> - <string name="dialog_pick_iconpack_title">Symbolpaket auswählen</string> - <string name="default_iconpack_title">Standardsymbole</string> - <string name="icon_packs_title">Symbolpakete</string> - <string name="no_iconpacks_summary">Es sind keine Symbolpakete installiert</string> <string name="menu_hidden_apps_delete">Zurücksetzen</string> <string name="hidden_apps_title">Versteckte Apps</string> <string name="launcher_settings">LAUNCHER-EINSTELLUNGEN</string> diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml index 606dc9895..17f94f947 100644 --- a/res/values-el/cm_strings.xml +++ b/res/values-el/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Χρήση μεγάλων εικονιδίων εφαρμογών στην αρχική οθόνη και το συρτάρι</string> <string name="preferences_interface_general_icons_text_style_title">Στυλ γραμματοσειράς κειμένου</string> <string name="preferences_interface_general_icons_text_style_summary">Τύπος και στυλ της γραμματοσειράς που χρησιμοποιείται για το κείμενο των εικονιδίων</string> - <string name="dialog_pick_iconpack_title">Επιλογή πακέτου εικονιδίων</string> - <string name="default_iconpack_title">Προεπιλεγμένα εικονίδια</string> - <string name="icon_packs_title">Πακέτα εικονιδίων</string> - <string name="no_iconpacks_summary">Δεν υπάρχουν εγκατεστημένα πακέτα εικονιδίων</string> <string name="menu_hidden_apps_delete">Επαναφορά</string> <string name="hidden_apps_title">Κρυμμένες εφαρμογές</string> <string name="launcher_settings">ΓΕΝΙΚΕΣ ΡΥΘΜΙΣΕΙΣ</string> diff --git a/res/values-es-rXA/cm_strings.xml b/res/values-es-rXA/cm_strings.xml index 93cc4ff4d..9d2af6e14 100644 --- a/res/values-es-rXA/cm_strings.xml +++ b/res/values-es-rXA/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Usar iconos grandes na pantalla d\'aniciu y d\'aplicaciones</string> <string name="preferences_interface_general_icons_text_style_title">Estilu\'l testu</string> <string name="preferences_interface_general_icons_text_style_summary">Camudar l\'estilu\'l testu pa les etiquetes de los iconos</string> - <string name="dialog_pick_iconpack_title">Esbillar paquete d\'iconos</string> - <string name="default_iconpack_title">Iconos por defeutu</string> - <string name="icon_packs_title">Paquetes d\'iconos</string> - <string name="no_iconpacks_summary">Nun hai paquetes d\'iconos instalaos</string> <string name="menu_hidden_apps_delete">Restablecer</string> <string name="hidden_apps_title">Aplicaciones anubríes</string> <string name="launcher_settings">AXUSTES DEL LLANZADOR</string> diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml index 797ebce31..707e96366 100644 --- a/res/values-es/cm_strings.xml +++ b/res/values-es/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Usar iconos grandes en la pantalla de inicio y de aplicaciones</string> <string name="preferences_interface_general_icons_text_style_title">Estilo del texto</string> <string name="preferences_interface_general_icons_text_style_summary">Cambiar el estilo de texto para las etiquetas de los iconos</string> - <string name="dialog_pick_iconpack_title">Escoger paquete de iconos</string> - <string name="default_iconpack_title">Iconos por defecto</string> - <string name="icon_packs_title">Paquetes de iconos</string> - <string name="no_iconpacks_summary">No hay paquetes de iconos instalados</string> <string name="menu_hidden_apps_delete">Restablecer</string> <string name="hidden_apps_title">Ocultar aplicaciones</string> <string name="launcher_settings">AJUSTES DEL LANZADOR</string> diff --git a/res/values-et/cm_strings.xml b/res/values-et/cm_strings.xml index 9bc22deec..deba7ed90 100644 --- a/res/values-et/cm_strings.xml +++ b/res/values-et/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Kasuta ülisuuri rakenduste ikoone koduekraanil ja sahtlis</string> <string name="preferences_interface_general_icons_text_style_title">Kirja fondistiil</string> <string name="preferences_interface_general_icons_text_style_summary">Fondi tüüp ja stiil mida kasutatakse ikoonidel</string> - <string name="dialog_pick_iconpack_title">Vali ikoonipakk</string> - <string name="default_iconpack_title">Vaikimisi ikoonid</string> - <string name="icon_packs_title">Ikoonipakid</string> - <string name="no_iconpacks_summary">Ühtegi ikoonipakki pole installitud</string> <string name="menu_hidden_apps_delete">Lähtesta</string> <string name="hidden_apps_title">Peidetud rakendused</string> <string name="launcher_settings">KÄIVITAJA SEADED</string> diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml index f61119236..b649906e7 100644 --- a/res/values-fi/cm_strings.xml +++ b/res/values-fi/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Käytä erittäin suuria sovelluskuvakkeita kotinäytöllä ja sovellusvalikossa</string> <string name="preferences_interface_general_icons_text_style_title">Fonttityyli</string> <string name="preferences_interface_general_icons_text_style_summary">Muuta kuvakkeiden fonttien tyyliä</string> - <string name="dialog_pick_iconpack_title">Valitse kuvakepaketti</string> - <string name="default_iconpack_title">Oletuskuvakkeet</string> - <string name="icon_packs_title">Kuvakepaketit</string> - <string name="no_iconpacks_summary">Kuvakepaketteja ei asennettu</string> <string name="menu_hidden_apps_delete">Nollaa</string> <string name="hidden_apps_title">Piilotetut sovellukset</string> <string name="launcher_settings">LAUNCHERIN ASETUKSET</string> diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml index f5dc5150e..453e87480 100644 --- a/res/values-fr/cm_strings.xml +++ b/res/values-fr/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Utiliser des icônes extra-larges dans l\'écran d\'accueil et la liste d\'applications</string> <string name="preferences_interface_general_icons_text_style_title">Style de police de texte</string> <string name="preferences_interface_general_icons_text_style_summary">Variante et style de police à utiliser pour le texte des l\'icônes</string> - <string name="dialog_pick_iconpack_title">Choisissez le pack d\'icônes</string> - <string name="default_iconpack_title">Icônes par défaut</string> - <string name="icon_packs_title">Packs d\'icônes</string> - <string name="no_iconpacks_summary">Aucun pack d\'icônes installé</string> <string name="menu_hidden_apps_delete">Réinitialiser</string> <string name="hidden_apps_title">Applications masquées</string> <string name="launcher_settings">PARAMÈTRES DU LANCEUR</string> diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml index 5353891db..59d70a362 100644 --- a/res/values-hu/cm_strings.xml +++ b/res/values-hu/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Extra méretű ikonok a kezdő ill. alkalmazás képernyőkön</string> <string name="preferences_interface_general_icons_text_style_title">Szöveg betűtípusa</string> <string name="preferences_interface_general_icons_text_style_summary">Ikon szövegének típusa</string> - <string name="dialog_pick_iconpack_title">Ikoncsomag választása</string> - <string name="default_iconpack_title">Alapértelmezett ikonok</string> - <string name="icon_packs_title">Ikon csomagok</string> - <string name="no_iconpacks_summary">Nincsenek telepítve ikoncsomagok</string> <string name="menu_hidden_apps_delete">Visszaállítás</string> <string name="hidden_apps_title">Rejtett alkalmazások</string> <string name="launcher_settings">PROGRAMINDÍTÓ BEÁLLÍTÁSOK</string> diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml index cc378f8a5..f6d455fe7 100644 --- a/res/values-in/cm_strings.xml +++ b/res/values-in/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Gunakan ikon aplikasi lebih besar di homescreen dan drawer</string> <string name="preferences_interface_general_icons_text_style_title">Gaya teks font</string> <string name="preferences_interface_general_icons_text_style_summary">Varian dan gaya font untuk menggunakan teks icon</string> - <string name="dialog_pick_iconpack_title">Pilih paket ikon</string> - <string name="default_iconpack_title">Ikon semula</string> - <string name="icon_packs_title">Paket ikon</string> - <string name="no_iconpacks_summary">Tidak ada ikon paket yang diinstal</string> <string name="menu_hidden_apps_delete">Kembalikan</string> <string name="hidden_apps_title">Aplikasi tersembunyi</string> <string name="launcher_settings">PENGATURAN PELUNCUR</string> diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml index 75f6ea089..e6c6bce5e 100644 --- a/res/values-it/cm_strings.xml +++ b/res/values-it/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Usa le icone grandi delle app nella schermata Home e nel drawer</string> <string name="preferences_interface_general_icons_text_style_title">Stile caratteri testo</string> <string name="preferences_interface_general_icons_text_style_summary">Varianti e stile dei caratteri per il testo dell\'icona</string> - <string name="dialog_pick_iconpack_title">Scegli pacchetto icone</string> - <string name="default_iconpack_title">Icone predefinite</string> - <string name="icon_packs_title">Pacchetti icone</string> - <string name="no_iconpacks_summary">Nessun pacchetto di icone installato</string> <string name="menu_hidden_apps_delete">Ripristina</string> <string name="hidden_apps_title">App nascoste</string> <string name="launcher_settings">Impostazioni launcher</string> diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml index 353fc10f6..f2640b120 100644 --- a/res/values-iw/cm_strings.xml +++ b/res/values-iw/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">השתמש בצלמיות יישום גדול מאוד במסך הבית ובמגירה</string> <string name="preferences_interface_general_icons_text_style_title">סגנון הגופן של הטקסט</string> <string name="preferences_interface_general_icons_text_style_summary">סגנון ועיצוב הגופן עבור טקסט הסמלים</string> - <string name="dialog_pick_iconpack_title">בחר ערכת סמלים</string> - <string name="default_iconpack_title">סמלי ברירת מחדל</string> - <string name="icon_packs_title">אוסף סמלים</string> - <string name="no_iconpacks_summary">לא מותקנות ערכות סמל</string> <string name="menu_hidden_apps_delete">אפס</string> <string name="hidden_apps_title">יישומים מוסתרים</string> <string name="launcher_settings">הגדרות מפעיל</string> diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml index 8c15c5c22..7c72efed2 100644 --- a/res/values-ja/cm_strings.xml +++ b/res/values-ja/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">ホーム画面とドロワーで大きいアイコンを使用する</string> <string name="preferences_interface_general_icons_text_style_title">テキストのフォントスタイル</string> <string name="preferences_interface_general_icons_text_style_summary">アイコンテキストに使用するフォントスタイルと種類</string> - <string name="dialog_pick_iconpack_title">アイコンパックを選択</string> - <string name="default_iconpack_title">デフォルトのアイコン</string> - <string name="icon_packs_title">アイコンパック</string> - <string name="no_iconpacks_summary">アイコンパックがインストールされていません</string> <string name="menu_hidden_apps_delete">リセット</string> <string name="hidden_apps_title">非表示にするアプリ</string> <string name="launcher_settings">ランチャーの設定</string> diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml index 3a14a35f7..bd9d79cfe 100644 --- a/res/values-lb/cm_strings.xml +++ b/res/values-lb/cm_strings.xml @@ -43,9 +43,5 @@ <string name="preferences_interface_general_icons_large_summary">Grouss Symboler fir d\'Apps um Startschierm a bei der App-Iwwersiicht benotzen</string> <string name="preferences_interface_general_icons_text_style_title">Schrëftstil</string> <string name="preferences_interface_general_icons_text_style_summary">Schrëftaart a -stil vum Text ënner de Symboler</string> - <string name="dialog_pick_iconpack_title">Symbolpak auswielen</string> - <string name="default_iconpack_title">Standardsymboler</string> - <string name="icon_packs_title">Symbolpäck</string> - <string name="no_iconpacks_summary">Keng Symbolpäck installéiert</string> <string name="menu_hidden_apps_delete">Zrécksetzen</string> </resources> diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml index 458c72dd4..61de45bb0 100644 --- a/res/values-lt/cm_strings.xml +++ b/res/values-lt/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Naudoti didesnes programų piktogramas pagrindiniame ekrane ir stalčiuje</string> <string name="preferences_interface_general_icons_text_style_title">Teksto šrifto stilius</string> <string name="preferences_interface_general_icons_text_style_summary">Piktogramos teksto šrifto variantas ir stilius</string> - <string name="dialog_pick_iconpack_title">Pasirinkti piktogramų paketą</string> - <string name="default_iconpack_title">Numatytosios piktogramos</string> - <string name="icon_packs_title">Piktogramų paketai</string> - <string name="no_iconpacks_summary">Piktogramų paketai neįdiegti</string> <string name="menu_hidden_apps_delete">Atkurti</string> <string name="hidden_apps_title">Paslėptos programos</string> <string name="launcher_settings">PALEIDĖJO NUSTATYMAI</string> diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml index 0036bff99..e49af0145 100644 --- a/res/values-nb/cm_strings.xml +++ b/res/values-nb/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Bruk ekstra store programikoner på hjemmeskjerm og skuff</string> <string name="preferences_interface_general_icons_text_style_title">Skrifttype</string> <string name="preferences_interface_general_icons_text_style_summary">Variant og stil på skrift brukt til ikon tekst</string> - <string name="dialog_pick_iconpack_title">Velg ikon pakke</string> - <string name="default_iconpack_title">Standardikoner</string> - <string name="icon_packs_title">Symbol-pakker</string> - <string name="no_iconpacks_summary">Ingen ikon pakker installert</string> <string name="menu_hidden_apps_delete">Tilbakestille</string> <string name="hidden_apps_title">Skjulte programmer</string> <string name="launcher_settings">LAUNCHER INNSTILLINGER</string> diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml index c6bb6224d..293dbb155 100644 --- a/res/values-nl/cm_strings.xml +++ b/res/values-nl/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Extra grote pictogrammen gebruiken voor apps op het startscherm en in het overzicht</string> <string name="preferences_interface_general_icons_text_style_title">Lettertypestijl</string> <string name="preferences_interface_general_icons_text_style_summary">Stijl van tekst bij pictogrammen</string> - <string name="dialog_pick_iconpack_title">Pictogrampakket kiezen</string> - <string name="default_iconpack_title">Standaard</string> - <string name="icon_packs_title">Pictogram\npakket</string> - <string name="no_iconpacks_summary">Geen pictogrampakketten geïnstalleerd</string> <string name="menu_hidden_apps_delete">Opnieuw instellen</string> <string name="hidden_apps_title">Verborgen apps</string> <string name="launcher_settings">INSTELLINGEN STARTPAGINA</string> diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml index 4af4b9cd7..8ad406ff5 100644 --- a/res/values-pl/cm_strings.xml +++ b/res/values-pl/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Użyj ekstra dużych ikon na ekranie głównym i szufladzie</string> <string name="preferences_interface_general_icons_text_style_title">Styl czcionki tekstu</string> <string name="preferences_interface_general_icons_text_style_summary">Wariant i styl czcionki używanej do tekstu przy ikonach</string> - <string name="dialog_pick_iconpack_title">Wybierz paczkę ikon</string> - <string name="default_iconpack_title">Domyślne ikony</string> - <string name="icon_packs_title">Paczki ikon</string> - <string name="no_iconpacks_summary">Brak zainstalowanych paczek ikon</string> <string name="menu_hidden_apps_delete">Przywróć domyślne</string> <string name="hidden_apps_title">Ukryte aplikacje</string> <string name="launcher_settings">USTAWIENIA LAUNCHERA</string> diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml index 94b28b83c..562ffca9d 100644 --- a/res/values-pt-rBR/cm_strings.xml +++ b/res/values-pt-rBR/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Usar ícones de aplicação extra grandes na tela inicial e gaveta de aplicativos</string> <string name="preferences_interface_general_icons_text_style_title">Estilo da fonte</string> <string name="preferences_interface_general_icons_text_style_summary">Estilo da fonte para usar nos textos dos ícones</string> - <string name="dialog_pick_iconpack_title">Escolher o pacote de ícones</string> - <string name="default_iconpack_title">Ícones padrão</string> - <string name="icon_packs_title">Pacote de ícones</string> - <string name="no_iconpacks_summary">Nenhum pacote de ícones instalado</string> <string name="menu_hidden_apps_delete">Redefinir</string> <string name="hidden_apps_title">Aplicativos ocultos</string> <string name="launcher_settings">CONFIGURAÇÕES DO LAUNCHER</string> diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml index 815609bcc..41add4683 100644 --- a/res/values-pt-rPT/cm_strings.xml +++ b/res/values-pt-rPT/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Usar ícones de aplicação extra grandes no ecrã inicial e na gaveta de aplicações</string> <string name="preferences_interface_general_icons_text_style_title">Estilo de tipo de letra</string> <string name="preferences_interface_general_icons_text_style_summary">Variante e estilo do tipo de letra a usar para o texto dos ícones</string> - <string name="dialog_pick_iconpack_title">Escolher pacote de ícones</string> - <string name="default_iconpack_title">Ícones padrão</string> - <string name="icon_packs_title">Pacotes de Ícones</string> - <string name="no_iconpacks_summary">Nenhum pacote de ícones instalado</string> <string name="menu_hidden_apps_delete">Restaurar</string> <string name="hidden_apps_title">Aplicações ocultas</string> <string name="launcher_settings">DEFINIÇÕES DO LANÇADOR</string> diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml index d4579f23b..2c733f02e 100644 --- a/res/values-ru/cm_strings.xml +++ b/res/values-ru/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Использовать увеличенные значки на домашнем экране и в меню приложений</string> <string name="preferences_interface_general_icons_text_style_title">Тип шрифта</string> <string name="preferences_interface_general_icons_text_style_summary">Выбор стиля шрифта для подписей значков</string> - <string name="dialog_pick_iconpack_title">Выберите набор значков</string> - <string name="default_iconpack_title">Значки по умолчанию</string> - <string name="icon_packs_title">Наборы значков</string> - <string name="no_iconpacks_summary">Наборы значков не установлены</string> <string name="menu_hidden_apps_delete">Сброс</string> <string name="hidden_apps_title">Скрытые приложения</string> <string name="launcher_settings">НАСТРОЙКИ ЛАУНЧЕРА</string> diff --git a/res/values-si/cm_strings.xml b/res/values-si/cm_strings.xml index 1d71520ff..71d99846c 100644 --- a/res/values-si/cm_strings.xml +++ b/res/values-si/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">මුල් තිරයේ හා ලාච්චුවේ අති විශාල යෙදුම් අයිකන භාවිතා කරන්න</string> <string name="preferences_interface_general_icons_text_style_title">පෙළ ෆොන්ට විලාසය</string> <string name="preferences_interface_general_icons_text_style_summary">අයිකන පෙළ සඳහා භාවිතයට ෆොන්ටයේ ප්රභේදය සහ විලාසය</string> - <string name="dialog_pick_iconpack_title">අයිකන පොදිය තෝරන්න</string> - <string name="default_iconpack_title">පෙරනිමි අයිකන</string> - <string name="icon_packs_title">අයිකන පොදි</string> - <string name="no_iconpacks_summary">අයිකන පොදි කිසිවක් පිහිටුවා නැත</string> <string name="menu_hidden_apps_delete">ප්රත්යාරම්භනය</string> <string name="hidden_apps_title">සැඟවුණු යෙදුම්</string> <string name="launcher_settings">දියත් කරකයේ සැකසීම්</string> diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml index 1d0097dad..b1a11fa1b 100644 --- a/res/values-sk/cm_strings.xml +++ b/res/values-sk/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Použiť extra veľké ikony aplikácií na domovskej obrazovke a v ponuke aplikácií</string> <string name="preferences_interface_general_icons_text_style_title">Štýl písma textu</string> <string name="preferences_interface_general_icons_text_style_summary">Variant a štýl písma na použitie pre text ikony</string> - <string name="dialog_pick_iconpack_title">Vyberte balík ikon</string> - <string name="default_iconpack_title">Predvolené ikony</string> - <string name="icon_packs_title">Balíky ikon</string> - <string name="no_iconpacks_summary">Žiadne balíky ikon nie sú nainštalované</string> <string name="menu_hidden_apps_delete">Obnoviť</string> <string name="hidden_apps_title">Skryté aplikácie</string> <string name="launcher_settings">NASTAVENIA SPÚŠŤAČA</string> diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml index 34c8410c0..3f720fe76 100644 --- a/res/values-sr/cm_strings.xml +++ b/res/values-sr/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Користи екстра велике апликационе иконе на почетном екрану и фиоци</string> <string name="preferences_interface_general_icons_text_style_title">Стил фонта текста</string> <string name="preferences_interface_general_icons_text_style_summary">Варијанту и стил фонта користи за текст на иконама</string> - <string name="dialog_pick_iconpack_title">Одабери пакет икона</string> - <string name="default_iconpack_title">Подразумеване иконе</string> - <string name="icon_packs_title">Пакети икона</string> - <string name="no_iconpacks_summary">Нема инсталираних пакета са иконама</string> <string name="menu_hidden_apps_delete">Ресетуј</string> <string name="hidden_apps_title">Сакривене апликације</string> <string name="launcher_settings">ПОДЕШАВАЊА ПОКРЕТАЧА</string> diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml index 23d022828..c112e8c9d 100644 --- a/res/values-sv/cm_strings.xml +++ b/res/values-sv/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Använda extra stora appikoner på hemskärmen och appmenyn</string> <string name="preferences_interface_general_icons_text_style_title">Typsnitt</string> <string name="preferences_interface_general_icons_text_style_summary">Variant och stil på typsnitt som används för ikontext</string> - <string name="dialog_pick_iconpack_title">Välj ikonpaket</string> - <string name="default_iconpack_title">Standardikoner</string> - <string name="icon_packs_title">Ikonpaket</string> - <string name="no_iconpacks_summary">Inga ikonpaket installerade</string> <string name="menu_hidden_apps_delete">Återställ</string> <string name="hidden_apps_title">Gömda appar</string> <string name="launcher_settings">LAUNCHERINSTÄLLNINGAR</string> diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml index e37373301..b2c935fe0 100644 --- a/res/values-th/cm_strings.xml +++ b/res/values-th/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">ใช้ไอคอนแอปพิเคชันขนาดใหญ่มากในจอหลักและที่วางแอป</string> <string name="preferences_interface_general_icons_text_style_title">รูปแบบข้อความ</string> <string name="preferences_interface_general_icons_text_style_summary">ลักษณะของแบบอักษรที่จะใช้สำหรับป้ายชื่อไอคอน</string> - <string name="dialog_pick_iconpack_title">เลือกชุดไอคอน</string> - <string name="default_iconpack_title">ไอคอนเริ่มต้น</string> - <string name="icon_packs_title">ชุดไอคอน</string> - <string name="no_iconpacks_summary">ไม่มีชุดไอคอนที่ติดตั้งอยู่</string> <string name="menu_hidden_apps_delete">ล้างค่า</string> <string name="hidden_apps_title">ซ่อนแอป</string> <string name="launcher_settings">ตั้งค่าหน้าตัวเรียกใช้งาน</string> diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml index 0f5be6be4..92216d559 100644 --- a/res/values-tr/cm_strings.xml +++ b/res/values-tr/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Ana ekranda ve uygulama çekmecesinde çok büyük uyg. simgeleri kullan</string> <string name="preferences_interface_general_icons_text_style_title">Yazı tipi stili</string> <string name="preferences_interface_general_icons_text_style_summary">Simge yazısı için yazı tipi</string> - <string name="dialog_pick_iconpack_title">Simge paketi seç</string> - <string name="default_iconpack_title">Varsayılan simgeler</string> - <string name="icon_packs_title">Simge paketleri</string> - <string name="no_iconpacks_summary">Yüklü simge paketi yok</string> <string name="menu_hidden_apps_delete">Sıfırla</string> <string name="hidden_apps_title">Gizli uygulamalar</string> <string name="launcher_settings">BAŞLATICI AYARLARI</string> diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml index 963496d4c..59985e153 100644 --- a/res/values-uk/cm_strings.xml +++ b/res/values-uk/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">Використовувати великі значки на домашньому екрані та меню програм</string> <string name="preferences_interface_general_icons_text_style_title">Стиль шрифту</string> <string name="preferences_interface_general_icons_text_style_summary">Стиль та варіант шрифту для тексту під значками</string> - <string name="dialog_pick_iconpack_title">Вибрати набір значків</string> - <string name="default_iconpack_title">Типові значки</string> - <string name="icon_packs_title">Набори значків</string> - <string name="no_iconpacks_summary">Жодного набору значків не встановлено</string> <string name="menu_hidden_apps_delete">Скидання</string> <string name="hidden_apps_title">Приховані програми</string> </resources> diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml index c3f1fbdc3..61bcf5aad 100644 --- a/res/values-zh-rCN/cm_strings.xml +++ b/res/values-zh-rCN/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">显示大图标</string> <string name="preferences_interface_general_icons_text_style_title">字体样式</string> <string name="preferences_interface_general_icons_text_style_summary">图标字体样式</string> - <string name="dialog_pick_iconpack_title">选择图标包</string> - <string name="default_iconpack_title">默认图标</string> - <string name="icon_packs_title">图标包</string> - <string name="no_iconpacks_summary">没有安装的图标包</string> <string name="menu_hidden_apps_delete">重置</string> <string name="hidden_apps_title">隐藏的应用</string> <string name="launcher_settings">启动器设置</string> diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml index 4aa976589..bc5420db3 100644 --- a/res/values-zh-rHK/cm_strings.xml +++ b/res/values-zh-rHK/cm_strings.xml @@ -52,10 +52,6 @@ <string name="preferences_interface_general_icons_large_summary">使用超大的應用程式圖示於主螢幕和抽屜</string> <string name="preferences_interface_general_icons_text_style_title">字體風格</string> <string name="preferences_interface_general_icons_text_style_summary">變體和字體風格用來應用於圖示的文本上</string> - <string name="dialog_pick_iconpack_title">選擇圖示包</string> - <string name="default_iconpack_title">預設圖示</string> - <string name="icon_packs_title">圖示包</string> - <string name="no_iconpacks_summary">沒有安裝圖示包</string> <string name="menu_hidden_apps_delete">重設</string> <string name="hidden_apps_title">隱藏的應用程式</string> <string name="launcher_settings">啟動器設定</string> diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml index d2d7cda1a..60056e026 100644 --- a/res/values-zh-rTW/cm_strings.xml +++ b/res/values-zh-rTW/cm_strings.xml @@ -44,10 +44,6 @@ <string name="preferences_interface_general_title">一般</string> <string name="preferences_interface_general_icons_category">圖示</string> <string name="preferences_interface_general_icons_large_title">大圖示</string> - <string name="dialog_pick_iconpack_title">選擇圖示包</string> - <string name="default_iconpack_title">預設圖示</string> - <string name="icon_packs_title">圖示包</string> - <string name="menu_hidden_apps_delete">重設</string> <string name="hidden_apps_title">隱藏的應用程式</string> <string name="home_screen_search_text">搜尋列</string> <string name="larger_icons_text">大圖示</string> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 7ec28ab21..6839a3304 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -37,11 +37,6 @@ <!-- Wallpaper scroll effect --> <string name="scrolling_wallpaper">Scroll wallpaper</string> - <!-- General --> - <string name="dialog_pick_iconpack_title">Pick icon pack</string> - <string name="default_iconpack_title">Default icons</string> - <string name="no_iconpacks_summary">No icon packs installed</string> - <!-- Folder titles --> <string name="google_title" translatable="false">Google</string> diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java index a6b02aeb0..1dade8027 100644 --- a/src/com/android/launcher3/IconCache.java +++ b/src/com/android/launcher3/IconCache.java @@ -45,8 +45,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map.Entry; -import com.android.launcher3.settings.SettingsProvider; - /** * Cache of application icons. Icons can be made from any thread. */ @@ -59,8 +57,6 @@ public class IconCache { private static final boolean DEBUG = true; - private IconPackHelper mIconPackHelper; - private static class CacheEntry { public Bitmap icon; public String title; @@ -83,9 +79,6 @@ public class IconCache { // need to set mIconDpi before getting default icon mDefaultIcon = makeDefaultIcon(); - - mIconPackHelper = new IconPackHelper(context); - loadIconPack(); } public Drawable getFullResDefaultActivityIcon() { @@ -133,14 +126,7 @@ public class IconCache { resources = null; } if (resources != null) { - int iconId = 0; - if (mIconPackHelper != null && mIconPackHelper.isIconPackLoaded()) { - iconId = mIconPackHelper.getResourceIdForActivityIcon(info); - if (iconId != 0) { - return getFullResIcon(mIconPackHelper.getIconPackResources(), iconId); - } - } - iconId = info.getIconResource(); + int iconId = info.getIconResource(); if (iconId != 0) { return getFullResIcon(resources, iconId); } @@ -161,16 +147,6 @@ public class IconCache { return b; } - private void loadIconPack() { - mIconPackHelper.unloadIconPack(); - String iconPack = SettingsProvider.getStringCustomDefault(mContext, - SettingsProvider.SETTINGS_UI_GENERAL_ICONS_ICON_PACK, ""); - if (!TextUtils.isEmpty(iconPack) && !mIconPackHelper.loadIconPack(iconPack)) { - SettingsProvider.putString(mContext, - SettingsProvider.SETTINGS_UI_GENERAL_ICONS_ICON_PACK, ""); - } - } - /** * Remove any records for the supplied ComponentName. */ @@ -202,7 +178,6 @@ public class IconCache { synchronized (mCache) { mCache.clear(); } - loadIconPack(); } /** diff --git a/src/com/android/launcher3/IconPackHelper.java b/src/com/android/launcher3/IconPackHelper.java deleted file mode 100644 index 520e8df8b..000000000 --- a/src/com/android/launcher3/IconPackHelper.java +++ /dev/null @@ -1,440 +0,0 @@ -package com.android.launcher3; - -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Map; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlPullParserFactory; - -import android.app.Activity; -import android.app.AlertDialog; -import android.content.ComponentName; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.pm.ActivityInfo; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.content.res.Resources; -import android.content.res.XmlResourceParser; -import android.graphics.drawable.Drawable; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; -import android.widget.TextView; -import android.widget.Toast; - -import com.android.launcher3.settings.SettingsProvider; - -public class IconPackHelper { - - public final static String[] sSupportedActions = new String[] { - "org.adw.launcher.THEMES", - "com.gau.go.launcherex.theme" - }; - - public static final String[] sSupportedCategories = new String[] { - "com.fede.launcher.THEME_ICONPACK", - "com.anddoes.launcher.THEME", - "com.teslacoilsw.launcher.THEME" - }; - - // Holds package/class -> drawable - private Map<String, String> mIconPackResources; - private final Context mContext; - private String mLoadedIconPackName; - private Resources mLoadedIconPackResource; - - IconPackHelper(Context context) { - mContext = context; - mIconPackResources = new HashMap<String, String>(); - } - - public static Map<String, IconPackInfo> getSupportedPackages(Context context) { - Intent i = new Intent(); - Map<String, IconPackInfo> packages = new HashMap<String, IconPackInfo>(); - PackageManager packageManager = context.getPackageManager(); - for (String action : sSupportedActions) { - i.setAction(action); - for (ResolveInfo r : packageManager.queryIntentActivities(i, 0)) { - IconPackInfo info = new IconPackInfo(r, packageManager); - packages.put(r.activityInfo.packageName, info); - } - } - i = new Intent(Intent.ACTION_MAIN); - for (String category : sSupportedCategories) { - i.addCategory(category); - for (ResolveInfo r : packageManager.queryIntentActivities(i, 0)) { - IconPackInfo info = new IconPackInfo(r, packageManager); - packages.put(r.activityInfo.packageName, info); - } - i.removeCategory(category); - } - return packages; - } - - private static void loadResourcesFromXmlParser(XmlPullParser parser, - Map<String, String> iconPackResources) throws XmlPullParserException, IOException { - int eventType = parser.getEventType(); - do { - - if (eventType != XmlPullParser.START_TAG) { - continue; - } - - if (!parser.getName().equalsIgnoreCase("item")) { - continue; - } - - String component = parser.getAttributeValue(null, "component"); - String drawable = parser.getAttributeValue(null, "drawable"); - - // Validate component/drawable exist - if (TextUtils.isEmpty(component) || TextUtils.isEmpty(drawable)) { - continue; - } - - // Validate format/length of component - if (!component.startsWith("ComponentInfo{") || !component.endsWith("}") - || component.length() < 16) { - continue; - } - - // Sanitize stored value - component = component.substring(14, component.length() - 1).toLowerCase(); - - ComponentName name = null; - if (!component.contains("/")) { - // Package icon reference - iconPackResources.put(component, drawable); - } else { - name = ComponentName.unflattenFromString(component); - if (name != null) { - iconPackResources.put(name.getPackageName(), drawable); - iconPackResources.put(name.getClassName(), drawable); - } - } - } while ((eventType = parser.next()) != XmlPullParser.END_DOCUMENT); - } - - private static void loadApplicationResources(Context context, - Map<String, String> iconPackResources, String packageName) { - Field[] drawableItems = null; - try { - Context appContext = context.createPackageContext(packageName, - Context.CONTEXT_INCLUDE_CODE | Context.CONTEXT_IGNORE_SECURITY); - drawableItems = Class.forName(packageName+".R$drawable", - true, appContext.getClassLoader()).getFields(); - } catch (Exception e){ - return; - } - - for (Field f : drawableItems) { - String name = f.getName(); - - String icon = name.toLowerCase(); - name = name.replaceAll("_", "."); - - iconPackResources.put(name, icon); - - int activityIndex = name.lastIndexOf("."); - if (activityIndex <= 0 || activityIndex == name.length() - 1) { - continue; - } - - String iconPackage = name.substring(0, activityIndex); - if (TextUtils.isEmpty(iconPackage)) { - continue; - } - iconPackResources.put(iconPackage, icon); - - String iconActivity = name.substring(activityIndex + 1); - if (TextUtils.isEmpty(iconActivity)) { - continue; - } - iconPackResources.put(iconPackage + "." + iconActivity, icon); - } - } - - public boolean loadIconPack(String packageName) { - mIconPackResources = getIconPackResources(mContext, packageName); - Resources res = null; - try { - res = mContext.getPackageManager().getResourcesForApplication(packageName); - } catch (PackageManager.NameNotFoundException e) { - e.printStackTrace(); - return false; - } - mLoadedIconPackResource = res; - mLoadedIconPackName = packageName; - return true; - } - - public static Map<String, String> getIconPackResources(Context context, String packageName) { - if (TextUtils.isEmpty(packageName)) { - return null; - } - - Resources res = null; - try { - res = context.getPackageManager().getResourcesForApplication(packageName); - } catch (PackageManager.NameNotFoundException e) { - e.printStackTrace(); - return null; - } - - XmlPullParser parser = null; - InputStream inputStream = null; - Map<String, String> iconPackResources = new HashMap<String, String>(); - - try { - inputStream = res.getAssets().open("appfilter.xml"); - XmlPullParserFactory factory = XmlPullParserFactory.newInstance(); - parser = factory.newPullParser(); - parser.setInput(inputStream, "UTF-8"); - } catch (Exception e) { - // Catch any exception since we want to fall back to parsing the xml/ - // resource in all cases - int resId = res.getIdentifier("appfilter", "xml", packageName); - if (resId != 0) { - parser = res.getXml(resId); - } - } - - if (parser != null) { - try { - loadResourcesFromXmlParser(parser, iconPackResources); - return iconPackResources; - } catch (XmlPullParserException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - // Cleanup resources - if (parser instanceof XmlResourceParser) { - ((XmlResourceParser) parser).close(); - } - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - } - } - } - } - - // Application uses a different theme format (most likely launcher pro) - int arrayId = res.getIdentifier("theme_iconpack", "array", packageName); - if (arrayId == 0) { - arrayId = res.getIdentifier("icon_pack", "array", packageName); - } - - if (arrayId != 0) { - String[] iconPack = res.getStringArray(arrayId); - for (String entry : iconPack) { - - if (TextUtils.isEmpty(entry)) { - continue; - } - - String icon = entry.toLowerCase(); - entry = entry.replaceAll("_", "."); - - iconPackResources.put(entry, icon); - - int activityIndex = entry.lastIndexOf("."); - if (activityIndex <= 0 || activityIndex == entry.length() - 1) { - continue; - } - - String iconPackage = entry.substring(0, activityIndex); - if (TextUtils.isEmpty(iconPackage)) { - continue; - } - iconPackResources.put(iconPackage, icon); - - String iconActivity = entry.substring(activityIndex + 1); - if (TextUtils.isEmpty(iconActivity)) { - continue; - } - iconPackResources.put(iconPackage + "." + iconActivity, icon); - } - } else { - loadApplicationResources(context, iconPackResources, packageName); - } - return iconPackResources; - } - - public void unloadIconPack() { - mLoadedIconPackResource = null; - mLoadedIconPackName = null; - if (mIconPackResources != null) { - mIconPackResources.clear(); - } - } - - public static void pickIconPack(final Context context, final boolean pickIcon) { - Map<String, IconPackInfo> supportedPackages = getSupportedPackages(context); - if (supportedPackages.isEmpty()) { - Toast.makeText(context, R.string.no_iconpacks_summary, Toast.LENGTH_SHORT).show(); - return; - } - - final IconAdapter adapter = new IconAdapter(context, supportedPackages); - AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setTitle(R.string.dialog_pick_iconpack_title); - if (!pickIcon) { - builder.setAdapter(adapter, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int position) { - if (adapter.isOriginalIconPack(position)) { - return; - } - String selectedPackage = adapter.getItem(position); - SettingsProvider.putString(context, - SettingsProvider.SETTINGS_UI_GENERAL_ICONS_ICON_PACK, selectedPackage); - LauncherAppState.getInstance().getIconCache().flush(); - LauncherAppState.getInstance().getModel().forceReload(); - } - }); - } else { - builder.setAdapter(adapter, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - String selectedPackage = adapter.getItem(which); - Launcher launcherActivity = (Launcher) context; - if (TextUtils.isEmpty(selectedPackage)) { - launcherActivity.onActivityResult(Launcher.REQUEST_PICK_ICON, Activity.RESULT_OK, null); - } else { - Intent i = new Intent(); - i.setClass(context, IconPickerActivity.class); - i.putExtra(IconPickerActivity.PACKAGE_NAME_EXTRA, selectedPackage); - launcherActivity.startActivityForResult(i, Launcher.REQUEST_PICK_ICON); - } - } - }); - } - builder.show().getWindow().getDecorView().setAlpha(0.8f); - } - - boolean isIconPackLoaded() { - return mLoadedIconPackResource != null && - mLoadedIconPackName != null && - mIconPackResources != null; - } - - private int getResourceIdForDrawable(String resource) { - int resId = mLoadedIconPackResource.getIdentifier(resource, "drawable", mLoadedIconPackName); - return resId; - } - - public Resources getIconPackResources() { - return mLoadedIconPackResource; - } - - public int getResourceIdForActivityIcon(ActivityInfo info) { - String drawable = mIconPackResources.get(info.name.toLowerCase()); - if (drawable == null) { - // Icon pack doesn't have an icon for the activity, fallback to package icon - drawable = mIconPackResources.get(info.packageName.toLowerCase()); - if (drawable == null) { - return 0; - } - } - return getResourceIdForDrawable(drawable); - } - - static class IconPackInfo { - String packageName; - CharSequence label; - Drawable icon; - - IconPackInfo(ResolveInfo r, PackageManager packageManager) { - packageName = r.activityInfo.packageName; - icon = r.loadIcon(packageManager); - label = r.loadLabel(packageManager); - } - - IconPackInfo(){ - } - - public IconPackInfo(String label, Drawable icon, String packageName) { - this.label = label; - this.icon = icon; - this.packageName = packageName; - } - } - - private static class IconAdapter extends BaseAdapter { - ArrayList<IconPackInfo> mSupportedPackages; - LayoutInflater mLayoutInflater; - String mCurrentIconPack; - int mCurrentIconPackPosition; - - IconAdapter(Context ctx, Map<String, IconPackInfo> supportedPackages) { - mLayoutInflater = LayoutInflater.from(ctx); - mSupportedPackages = new ArrayList<IconPackInfo>(supportedPackages.values()); - Collections.sort(mSupportedPackages, new Comparator<IconPackInfo>() { - @Override - public int compare(IconPackInfo lhs, IconPackInfo rhs) { - return lhs.label.toString().compareToIgnoreCase(rhs.toString()); - } - }); - - Resources res = ctx.getResources(); - String defaultLabel = res.getString(R.string.default_iconpack_title); - Drawable icon = res.getDrawable(R.mipmap.ic_launcher_home); - mSupportedPackages.add(0, new IconPackInfo(defaultLabel, icon, "")); - - mCurrentIconPack = SettingsProvider.getStringCustomDefault(ctx, - SettingsProvider.SETTINGS_UI_GENERAL_ICONS_ICON_PACK, ""); - } - - @Override - public int getCount() { - return mSupportedPackages.size(); - } - - @Override - public String getItem(int position) { - return (String) mSupportedPackages.get(position).packageName; - } - - @Override - public long getItemId(int position) { - return 0; - } - - public boolean isOriginalIconPack(int position) { - return mCurrentIconPackPosition == position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - if (convertView == null) { - convertView = mLayoutInflater.inflate(R.layout.iconpack_chooser, null); - } - IconPackInfo info = mSupportedPackages.get(position); - TextView txtView = (TextView) convertView.findViewById(R.id.title); - txtView.setText(info.label); - ImageView imgView = (ImageView) convertView.findViewById(R.id.icon); - imgView.setImageDrawable(info.icon); - ImageView chk = (ImageView) convertView.findViewById(R.id.check); - boolean isCurrentIconPack = info.packageName.equals(mCurrentIconPack); - chk.setVisibility(isCurrentIconPack ? View.VISIBLE : View.GONE); - if (isCurrentIconPack) { - mCurrentIconPackPosition = position; - } - return convertView; - } - } - -}
\ No newline at end of file diff --git a/src/com/android/launcher3/IconPickerActivity.java b/src/com/android/launcher3/IconPickerActivity.java deleted file mode 100644 index 5f08eda68..000000000 --- a/src/com/android/launcher3/IconPickerActivity.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.android.launcher3; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.Map; - -import android.app.Activity; -import android.app.ActivityManager; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.pm.PackageManager.NameNotFoundException; -import android.content.res.Resources; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; -import android.os.AsyncTask; -import android.os.Bundle; -import android.view.View; -import android.view.ViewGroup; -import android.widget.AdapterView; -import android.widget.BaseAdapter; -import android.widget.GridView; -import android.widget.ImageView; - -public class IconPickerActivity extends Activity { - - public static final String SELECTED_RESOURCE_EXTRA = "selected_resource"; - public static final String SELECTED_BITMAP_EXTRA = "bitmap"; - public static final String PACKAGE_NAME_EXTRA = "package"; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - ActivityManager activityManager = - (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE); - int iconSize = activityManager.getLauncherLargeIconSize(); - final String pkgName = getIntent().getStringExtra(PACKAGE_NAME_EXTRA); - - GridView gridview = new GridView(this); - gridview.setNumColumns(GridView.AUTO_FIT); - gridview.setHorizontalSpacing(40); - gridview.setVerticalSpacing(40); - gridview.setPadding(20, 20, 20, 0); - gridview.setFastScrollEnabled(true); - gridview.setColumnWidth(iconSize); - gridview.setStretchMode(GridView.STRETCH_COLUMN_WIDTH); - - gridview.setAdapter(new ImageAdapter(this, pkgName)); - gridview.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView<?> adapterView, View v, int position, long id) { - Intent in = new Intent(); - DrawableInfo d = (DrawableInfo) adapterView.getAdapter().getItem(position); - in.putExtra(SELECTED_RESOURCE_EXTRA, pkgName + "|" + d.resource_name); - in.putExtra(SELECTED_BITMAP_EXTRA, ((BitmapDrawable)d.drawable.get()).getBitmap()); - setResult(Activity.RESULT_OK, in); - finish(); - } - }); - setContentView(gridview); - } - - public class ImageAdapter extends BaseAdapter { - private Context mContext; - private Resources mResources; - private ArrayList<DrawableInfo> mDrawables = new ArrayList<DrawableInfo>(); - - public class FetchDrawable extends AsyncTask<Integer, Void, Drawable> { - WeakReference<ImageView> mImageView; - - FetchDrawable(ImageView imgView) { - mImageView = new WeakReference<ImageView>(imgView); - } - - @Override - protected Drawable doInBackground(Integer... position) { - DrawableInfo info = getItem(position[0]); - int itemId = info.resource_id; - Drawable d = mResources.getDrawable(itemId); - info.drawable = new WeakReference<Drawable>(d); - return d; - } - - @Override - public void onPostExecute(Drawable result) { - if (mImageView.get() != null) { - mImageView.get().setImageDrawable(result); - } - } - } - - public ImageAdapter(Context c, String pkgName) { - mContext = c; - Map<String, String> resources = IconPackHelper.getIconPackResources(c, pkgName); - try { - mResources = c.getPackageManager().getResourcesForApplication(pkgName); - LinkedHashSet<String> drawables = new LinkedHashSet<String>(resources.values()); - for (String s : drawables) { - int id = mResources.getIdentifier(s, "drawable", pkgName); - if (id != 0) { - mDrawables.add(new DrawableInfo(s, id)); - } - } - } catch (NameNotFoundException e) { - } - } - - public int getCount() { - return mDrawables.size(); - } - - public DrawableInfo getItem(int position) { - return mDrawables.get(position); - } - - public long getItemId(int position) { - return 0; - } - - public View getView(final int position, View convertView, ViewGroup parent) { - final ImageView imageView; - if (convertView == null) { - imageView = new ImageView(mContext); - imageView.setLayoutParams(new GridView.LayoutParams( - GridView.LayoutParams.WRAP_CONTENT, GridView.LayoutParams.WRAP_CONTENT)); - imageView.setScaleType(ImageView.ScaleType.FIT_CENTER); - } else { - imageView = (ImageView) convertView; - Object tag = imageView.getTag(); - if (tag != null && tag instanceof FetchDrawable) { - ((FetchDrawable) tag).cancel(true); - } - } - FetchDrawable req = new FetchDrawable(imageView); - imageView.setTag(req); - req.execute(position); - return imageView; - } - } - - private class DrawableInfo { - WeakReference<Drawable> drawable; - final String resource_name; - final int resource_id; - DrawableInfo(String n, int i) { - resource_name = n; - resource_id = i; - } - } -} diff --git a/src/com/android/launcher3/settings/SettingsProvider.java b/src/com/android/launcher3/settings/SettingsProvider.java index de1d4002e..6e5f9d9b3 100644 --- a/src/com/android/launcher3/settings/SettingsProvider.java +++ b/src/com/android/launcher3/settings/SettingsProvider.java @@ -40,7 +40,6 @@ public final class SettingsProvider { public static final String SETTINGS_UI_GENERAL_ICONS_LARGE = "ui_general_icons_large"; public static final String SETTINGS_UI_GENERAL_ICONS_TEXT_FONT_FAMILY = "ui_general_icons_text_font"; public static final String SETTINGS_UI_GENERAL_ICONS_TEXT_FONT_STYLE = "ui_general_icons_text_font_style"; - public static final String SETTINGS_UI_GENERAL_ICONS_ICON_PACK = "ui_general_iconpack"; public static SharedPreferences get(Context context) { return context.getSharedPreferences(SETTINGS_KEY, Context.MODE_MULTI_PROCESS); @@ -77,8 +76,4 @@ public final class SettingsProvider { public static String getString(Context context, String key, int resource) { return getStringCustomDefault(context, key, context.getResources().getString(resource)); } - - public static void putString(Context context, String key, String value) { - get(context).edit().putString(key, value).commit(); - } } |