From bbb3efe373ec1b7bc5939b3b7694a11c45babe9b Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Thu, 5 Feb 2015 10:15:29 -0800 Subject: [PATCH] Removing the unused for years app shortcuts feature. The shortcuts feature has been commented out since 2011. Now the setings provider no longer has a bookmarks table since the only party aside of this commented out feature using it was the ShortcutManager. We moved to an in memory model for the settings provider's state. We do not want to keep there anything that is not used. Therefore, we moved from a bookmarks table to a resource which renders this settings feature unusable. If we decide to revive the shortcut feature we can revert this change and add support for in memory bookmarks state in the settings provider. Change-Id: Ib1871f940bc27029a5dd941b901d6087914a2231 --- AndroidManifest.xml | 25 -- res/values-af/strings.xml | 11 - res/values-am/strings.xml | 11 - res/values-ar/strings.xml | 11 - res/values-az-rAZ/strings.xml | 11 - res/values-bg/strings.xml | 11 - res/values-bn-rBD/strings.xml | 11 - res/values-ca/strings.xml | 11 - res/values-cs/strings.xml | 11 - res/values-da/strings.xml | 11 - res/values-de/strings.xml | 11 - res/values-el/strings.xml | 11 - res/values-en-rGB/strings.xml | 11 - res/values-en-rIN/strings.xml | 11 - res/values-es-rUS/strings.xml | 11 - res/values-es/strings.xml | 11 - res/values-et-rEE/strings.xml | 11 - res/values-eu-rES/strings.xml | 11 - res/values-fa/strings.xml | 11 - res/values-fi/strings.xml | 11 - res/values-fr-rCA/strings.xml | 11 - res/values-fr/strings.xml | 11 - res/values-gl-rES/strings.xml | 11 - res/values-hi/strings.xml | 11 - res/values-hr/strings.xml | 11 - res/values-hu/strings.xml | 11 - res/values-hy-rAM/strings.xml | 11 - res/values-in/strings.xml | 11 - res/values-is-rIS/strings.xml | 11 - res/values-it/strings.xml | 11 - res/values-iw/strings.xml | 11 - res/values-ja/strings.xml | 11 - res/values-ka-rGE/strings.xml | 11 - res/values-kk-rKZ/strings.xml | 11 - res/values-km-rKH/strings.xml | 11 - res/values-kn-rIN/strings.xml | 11 - res/values-ko/strings.xml | 11 - res/values-ky-rKG/strings.xml | 2 - res/values-lo-rLA/strings.xml | 11 - res/values-lt/strings.xml | 11 - res/values-lv/strings.xml | 11 - res/values-mk-rMK/strings.xml | 11 - res/values-ml-rIN/strings.xml | 11 - res/values-mn-rMN/strings.xml | 11 - res/values-mr-rIN/strings.xml | 11 - res/values-ms-rMY/strings.xml | 11 - res/values-my-rMM/strings.xml | 11 - res/values-nb/strings.xml | 11 - res/values-ne-rNP/strings.xml | 11 - res/values-nl/strings.xml | 11 - res/values-pl/strings.xml | 11 - res/values-pt-rPT/strings.xml | 11 - res/values-pt/strings.xml | 11 - res/values-ro/strings.xml | 11 - res/values-ru/strings.xml | 11 - res/values-si-rLK/strings.xml | 11 - res/values-sk/strings.xml | 11 - res/values-sl/strings.xml | 11 - res/values-sr/strings.xml | 11 - res/values-sv/strings.xml | 11 - res/values-sw/strings.xml | 11 - res/values-ta-rIN/strings.xml | 11 - res/values-te-rIN/strings.xml | 11 - res/values-th/strings.xml | 11 - res/values-tl/strings.xml | 11 - res/values-tr/strings.xml | 11 - res/values-uk/strings.xml | 11 - res/values-ur-rPK/strings.xml | 11 - res/values-uz-rUZ/strings.xml | 11 - res/values-vi/strings.xml | 11 - res/values-zh-rCN/strings.xml | 11 - res/values-zh-rHK/strings.xml | 11 - res/values-zh-rTW/strings.xml | 11 - res/values-zu/strings.xml | 11 - res/values/strings.xml | 23 -- res/xml/application_settings.xml | 11 - res/xml/quick_launch_settings.xml | 23 -- src/com/android/settings/Settings.java | 1 - .../android/settings/SettingsActivity.java | 2 - .../settings/quicklaunch/BookmarkPicker.java | 331 ---------------- .../quicklaunch/QuickLaunchSettings.java | 370 ------------------ .../quicklaunch/ShortcutPreference.java | 151 ------- 82 files changed, 1731 deletions(-) delete mode 100644 res/xml/quick_launch_settings.xml delete mode 100644 src/com/android/settings/quicklaunch/BookmarkPicker.java delete mode 100644 src/com/android/settings/quicklaunch/QuickLaunchSettings.java delete mode 100644 src/com/android/settings/quicklaunch/ShortcutPreference.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d7d67b04726..efcfea1db50 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1279,31 +1279,6 @@ - - - - - - - - - - - - - - - - - - - "Tabletinligting" "Fooninligting" "Batteryinligting" - "Kitsloods" - "Stel sleutelbordkortpaaie om programme te loods" - "Ken program toe" - "Geen kortpad nie" - "Soek + %1$s" - "Maak skoon" - "Jou kortpad vir %1$s (%2$s) sal uitgevee word." - "OK" - "Kanselleer" - "Programme" - "Kortpaaie" "Teksinvoer" "Invoermetode" "Huidige sleutelbord" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 0c2af6cd7d0..03d5568e7cf 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -1394,17 +1394,6 @@ "የጡባዊ መረጃ" "የስልክ መረጃ" "የባትሪመረጃ" - "ፈጣን ማስነሻ" - "መተግበሪያዎችን ለማስጀመር የቁልፍ ሰሌዳ አቋራጭ አዘጋጅ" - "መተግበሪያ መድብ" - "ምንም አቋራጮች የሉም" - "+ %1$s ፈልግ" - "አጽዳ" - "የ%1$s (%2$s) አቋራጭዎ ይጠራል።" - "እሺ" - "ይቅር" - "መተግበሪያዎች" - "አቋራጮች" "ፅሁፍ ግቤት" "የግቤት ስልት" "የአሁኑ ቁልፍ ሰሌዳ" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 5e0b59e9506..b8642747d1c 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -1394,17 +1394,6 @@ "معلومات الجهاز اللوحي" "معلومات الهاتف" "معلومات البطارية" - "تشغيل سريع" - "تعيين اختصارات لوحة المفاتيح لتشغيل التطبيقات" - "تعيين تطبيق" - "ليس هناك أي اختصارات" - "بحث + %1$s" - "محو" - "سيتم محو اختصارك لـ %1$s (%2$s)." - "موافق" - "إلغاء" - "التطبيقات" - "الاختصارات" "إدخال نصي" "طريقة الإرسال" "لوحة المفاتيح الحالية" diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml index 78c447dd66c..e0ae1c07555 100644 --- a/res/values-az-rAZ/strings.xml +++ b/res/values-az-rAZ/strings.xml @@ -1293,17 +1293,6 @@ "Planşet haqqında məlumat" "Telefon məlumatı" "Batareya haqqında məlumat" - "Tez işə salma" - "Tətbiqləri başlatmaq üçün klaviatura qısayolları ayarlayın" - "Tətbiq ayırın" - "Qısayol yoxdur" - "Axtar + %1$s" - "Sil" - "%1$s (%2$s) üçün qısayolunuz silinəcək." - "OK" - "Ləğv et" - "Tətbiqlər" - "Qısayollar" "Mətn daxil etməsi" "Daxiletmə metodu" "Defolt" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index db3f04b098c..968cb1ca044 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -1394,17 +1394,6 @@ "Информация за таблета" "Информация за телефон" "Информация за батерията" - "Бързо стартиране" - "Задаване на клавишни комбинации за стартиране на приложения" - "Задаване на приложение" - "Няма преки пътища" - "Търсене + %1$s" - "Изчистване" - "Прекият ви път за %1$s (%2$s) ще бъде създаден." - "OK" - "Отказ" - "Приложения" - "Преки пътища" "Въвеждане на текст" "Метод на въвеждане" "Текуща клавиатура" diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index 929f1dd2b5e..d4ce15141a3 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -1394,17 +1394,6 @@ "ট্যাবলেট তথ্য" "ফোন তথ্য" "ব্যাটারি তথ্য" - "দ্রুত লঞ্চ" - "অ্যাপ্লিকেশানগুলি লঞ্চ করতে কীবোর্ড শর্টকাট সেট করুন" - "অ্যাপ্লিকেশান হস্তান্তর করুন" - "কোনো শর্টকাট নেই" - "অনুসন্ধান + %1$s" - "সাফ করুন" - "%1$s (%2$s) এর জন্য আপনার শর্টকাট সাফ করা হবে।" - "ঠিক আছে" - "বাতিল" - "অ্যাপ্লিকেশানগুলি" - "শর্টকাটগুলি" "পাঠ্য ইনপুট" "ইনপুট পদ্ধতি" "বর্তমান কীবোর্ড" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index d7771e9dcc9..21a2ce48b22 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -1394,17 +1394,6 @@ "Informació de la tauleta" "Informació del telèfon" "Informació de la bateria" - "Inici ràpid" - "Defineix les tecles de drecera per iniciar aplicacions" - "Assigna l\'aplicació" - "Cap drecera" - "Cerca + %1$s" - "Esborra" - "La drecera de %1$s (%2$s) s\'esborrarà." - "D\'acord" - "Cancel·la" - "Aplicacions" - "Dreceres" "Introducció de text" "Mètode d\'introducció de text" "Teclat actual" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index af4231061da..6c315a29328 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -1394,17 +1394,6 @@ "Informace o tabletu" "Informace o telefonu" "Info o baterii" - "Rychlé spuštění" - "Umožňuje nastavit klávesové zkratky pro spouštění aplikací" - "Přiřadit aplikaci" - "Žádná klávesová zkratka" - "Hledat + %1$s" - "Vymazat" - "Klávesová zkratka %1$s (%2$s) bude vymazána." - "OK" - "Zrušit" - "Aplikace" - "Zástupce" "Zadávání textu" "Metoda zadávání dat" "Aktuální klávesnice" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index df7b2a0f7f5..33e05938d95 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -1394,17 +1394,6 @@ "Oplysninger om tablet" "Telefonoplysninger" "Batterioplysninger" - "Hurtig start" - "Angiv tastaturgenveje til start af apps" - "Tildel app" - "Ingen genvej" - "Søg + %1$s" - "Ryd" - "Din genvej til %1$s (%2$s) ryddes." - "OK" - "Annuller" - "Apps" - "Genveje" "Tekstinput" "Inputmetode" "Aktuelt tastatur" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index fc0421d8304..740b8c4c465 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -1395,17 +1395,6 @@ "Tablet-Informationen" "Telefoninformation" "Akkuinformationen" - "Schnellstart" - "Tastenkombinationen zum Starten von Apps festlegen" - "App zuweisen" - "Kein Tasteaturkürzel" - "Suche + %1$s" - "Löschen" - "Die Verknüpfung für %1$s (%2$s) wird gelöscht." - "OK" - "Abbrechen" - "Apps" - "Tastenkombinationen" "Texteingabe" "Eingabemethode" "Aktuelle Tastatur" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index de77a2bdc86..2ef33d06a4e 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -1394,17 +1394,6 @@ "Πληροφορίες tablet" "Πληροφορίες τηλεφώνου" "Πληροφορίες μπαταρίας" - "Γρήγορη εκκίνηση" - "Ορισμός συντομεύσεων πληκτρολογίου για την εκκίνηση εφαρμογών" - "Εκχώρηση εφαρμογής" - "Δεν υπάρχει συντόμευση" - "Αναζήτηση + %1$s" - "Εκκαθάριση" - "Η συντόμευσή σας για %1$s (%2$s) θα εκκαθαριστεί." - "OK" - "Ακύρωση" - "Εφαρμογές" - "Συντομεύσεις" "Είσοδος κειμένου" "Μέθοδος εισόδου" "Τρέχον πληκτρολόγιο" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index e8d97ede1c8..d9ee26b677c 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -1394,17 +1394,6 @@ "Tablet information" "Phone information" "Battery information" - "Quick launch" - "Set keyboard shortcuts to launch apps" - "Assign app" - "No shortcut" - "Search + %1$s" - "Clear" - "Your shortcut for %1$s (%2$s) will be cleared." - "OK" - "Cancel" - "Apps" - "Shortcuts" "Text input" "Input method" "Current Keyboard" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index e8d97ede1c8..d9ee26b677c 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -1394,17 +1394,6 @@ "Tablet information" "Phone information" "Battery information" - "Quick launch" - "Set keyboard shortcuts to launch apps" - "Assign app" - "No shortcut" - "Search + %1$s" - "Clear" - "Your shortcut for %1$s (%2$s) will be cleared." - "OK" - "Cancel" - "Apps" - "Shortcuts" "Text input" "Input method" "Current Keyboard" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 0ba4b64d412..da85adede90 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -1394,17 +1394,6 @@ "Información del tablet" "Información del dispositivo" "Información sobre la batería" - "Lanzamiento rápido" - "Establecer accesos rápidos del teclado para ejecutar aplicaciones" - "Asignar aplicación" - "No hay acceso directo" - "Buscar + %1$s" - "Eliminar" - "Se borrará tu acceso directo para %1$s (%2$s)." - "Aceptar" - "Cancelar" - "Aplicaciones" - "Accesos directos" "Ingreso de texto" "Método de entrada" "Teclado actual" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index ffb737c959e..2b816e0bc39 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -1394,17 +1394,6 @@ "Información del tablet" "Información sobre el teléfono" "Información sobre la batería" - "Inicio rápido" - "Establecer accesos rápidos del teclado para iniciar aplicaciones" - "Asignar aplicación" - "Sin acceso directo" - "Buscar + %1$s" - "Borrar" - "Se eliminará el acceso directo %1$s%2$s." - "Aceptar" - "Cancelar" - "Aplicaciones" - "Accesos directos" "Introducción de texto" "Introducción de texto" "Teclado actual" diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index ae15582e3ba..68d206a512e 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -1394,17 +1394,6 @@ "Teave tahvelarvuti kohta" "Telefoni andmed" "Akuteave" - "Kiirkäivitus" - "Määra rakenduste käivitamiseks klaviatuuri otseteed" - "Määra rakendus" - "Otsetee puudub" - "Otsing + %1$s" - "Kustutamine" - "Teie otsetee %1$s (%2$s) jaoks kustutatakse." - "OK" - "Tühista" - "Rakendused" - "Otseteed" "Tekstisisestus" "Sisestusmeetod" "Praegune klaviatuur" diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml index 51b64521b94..a4908807577 100644 --- a/res/values-eu-rES/strings.xml +++ b/res/values-eu-rES/strings.xml @@ -1394,17 +1394,6 @@ "Tabletari buruzko informazioa" "Telefonoari buruzko informazioa" "Bateriari buruzko informazioa" - "Abiarazte bizkorra" - "Ezarri aplikazioak abiarazteko laster-teklak" - "Esleitu aplikazioa" - "Ez dago lasterbiderik" - "Bilatu + %1$s" - "Garbitu" - "%1$s (%2$s) lasterbidea garbituko da." - "Ados" - "Utzi" - "Aplikazioak" - "Laster-teklak" "Testu-idazketa" "Idazketa-metodoa" "Uneko teklatua" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 3dea20aea15..6e73827c782 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -1394,17 +1394,6 @@ "اطلاعات رایانهٔ لوحی" "اطلاعات تلفن" "اطلاعات باتری" - "راه‌اندازی سریع" - "تنظیم میانبرهای صفحه‌کلید برای راه‌اندازی برنامه‌ها" - "اختصاص برنامه" - "بدون میانبر" - "جستجو + %1$s" - "پاک کردن" - "میانبر شما برای %1$s (%2$s) پاک می‌شود." - "تأیید" - "لغو" - "برنامه‌ها" - "میانبرها" "ووردی متن" "روش ورودی" "صفحه‌کلیدهای کنونی" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 4f128c61367..7c32a8e5cc5 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -1394,17 +1394,6 @@ "Tablet-laitteen tiedot" "Puhelimen tiedot" "Akun tiedot" - "Pikakäynnistys" - "Aseta pikanäppäimiä, joiden avulla käynnistät sovelluksia" - "Määritä sovellukselle" - "Ei pikakuvaketta" - "Haku + %1$s" - "Tyhjennä" - "Pikanäppäimesi %1$s (%2$s) tyhjennetään." - "OK" - "Peruuta" - "Sovellukset" - "Pikakuvakkeet" "Tekstisyöttö" "Syöttötapa" "Nykyinen näppäimistö" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 9e1cf022d66..d30f70f1a94 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -1394,17 +1394,6 @@ "Informations sur la tablette" "Informations sur le téléphone" "Informations sur la batterie" - "Lancement rapide" - "Configurer des raccourcis clavier pour lancer des applications" - "Attribuer l\'application" - "Aucun raccourci" - "Rechercher + %1$s" - "Effacer" - "Vos raccourcis pour %1$s (%2$s) vont être effacés." - "OK" - "Annuler" - "Applications" - "Raccourcis" "Saisie de texte" "Mode de saisie" "Clavier actuel" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 595295df0da..6a736ee7fc8 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -1394,17 +1394,6 @@ "Informations sur la tablette" "Informations sur le téléphone" "Informations sur la batterie" - "Lancement rapide" - "Configurer des raccourcis clavier pour lancer des applications" - "Attribuer l\'application" - "Aucun raccourci" - "Rechercher + %1$s" - "Effacer" - "Vos raccourcis pour %1$s (%2$s) vont être effacés." - "OK" - "Annuler" - "Applications" - "Raccourcis" "Saisie de texte" "Mode de saisie" "Clavier actuel" diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml index 091d8980205..f5dffe35cc8 100644 --- a/res/values-gl-rES/strings.xml +++ b/res/values-gl-rES/strings.xml @@ -1394,17 +1394,6 @@ "Información sobre o tablet" "Información sobre o teléfono" "Información sobre a batería" - "Inicio rápido" - "Define os atallos do teclado para iniciar aplicacións" - "Asignar aplicación" - "Ningún atallo" - "Busca + %1$s" - "Borrar" - "Borrarase o teu atallo para %1$s (%2$s)." - "Aceptar" - "Cancelar" - "Aplicacións" - "Atallos" "Entrada de texto" "Método de entrada" "Teclado actual" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index c8bcb7d0f20..4aaca7f36d2 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -1394,17 +1394,6 @@ "टेबलेट जानकारी" "फ़ोन जानकारी" "बैटरी जानकारी" - "त्वरित लॉन्च" - "ऐप्स लॉन्‍च करने के लिए कीबोर्ड शॉर्टकट सेट करें" - "ऐप्स सौंपें" - "कोई शॉर्टकट नहीं" - "खोज + %1$s" - "साफ़ करें" - "%1$s (%2$s) के आपके शॉर्टकट साफ़ कर दिए जाएंगे." - "ठीक है" - "रहने दें" - "ऐप्स" - "शॉर्टकट" "लेख इनपुट" "इनपुट विधि" "वर्तमान कीबोर्ड" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index a9171ab8663..d7c4b8c180d 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -1394,17 +1394,6 @@ "Informacije o tabletnom uređaju" "Telefonske informacije" "Informacije o bateriji" - "Brzo pokretanje" - "Postavljanje tipkovničkih prečaca za pokretanje aplikacija" - "Dodjela aplikacije" - "Bez prečaca" - "Pretraži + %1$s" - "Očisti" - "Vaš prečac za stavku %1$s (%2$s) bit će izbrisan." - "U redu" - "Odustani" - "Aplikacije" - "Prečaci" "Unos teksta" "Način ulaza" "Trenutačna tipkovnica" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index f704f1e83d2..2c76a4efac3 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -1394,17 +1394,6 @@ "Táblagép adatai" "Telefon adatai" "Akkumulátoradatok" - "Gyorsindítás" - "Állítson be billentyűparancsokat az alkalmazások indítására" - "Alkalmazás hozzárendelése" - "Nincs parancsikon" - "Keresés + %1$s" - "Törlés" - "A(z) %1$s parancsikon (%2$s) törlésre kerül." - "OK" - "Mégse" - "Alkalmazások" - "Parancsikonok" "Szöveges bevitel" "Beviteli mód" "Jelenlegi billentyűzet" diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index b986ebff1b8..16ed16859c9 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -1394,17 +1394,6 @@ "Գրասալիկի տեղեկատվություն" "Հեռախոսի տեղեկություններ" "Մարտկոցի տեղեկատվություն" - "Արագ գործարկում" - "Սահմանել ստեղնաշարի դյուրանցումը՝ հավելվածները գործարկելու համար" - "Կապակցել հավելվածին" - "Դյուրանցում չկա" - "Որոնում + %1$s" - "Մաքրել" - "Ձեր կարճուղին %1$s (%2$s)-ի համար կմաքրվի:" - "Լավ" - "Չեղարկել" - "Հավելվածներ" - "Դյուրանցումներ" "Տեքսի մուտքագրում" "Մուտքագրման եղանակ" "Ընթացիկ ստեղնաշարը" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 5fa4bcbf6e4..c8480c47c8a 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -1394,17 +1394,6 @@ "Informasi tablet" "Informasi telepon" "Informasi baterai" - "Peluncuran cepat" - "Menyetel pintasan keyboard untuk meluncurkan aplikasi" - "Menetapkan apl" - "Tanpa pintasan" - "Telusuri + %1$s" - "Bersihkan" - "Pintasan Anda untuk %1$s (%2$s) akan dihapus." - "Oke" - "Batal" - "Aplikasi" - "Pintasan" "Masukan teks" "Metode masukan" "Keyboard Saat Ini" diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml index b4750e069fd..297831c5826 100644 --- a/res/values-is-rIS/strings.xml +++ b/res/values-is-rIS/strings.xml @@ -1394,17 +1394,6 @@ "Upplýsingar um spjaldtölvuna" "Upplýsingar um símann" "Upplýsingar um rafhlöðu" - "Flýtiræsing" - "Stilla flýtilykla að opna forrit" - "Velja forrit" - "Engin flýtileið" - "Leita + %1$s" - "Hreinsa" - "Flýtileiðin þín fyrir %1$s (%2$s) verður hreinsuð." - "Í lagi" - "Hætta við" - "Forrit" - "Flýtileiðir" "Textainnsláttur" "Innsláttaraðferð" "Valið lyklaborð" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 8292cbc8b1e..ec88dbbc057 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -1394,17 +1394,6 @@ "Informazioni sul tablet" "Informazioni telefono" "Informazioni batteria" - "Avvio rapido" - "Imposta scorciatoie da tastiera per avviare le applicazioni" - "Assegna applicazione" - "Nessuna scorciatoia" - "Ricerca + %1$s" - "Cancella" - "La scorciatoia per %1$s (%2$s) verrà cancellata." - "OK" - "Annulla" - "App" - "Scorciatoie" "Inserimento testo" "Metodo inserimento" "Tastiera corrente" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index e87e90a1b5c..6e9fc157dd7 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -1394,17 +1394,6 @@ "פרטי טאבלט" "מידע על הטלפון" "מידע על סוללה" - "הפעלה מהירה" - "הגדרת מקשי קיצור להפעלת אפליקציות" - "הקצאה לאפליקציה" - "אין קיצור דרך" - "חיפוש + %1$s" - "נקה" - "קיצור הדרך של %1$s ‏(%2$s) יוסר." - "אישור" - "ביטול" - "Apps" - "קיצורי דרך" "קלט טקסט" "שיטת קלט" "מקלדת נוכחית" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 7b93937576d..d827cfb7c2a 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -1396,17 +1396,6 @@ "タブレット情報" "携帯電話情報" "電池情報" - "クイック起動" - "アプリの起動にショートカットキーを割り当てる" - "アプリを選択" - "ショートカットなし" - "Search+%1$s" - "消去" - "%1$s (%2$s) のショートカットをクリアします。" - "OK" - "キャンセル" - "アプリ" - "ショートカット" "文字入力" "入力方法" "現在のキーボード" diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 66a09f4aac3..0b0191875d5 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -1394,17 +1394,6 @@ "ინფორმაცია ტაბლეტის შესახებ" "ინფორმაცია ტელეფონის შესახებ" "ინფორმაცია ბატარეის შესახებ" - "სწრაფი გაშვება" - "აპების გასაშვებად მალსახმობების პარამეტრების დაყენება" - "აპის დანიშვნა" - "მალსახობი არ არის" - "ძებნა + %1$s" - "წაშლა" - "%1$s (%2$s)-ის მალსახმობი წაიშლება." - "კარგი" - "გაუქმება" - "აპები" - "მალსახმობები" "ტექსტის შეყვანა" "შეტანის მეთოდი" "ამჟამინდელი კლავიატურა" diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml index c8c41da62d3..e9dabd60036 100644 --- a/res/values-kk-rKZ/strings.xml +++ b/res/values-kk-rKZ/strings.xml @@ -1394,17 +1394,6 @@ "Планшет ақпараты" "Телефон ақпараты" "Батарея ақпараты" - "Жылдам бастау" - "Қолданбаларды қосатын төте пернелер тағайындау" - "Қолданбаны тағайындау" - "Төте пернелер жоқ" - "Іздеу + %1$s" - "Өшіру" - "%1$s (%2$s) төте пернелері өшіріледі." - "Жарайды" - "Өшіру" - "Қолданбалар" - "Төте пернелер" "Мәтін енгізу" "Енгізу әдісі" "Ағымдағы пернетақта" diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index 3dea67cee28..ecd3d32691a 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -1394,17 +1394,6 @@ "ព័ត៌មាន​កុំព្យូទ័រ​បន្ទះ" "ព័ត៌មាន​ទូរស័ព្ទ" "ព័ត៌មាន​ថ្ម" - "ចាប់ផ្ដើម​រហ័ស" - "កំណត់​ផ្លូវកាត់​ក្ដារ​ចុច ដើម្បី​ចាប់ផ្ដើម​កម្មវិធី" - "ផ្ដល់​កម្មវិធី" - "គ្មាន​ផ្លូវកាត់" - "ស្វែងរក + %1$s" - "សម្អាត" - "ផ្លូវកាត់​របស់​អ្នក​សម្រាប់ %1$s (%2$s) នឹង​ត្រូវ​បាន​សម្អាត។" - "យល់​ព្រម​" - "បោះ​បង់​" - "កម្មវិធី" - "ផ្លូវកាត់" "ការ​បញ្ចូល​អត្ថបទ" "វិធីសាស្ត្រ​បញ្ចូល" "ក្ដារចុច​បច្ចុប្បន្ន" diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml index 37520741abd..ca735aedbab 100644 --- a/res/values-kn-rIN/strings.xml +++ b/res/values-kn-rIN/strings.xml @@ -1394,17 +1394,6 @@ "ಟ್ಯಾಬ್ಲೆಟ್ ಮಾಹಿತಿ" "ಫೋನ್ ಮಾಹಿತಿ" "ಬ್ಯಾಟರಿ ಮಾಹಿತಿ" - "ಶೀಘ್ರ ಪ್ರಾರಂಭ" - "ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಪ್ರಾರಂಭಿಸಲು ಕೀಬೋರ್ಡ್‌ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಹೊಂದಿಸಿ" - "ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಯೋಜಿಸು" - "ಶಾರ್ಟ್‌ಕಟ್ ಇಲ್ಲ" - "ಹುಡುಕಾಟ + %1$s" - "ತೆರವುಗೊಳಿಸು" - "%1$s (%2$s) ಗೆ ನಿಮ್ಮ ಶಾರ್ಟ್‌ಕಟ್‌ ಅನ್ನು ತೆರವುಗೊಳಿಸಲಾಗುವುದು." - "ಸರಿ" - "ರದ್ದುಮಾಡು" - "ಅಪ್ಲಿಕೇಶನ್‌ಗಳು" - "ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು" "ಪಠ್ಯ ಇನ್‌ಪುಟ್" "ಇನ್‌ಪುಟ್ ವಿಧಾನ" "ಪ್ರಸ್ತುತ ಕೀಬೋರ್ಡ್" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 300414266a1..4e9b9c8cd02 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -1394,17 +1394,6 @@ "태블릿 정보" "휴대전화 정보" "배터리 정보" - "빠른실행" - "앱을 실행하는 바로가기 설정" - "앱 할당" - "바로가기 없음" - "검색 + %1$s" - "지우기" - " %1$s(%2$s)에 대한 바로가기가 지워집니다." - "확인" - "취소" - "앱" - "바로가기" "텍스트 입력" "입력 방법" "현재 키보드" diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml index fec7f1975f7..71e7369986a 100644 --- a/res/values-ky-rKG/strings.xml +++ b/res/values-ky-rKG/strings.xml @@ -2044,8 +2044,6 @@ - - diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index 99fa979398b..f07618d61f7 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -1394,17 +1394,6 @@ "ຂໍ້ມູນແທັບເລັດ" "ຂໍ້​ມູນ​ໂທລະ​ສັບ" "ຂໍ້ມູນແບັດເຕີຣີ" - "ການເປີດດ່ວນ" - "ຕັ້ງທາງລັດແປ້ນພິມເພື່ອເປີດໃຊ້ແອັບຯ" - "ກຳນົດແອັບຯ" - "ບໍ່ມີທາງລັດ" - "ຊອກຫາ + %1$s" - "ລຶບ" - "ທາງລັດຂອງທ່ານສຳລັບ %1$s (%2$s) ຈະຖືກລຶບອອກ." - "ຕົກລົງ" - "ຍົກເລີກ" - "ແອັບຯ" - "ທາງລັດ" "ການປ້ອນຂໍ້ຄວາມເຂົ້າ" "ວິທີການປ້ອນຂໍ້ມູນ" "ແປ້ນພິມ​ປັດຈຸບັນ" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 3d6d0440933..f44d04a1e1b 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -1394,17 +1394,6 @@ "Planšetinio kompiuterio informacija" "Telefono informacija" "Akumuliatoriaus informacija" - "Greitasis paleidimas" - "Nustatyti sparčiuosius klavišus, skirtus programoms paleisti" - "Priskirti programą" - "Nėra sparčiojo klavišo" - "Ieškoti + %1$s" - "Išvalyti" - "Bus išvalytas spartusis %1$s (%2$s) klavišas." - "Gerai" - "Atšaukti" - "Programos" - "Spartieji klavišai" "Teksto įvestis" "Įvesties metodas" "Esama klaviatūra" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index e3b7b02b212..95e4cfff1cf 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -1394,17 +1394,6 @@ "Informācija par planšetdatoru" "Informācija par tālruni" "Informācija par akumulatoru" - "Ātrā uzsākšana" - "Iestatīt īsinājumtaustiņus lietotņu palaišanai" - "Piešķirt lietotni" - "Nav saīsnes" - "Meklēt + %1$s" - "Notīrīt" - "%1$s (%2$s) paredzētā saīsne tiks notīrīta." - "Labi" - "Atcelt" - "Lietotnes" - "Saīsnes" "Teksta ievade" "Ievades metode" "Pašreizējā tastatūra" diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml index 5bf9c2322b0..e38682d2180 100644 --- a/res/values-mk-rMK/strings.xml +++ b/res/values-mk-rMK/strings.xml @@ -1394,17 +1394,6 @@ "Информации за таблет" "Информации за телефонот" "Информации за батерија" - "Брзо стартување" - "Постави кратенки на тастатурата за стартување апликации" - "Додели апликација" - "Нема кратенка" - "Пребарај + %1$s" - "Исчисти" - "Кратенката за %1$s (%2$s) ќе се избрише." - "Во ред" - "Откажи" - "Апликации" - "Кратенки" "Внесување текст" "Метод на внес" "Тековна тастатура" diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index 1d8c8ef85db..c43cb2d751e 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -1394,17 +1394,6 @@ "ടാബ്‌ലെറ്റ് വിവരം" "ഫോൺ വിവരം" "ബാറ്ററി വിവരം" - "ദ്രുത്ര സമാരംഭം" - "അപ്ലിക്കേഷനുകൾ സമാരംഭിക്കുന്നതിന് കീബോർഡ് കുറുക്കുവഴികൾ സജ്ജമാക്കുക" - "അപ്ലിക്കേഷനിൽ നൽകുക" - "കുറുക്കുവഴിയൊന്നുമില്ല" - "തിരയൽ+ %1$s" - "മായ്‌ക്കുക" - "%1$s (%2$s) എന്നതിനായുള്ള നിങ്ങളുടെ കുറുക്കുവഴികൾ മായ്‌ക്കും." - "ശരി" - "റദ്ദാക്കുക" - "അപ്ലിക്കേഷനുകൾ" - "കുറുക്കുവഴികൾ" "വാചക ഇൻപുട്ട്" "ടൈപ്പുചെയ്യൽ രീതി" "നിലവിലെ കീബോർഡ്" diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index 880b1ad6658..e46a7fcd582 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -1394,17 +1394,6 @@ "Таблетын мэдээлэл" "Утасны мэдээлэл" "Зайны мэдээлэл" - "Шуурхай эхлүүлэх" - "Апп эхлүүлэх гарын товчилборуудыг тохируулаарай" - "Апп оноох" - "Товчилбор байхгүй" - "Хайлт + %1$s" - "Цэвэрлэх" - "Таны %1$s (%2$s) товчилбор устах болно." - "Тийм" - "Цуцлах" - "Апп" - "Товчилбор" "Текстээр оруулах" "Оруулах арга" "Одоогийн Гар" diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml index 7a14fd424d7..e4fa7149167 100644 --- a/res/values-mr-rIN/strings.xml +++ b/res/values-mr-rIN/strings.xml @@ -1394,17 +1394,6 @@ "टॅब्लेट माहिती" "फोन माहिती" "बॅटरी माहिती" - "द्रुत लाँच" - "अॅप्स लाँच करण्यासाठी कीबोर्ड शॉर्टकट सेट करा" - "अॅप सुपूर्त करा" - "शॉर्टकट नाही" - "शोध + %1$s" - "साफ करा" - "%1$s (%2$s) साठी आपला शॉर्टकट साफ केला जाईल." - "ठीक" - "रद्द करा" - "अॅप्स" - "शॉर्टकट" "मजकूर इनपुट" "इनपुट पद्धत" "वर्तमान कीबोर्ड" diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index ebabb8df9a7..8f7a30f60f7 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -1394,17 +1394,6 @@ "Maklumat tablet" "Maklumat telefon" "Maklumat bateri" - "Lancar cepat" - "Tetapkan pintasan papan kekunci untuk melancarkan aplikasi" - "Tetapkan aplikasi" - "Tiada pintasan" - "Cari + %1$s" - "Padam bersih" - "Pintasan anda untuk %1$s (%2$s) akan dipadam bersih." - "OK" - "Batal" - "Aplikasi" - "Pintasan" "Input teks" "Kaedah input" "Papan Kekunci Semasa" diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml index 3b105c10669..1e94d25a7a5 100644 --- a/res/values-my-rMM/strings.xml +++ b/res/values-my-rMM/strings.xml @@ -1395,17 +1395,6 @@ "တက်ဘလက်အကြောင်း" "ဖုန်းအကြောင်း" "ဘက်ထရီအကြောင်း" - "အမြန်ဖွင့်ရန်" - "အပလီကေးရှင်းများဖွင့်ရန် ကီးဘုတ်အတိုကောက်အားသတ်မှတ်မည်" - "အပလီကေးရှင်းကို တာဝန်ပေးမည်" - "အတိုကောက် မရှိပါ" - "ရှာဖွေခြင်း + %1$s" - "ရှင်းလင်းရန်" - "%1$s (%2$s)အတွက်သင့်အတိုကောက်ကို ပယ်ဖျက်ပါမည်" - "ကောင်းပြီ" - "ထားတော့" - "အပလီကေးရှင်းများ" - "အတိုကောက်များ" "စာသားဖြင့်ထည့်သွင်းခြင်း" "ထည့်သွင်းရန်နည်းလမ်း" "လက်ရှိ ကီးဘုတ်" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 02b42e75715..3a9a9ec41a9 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -1394,17 +1394,6 @@ "Informasjon om nettbrettet" "Telefoninformasjon" "Batteriinformasjon" - "Hurtigtaster" - "Angi hurtigtaster for å starte apper" - "Tilordne app" - "Ingen snarvei" - "Søk + %1$s" - "Fjern" - "Snarveien for %1$s (%2$s) will be fjernet." - "OK" - "Avbryt" - "Apper" - "Snarveier" "Skriving av tekst" "Inndatametode" "Gjeldende tastatur" diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml index 5b24d48d6b6..096e92a1aac 100644 --- a/res/values-ne-rNP/strings.xml +++ b/res/values-ne-rNP/strings.xml @@ -1394,17 +1394,6 @@ "ट्याब्लेट जानकारी" "फोन जानकारी" "ब्याट्रि जानकारी" - "छिटो सुरुवात" - "अनुप्रयोग सुरु गर्नका लागि किबोर्ड सर्टकट सेट गर्नुहोस्" - "अनुप्रयोगलाई काम लगाउनुहोस्" - "कुनै सर्टकट छैन" - "खोज + %1$s" - "हटाउनुहोस्" - "%1$s ( %2$s )का लागि तपाईँको सर्टकट मेटाउनुहोस्।" - "ठीक छ" - "रद्द गर्नुहोस्" - "अनुप्रयोगहरू" - "सर्टकटहरू" "पाठ इनपुट" "इनपुट विधि" "वर्तमान किबोर्ड" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 76828f4bd58..03d8b86a400 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -1394,17 +1394,6 @@ "Tabletinformatie" "Telefooninformatie" "Accu-informatie" - "Snelstarten" - "Snelkoppelingen instellen voor het starten van apps" - "App toewijzen" - "Geen sneltoets" - "Zoeken + %1$s" - "Wissen" - "Uw sneltoets voor %1$s (%2$s) wordt gewist." - "OK" - "Annuleren" - "Apps" - "Sneltoetsen" "Tekstinvoer" "Invoermethode" "Huidig toetsenbord" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 41d2244780d..4fec0a13312 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -1394,17 +1394,6 @@ "Informacje o tablecie" "Informacje o telefonie" "Informacje o baterii" - "Szybkie uruchamianie" - "Ustaw skróty klawiszowe, aby uruchamiać aplikacje." - "Przypisz aplikację" - "Brak skrótu" - "Szukaj + %1$s" - "Wyczyść" - "Skrót do %1$s (%2$s) zostanie usunięty." - "OK" - "Anuluj" - "Aplikacje" - "Skróty" "Wprowadzanie tekstu" "Sposób wprowadzania tekstu" "Obecna klawiatura" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 72443ff539d..93c4d03698a 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -1394,17 +1394,6 @@ "Informações do tablet" "Informações do telefone" "Informação da bateria" - "Iniciação rápida" - "Definir atalhos de teclado para iniciar aplicações" - "Atribuir aplicação" - "Nenhum atalho" - "Pesquisar + %1$s" - "Limpar" - "O seu atalho para %1$s (%2$s) será limpo." - "OK" - "Cancelar" - "Aplicações" - "Atalhos" "Entrada de texto" "Método de entrada" "Teclado atual" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 2adf0d3f269..3305df3e701 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -1394,17 +1394,6 @@ "Informações do tablet" "Informações do telefone" "Informações da bateria" - "Início rápido" - "Define atalhos de teclado para iniciar apps" - "Atribuir app" - "Sem atalho" - "Pesquisar + %1$s" - "Limpar" - "O seu atalho para %1$s (%2$s) será apagado." - "OK" - "Cancelar" - "Apps" - "Atalhos" "Entrada de texto" "Método de entrada" "Teclado atual" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 0f372e70edb..02d18f4687e 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -1395,17 +1395,6 @@ "Informaţii tabletă" "Informaţii telefon" "Informaţii baterie" - "Lansare rapidă" - "Setaţi comenzi rapide de la tastatură pentru a lansa aplicaţii" - "Atribuiţi o aplicaţie" - "Fără comandă rapidă" - "Căutaţi + %1$s" - "Ștergeţi" - "Comanda dvs. rapidă pentru %1$s (%2$s) va fi ştearsă." - "OK" - "Anulaţi" - "Aplicaţii" - "Comenzi rapide" "Introducere text" "Metodă de intrare" "Tastatura actuală" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 01bd6088d7e..5eadf4af4d3 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -1394,17 +1394,6 @@ "Информация о планшетном ПК" "Информация о телефоне" "Информация о батарее" - "Быстрый запуск" - "Настройка быстрых клавиш для запуска приложений" - "Назначить приложение" - "Нет ярлыка" - "Поиск в + %1$s" - "Очистить" - "Ярлык для %1$s (%2$s) будет удален." - "ОК" - "Отмена" - "Приложения" - "Ярлыки" "Ввод текста" "Способ ввода" "Текущая клавиатура" diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index 662e81e8ad9..5d560f1554d 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -1396,17 +1396,6 @@ "ටැබ්ලට් තොරතුරු" "දුරකථන තොරතුරු" "බැටරි තොරතුරු" - "ක්ෂණික දියත් කිරීම" - "යෙදුම් ආරම්භයට යතුරු පුවරු කෙටිමං සකසන්න" - "යෙදුම යොමුකරන්න" - "කෙටිමගක් නොමැත" - "සෙවීම + %1$s" - "හිස් කරන්න" - "%1$s (%2$s) සඳහා ඔබගේ කෙටිමඟ ඉවත්වනු ඇත." - "හරි" - "අවලංගු කරන්න" - "යෙදුම්" - "කෙටිමං" "පෙළ ආදානය" "ආදාන ක්‍රමය" "දැන් යතුරු පුවරු" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 4d27f51d889..17bfd2a3bb4 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -1394,17 +1394,6 @@ "Informácie o tablete" "Informácie o telefóne" "Informácie o batérii" - "Rýchle spustenie" - "Nastavenie klávesových skratiek na spúšťanie aplikácií" - "Priradiť aplikáciu" - "Žiadna klávesová skratka" - "Hľadať + %1$s" - "Vymazať" - "Klávesová skratka %1$s (%2$s) bude vymazaná." - "OK" - "Zrušiť" - "Aplikácie" - "Odkazy" "Zadávanie textu" "Metóda vstupu" "Aktuálna klávesnica" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 19f94ecf448..eff20d25a99 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -1394,17 +1394,6 @@ "Informacije o tabličnem računalniku" "Informacije o telefonu" "Informacije o bateriji" - "Hitri zagon" - "Nastavi bližnjice na tipkovnici za zagon aplikacij" - "Določite aplikacijo" - "Ni bližnjice" - "Išči + %1$s" - "Počisti" - "Bližnjica za aplikacijo %1$s (%2$s) bo izbrisana." - "V redu" - "Prekliči" - "Aplikacije" - "Bližnjice" "Vnos besedila" "Vnosna metoda" "Trenutna tipkovnica" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index c66b3a82ba3..6fe5473f0ab 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -1394,17 +1394,6 @@ "Информације о таблету" "Информације о телефону" "Информације о батерији" - "Брзо покретање" - "Подешавање тастерских пречица за покретање апликација" - "Додељивање апликацијe" - "Нема пречице" - "Претрага + %1$s" - "Брисање" - "Пречица за %1$s (%2$s) биће избрисана." - "Потврди" - "Откажи" - "Апликације" - "Пречице" "Унос текста" "Метод улаза" "Актуелна тастатура" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 4608b684ef1..86f7e22a8d9 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -1394,17 +1394,6 @@ "Information om surfplattan" "Telefoninformation" "Batteriinformation" - "Snabbstart" - "Ställ in kortkommandon för att starta appar" - "Tilldela app" - "Ingen genväg" - "Sök + %1$s" - "Rensa" - "Din genväg för %1$s(%2$s) rensas." - "OK" - "Avbryt" - "Appar" - "Genvägar" "Textinmatning" "Indatametod" "Aktuellt tangentbord" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 11ee11321e3..204bd36174e 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -1388,17 +1388,6 @@ "Maelezo ya kompyuta kibao" "Maelezo ya simu" "Maelezo ya betri" - "Kufungua kwa kasi" - "Weka mikato ya kibodi kuzindua programu" - "Teua programu" - "Hakuna njia za mkato" - "Tafuta + %1$s" - "Futa" - "Njia mkato yako ya (%1$s(%2$s) itafutwa." - "Sawa" - "Ghairi" - "Programu" - "Njia za mkato" "Uingizaji maandishi" "Mbinu ya uingizaji" "Kibodi inayotumika Sasa" diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml index 01e865bc173..7ae84561e8e 100644 --- a/res/values-ta-rIN/strings.xml +++ b/res/values-ta-rIN/strings.xml @@ -1394,17 +1394,6 @@ "டேப்லெட் தகவல்" "மொபைலில் தகவல்" "பேட்டரி தகவல்" - "உடனடி தொடக்கம்" - "பயன்பாடுகளைத் துவக்க விசைப்பலகைக் குறுக்குவழிகளை அமைக்கவும்" - "பயன்பாட்டை ஒதுக்கு" - "குறுக்குவழி இல்லை" - "தேடல் + %1$s" - "அழி" - "%1$s (%2$s) க்கான உங்கள் குறுக்குவழி அழிக்கப்படும்." - "சரி" - "ரத்துசெய்" - "பயன்பாடுகள்" - "குறுக்குவழிகள்" "உரை உள்ளீடு" "உள்ளீட்டு முறை" "நடப்பு விசைப்பலகை" diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml index 26b2c9567a1..2dd4419c1c9 100644 --- a/res/values-te-rIN/strings.xml +++ b/res/values-te-rIN/strings.xml @@ -1394,17 +1394,6 @@ "టాబ్లెట్ సమాచారం" "ఫోన్ సమాచారం" "బ్యాటరీ సమాచారం" - "శీఘ్ర ప్రారంభం" - "అనువర్తనాలను ప్రారంభించడానికి కీబోర్డ్ సత్వరమార్గాలను సెట్ చేయండి" - "అనువర్తనాన్ని కేటాయించండి" - "సత్వరమార్గం లేదు" - "శోధన + %1$s" - "క్లియర్ చేయండి" - "%1$s (%2$s) కోసం మీ సత్వరమార్గం క్లియర్ చేయబడుతుంది." - "సరే" - "రద్దు చేయి" - "అనువర్తనాలు" - "సత్వరమార్గాలు" "వచన ఇన్‌పుట్" "ఇన్‌పుట్ పద్ధతి" "ప్రస్తుత కీబోర్డ్" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 12b9cb157d6..11ea615031a 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -1394,17 +1394,6 @@ "ข้อมูลแท็บเล็ต" "ข้อมูลโทรศัพท์" "ข้อมูลแบตเตอรี่" - "การเริ่มใช้งานด่วน" - "ตั้งค่าแป้นพิมพ์ลัดเพื่อเริ่มใช้งานแอปพลิเคชัน" - "กําหนดแอปพลิเคชัน" - "ไม่มีทางลัด" - "ค้นหา + %1$s" - "ล้างข้อมูล" - "ทางลัดของคุณสำหรับ %1$s (%2$s) จะถูกล้าง" - "ตกลง" - "ยกเลิก" - "แอปพลิเคชัน" - "ทางลัดของ" "การป้อนข้อความ" "วิธีการป้อนข้อมูล" "แป้นพิมพ์ปัจจุบัน" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index b2e7d4722e1..299aeb27905 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -1394,17 +1394,6 @@ "Impormasyon ng tablet" "Impormasyon ng telepono" "Impormasyon ng baterya" - "Mabilis na paglunsad" - "Magtakda ng mga shortcut ng keyboard upang maglunsad ng apps" - "Magtalaga ng app" - "Walang shortcut" - "Maghanap + %1$s" - "I-clear" - "Ang iyong shortcut para sa %1$s (%2$s) ay maki-clear." - "OK" - "Kanselahin" - "Apps" - "Mga Shortcut" "Pag-input ng teksto" "Paraan ng input" "Kasalukuyang Keyboard" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 4ce09f2a7e9..01ba0a88b85 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -1394,17 +1394,6 @@ "Tablet bilgileri" "Telefon bilgileri" "Pil bilgileri" - "Hızlı başlat" - "Uygulama başlatma klavye kısayollarını ayarla" - "Uygulama ata" - "Kısayol yok" - "Arama + %1$s" - "Temizle" - "%1$s (%2$s) için oluşturduğunuz kısayol silinecek." - "Tamam" - "İptal" - "Uygulamalar" - "Kısayollar" "Metin girişi" "Giriş yöntemi" "Geçerli Klavye" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index af51e31e9ce..7818a0aef3e 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -1394,17 +1394,6 @@ "Інф-ція про пристрій" "Інф-я тел-ну" "Інформація про акумулятор" - "Швидкий запуск" - "Встановлення комбінацій клавіш для запуску програм" - "Призначити програму" - "Немає ярлика" - "Пошук + %1$s" - "Очистити" - "Ваш ярлик для %1$s (%2$s) буде видалено." - "OK" - "Скасувати" - "Додатки" - "Ярлики" "Текст. введ." "Метод введення" "Поточна клавіатура" diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml index f0b45a53c33..dfb3ab4d326 100644 --- a/res/values-ur-rPK/strings.xml +++ b/res/values-ur-rPK/strings.xml @@ -1394,17 +1394,6 @@ "ٹیبلٹ کی معلومات" "فون کی معلومات" "بیٹری کی معلومات" - "فوری شروعات" - "ایپس شروع کرنے کیلئے کی بورڈ شارٹ کٹس سیٹ کریں" - "ایپ تفویض کریں" - "کوئی شارٹ کٹ نہیں ہے" - "تلاش کریں + %1$s" - "صاف کریں" - "%1$s (%2$s) کیلئے آپ کا شارٹ کٹ صاف کر دیا جائے گا۔" - "ٹھیک ہے" - "منسوخ کریں" - "ایپس" - "شارٹ کٹس" "متن ان پٹ" "اندراج کا طریقہ" "حالیہ کی بورڈ" diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml index 6105ed715e0..8e37b0f7b02 100644 --- a/res/values-uz-rUZ/strings.xml +++ b/res/values-uz-rUZ/strings.xml @@ -1394,17 +1394,6 @@ "Planshet ma‘lumoti" "Telefon ma‘lumoti" "Batareya ma‘lumoti" - "Tezkor ishga tushirish" - "Ilovalarni ishga tushiruvchi klaviatura yoqliqlarini o‘rnatish" - "Ilova belgilash" - "Yorliqsiz" - "Qidiruv + %1$s" - "Tozalash" - "%1$s (%2$s) yorlig‘ingiz tozalanadi." - "OK" - "Bekor qilish" - "Ilovalar" - "Yorliqlar" "Matn kiritish" "Yozish usuli" "Joriy klaviatura" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index ca5211d1cbd..1902067e7bd 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -1394,17 +1394,6 @@ "Thông tin về máy tính bảng" "Thông tin điện thoại" "Thông tin pin" - "Chạy nhanh" - "Đặt phím tắt để chạy ứng dụng" - "Gán ứng dụng" - "Không có lối tắt nào" - "Tìm kiếm + %1$s" - "Xóa" - "Lối tắt của bạn cho %1$s (%2$s) sẽ bị xóa." - "OK" - "Hủy" - "Ứng dụng" - "Lối tắt" "Nhập văn bản" "Phương thức nhập" "Bàn phím hiện tại" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index e6a175b3a11..bf56004d4bc 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -1394,17 +1394,6 @@ "平板电脑信息" "手机信息" "电池信息" - "快速启动" - "设置启动应用的键盘快捷键" - "分配给应用" - "无快捷键" - "搜索 + %1$s" - "清除" - "会清除快捷键 %1$s（%2$s）。" - "确定" - "取消" - "应用" - "快捷方式" "文字输入" "输入法" "当前输入法" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index dc6d080df3f..134c31890ba 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -1394,17 +1394,6 @@ "平板電腦資訊" "手機資訊" "電池資訊" - "快速啟動" - "設定啟動應用程式的鍵盤快速鍵" - "指派應用程式" - "沒有快速鍵" - "搜尋 + %1$s" - "清除" - "系統將清除您的 %1$s (%2$s) 捷徑。" - "確定" - "取消" - "應用程式" - "快速鍵" "文字輸入" "輸入法" "目前的鍵盤輸入法" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index b1c0755e1d8..4c20668acbf 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -1394,17 +1394,6 @@ "平板電腦資訊" "手機資訊" "電池資訊" - "快速啟動" - "設定啟動應用程式的鍵盤快速鍵" - "指派應用程式" - "沒有快速建" - "搜尋 + %1$s" - "清除" - "%1$s (%2$s) 的捷徑會被清除。" - "確定" - "取消" - "應用程式" - "快速鍵" "文字輸入法" "輸入法" "目前的鍵盤輸入法" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 6f805e51a2e..7813a558e20 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -1401,17 +1401,6 @@ "Ulwazi lethebhulethi" "Ulwazi lwefoni" "Ulwazi lebhetri" - "Ukuqalisa okusheshayo" - "Setha izinqamuleli zekhibhodi ukuqalisa izinhlelo zokusebenza" - "Beka uhlelo lokusebenza" - "Asikho isinqamuleli" - "Sesha + %1$s" - "Sula" - "Isinqamuleli sakho se %1$s (%2$s) sizosulwa." - "KULUNGILE" - "Khansela" - "Izinhlelo zokusebenza" - "Izinqamuleli" "Okufakwayo kombhalo" "Indlela yokufaka" "Ikhibhodi yamanje" diff --git a/res/values/strings.xml b/res/values/strings.xml index c639060e8f7..07aa467f5d4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3257,29 +3257,6 @@ SIM toolkit - - Quick launch - - Set keyboard shortcuts to launch apps - - Assign app - - No shortcut - - Search + %1$s - - Clear - - Your shortcut for %1$s (%2$s) will be cleared. - - OK - - Cancel - - Apps - - Shortcuts - Text input diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml index b49896c9b02..1dfdce88757 100644 --- a/res/xml/application_settings.xml +++ b/res/xml/application_settings.xml @@ -62,16 +62,5 @@ android:entries="@array/app_install_location_entries" android:entryValues="@array/app_install_location_values"/> - - diff --git a/res/xml/quick_launch_settings.xml b/res/xml/quick_launch_settings.xml deleted file mode 100644 index eb5585cfe0c..00000000000 --- a/res/xml/quick_launch_settings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 84bf6157bc6..d41c38778c5 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -97,7 +97,6 @@ public class Settings extends SettingsActivity { public static class NotificationAppListActivity extends SettingsActivity { /* empty */ } public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ } public static class OtherSoundSettingsActivity extends SettingsActivity { /* empty */ } - public static class QuickLaunchSettingsActivity extends SettingsActivity { /* empty */ } public static class TopLevelSettings extends SettingsActivity { /* empty */ } public static class ApnSettingsActivity extends SettingsActivity { /* empty */ } diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index dc5675c9090..415de5b2978 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -83,7 +83,6 @@ import com.android.settings.fuelgauge.BatterySaverSettings; import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.notification.NotificationAppList; import com.android.settings.notification.OtherSoundSettings; -import com.android.settings.quicklaunch.QuickLaunchSettings; import com.android.settings.search.DynamicIndexableContentMonitor; import com.android.settings.search.Index; import com.android.settings.inputmethod.InputMethodAndLanguageSettings; @@ -301,7 +300,6 @@ public class SettingsActivity extends Activity NotificationAppList.class.getName(), AppNotificationSettings.class.getName(), OtherSoundSettings.class.getName(), - QuickLaunchSettings.class.getName(), ApnSettings.class.getName() }; diff --git a/src/com/android/settings/quicklaunch/BookmarkPicker.java b/src/com/android/settings/quicklaunch/BookmarkPicker.java deleted file mode 100644 index 32594b6d3d0..00000000000 --- a/src/com/android/settings/quicklaunch/BookmarkPicker.java +++ /dev/null @@ -1,331 +0,0 @@ -/* - * Copyright (C) 2007 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. - */ - -package com.android.settings.quicklaunch; - -import com.android.settings.R; - -import android.app.ListActivity; -import android.content.Intent; -import android.content.pm.ActivityInfo; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.graphics.drawable.Drawable; -import android.os.Bundle; -import android.os.Handler; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.widget.ImageView; -import android.widget.ListView; -import android.widget.SimpleAdapter; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -/** - * Activity to pick a bookmark that will be returned to the caller. - *

- * Currently, bookmarks are either: - *

  • Activities that are in the launcher - *
  • Activities that are within an app that is capable of being launched with - * the {@link Intent#ACTION_CREATE_SHORTCUT}. - */ -public class BookmarkPicker extends ListActivity implements SimpleAdapter.ViewBinder { - - private static final String TAG = "BookmarkPicker"; - - /** Extra in the returned intent from this activity. */ - public static final String EXTRA_TITLE = "com.android.settings.quicklaunch.TITLE"; - - /** Extra that should be provided, and will be returned. */ - public static final String EXTRA_SHORTCUT = "com.android.settings.quicklaunch.SHORTCUT"; - - /** - * The request code for the screen to create a bookmark that is WITHIN an - * application. For example, Gmail can return a bookmark for the inbox - * folder. - */ - private static final int REQUEST_CREATE_SHORTCUT = 1; - - /** Intent used to get all the activities that are launch-able */ - private static Intent sLaunchIntent; - /** Intent used to get all the activities that are {@link #REQUEST_CREATE_SHORTCUT}-able */ - private static Intent sShortcutIntent; - - /** - * List of ResolveInfo for activities that we can bookmark (either directly - * to the activity, or by launching the activity and it returning a bookmark - * WITHIN that application). - */ - private List mResolveList; - - // List adapter stuff - private static final String KEY_TITLE = "TITLE"; - private static final String KEY_RESOLVE_INFO = "RESOLVE_INFO"; - private static final String sKeys[] = new String[] { KEY_TITLE, KEY_RESOLVE_INFO }; - private static final int sResourceIds[] = new int[] { R.id.title, R.id.icon }; - private SimpleAdapter mMyAdapter; - - /** Display those activities that are launch-able */ - private static final int DISPLAY_MODE_LAUNCH = 0; - /** Display those activities that are able to have bookmarks WITHIN the application */ - private static final int DISPLAY_MODE_SHORTCUT = 1; - private int mDisplayMode = DISPLAY_MODE_LAUNCH; - - private Handler mUiHandler = new Handler(); - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - updateListAndAdapter(); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - menu.add(0, DISPLAY_MODE_LAUNCH, 0, R.string.quick_launch_display_mode_applications) - .setIcon(com.android.internal.R.drawable.ic_menu_archive); - menu.add(0, DISPLAY_MODE_SHORTCUT, 0, R.string.quick_launch_display_mode_shortcuts) - .setIcon(com.android.internal.R.drawable.ic_menu_goto); - return true; - } - - @Override - public boolean onPrepareOptionsMenu(Menu menu) { - menu.findItem(DISPLAY_MODE_LAUNCH).setVisible(mDisplayMode != DISPLAY_MODE_LAUNCH); - menu.findItem(DISPLAY_MODE_SHORTCUT).setVisible(mDisplayMode != DISPLAY_MODE_SHORTCUT); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - - switch (item.getItemId()) { - - case DISPLAY_MODE_LAUNCH: - mDisplayMode = DISPLAY_MODE_LAUNCH; - break; - - case DISPLAY_MODE_SHORTCUT: - mDisplayMode = DISPLAY_MODE_SHORTCUT; - break; - - default: - return false; - } - - updateListAndAdapter(); - return true; - } - - private void ensureIntents() { - if (sLaunchIntent == null) { - sLaunchIntent = new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER); - sShortcutIntent = new Intent(Intent.ACTION_CREATE_SHORTCUT); - } - } - - /** - * This should be called from the UI thread. - */ - private void updateListAndAdapter() { - // Get the activities in a separate thread - new Thread("data updater") { - @Override - public void run() { - synchronized (BookmarkPicker.this) { - /* - * Don't touch any of the lists that are being used by the - * adapter in this thread! - */ - ArrayList newResolveList = new ArrayList(); - ArrayList> newAdapterList = new ArrayList>(); - - fillResolveList(newResolveList); - Collections.sort(newResolveList, - new ResolveInfo.DisplayNameComparator(getPackageManager())); - - fillAdapterList(newAdapterList, newResolveList); - - updateAdapterToUseNewLists(newAdapterList, newResolveList); - } - } - }.start(); - } - - private void updateAdapterToUseNewLists(final ArrayList> newAdapterList, - final ArrayList newResolveList) { - // Post this back on the UI thread - mUiHandler.post(new Runnable() { - public void run() { - /* - * SimpleAdapter does not support changing the lists after it - * has been created. We just create a new instance. - */ - mMyAdapter = createResolveAdapter(newAdapterList); - mResolveList = newResolveList; - setListAdapter(mMyAdapter); - } - }); - } - - /** - * Gets all activities matching our current display mode. - * - * @param list The list to fill. - */ - private void fillResolveList(List list) { - ensureIntents(); - PackageManager pm = getPackageManager(); - list.clear(); - - if (mDisplayMode == DISPLAY_MODE_LAUNCH) { - list.addAll(pm.queryIntentActivities(sLaunchIntent, 0)); - } else if (mDisplayMode == DISPLAY_MODE_SHORTCUT) { - list.addAll(pm.queryIntentActivities(sShortcutIntent, 0)); - } - } - - private SimpleAdapter createResolveAdapter(List> list) { - SimpleAdapter adapter = new SimpleAdapter(this, list, - R.layout.bookmark_picker_item, sKeys, sResourceIds); - adapter.setViewBinder(this); - return adapter; - } - - private void fillAdapterList(List> list, - List resolveList) { - list.clear(); - int resolveListSize = resolveList.size(); - for (int i = 0; i < resolveListSize; i++) { - ResolveInfo info = resolveList.get(i); - /* - * Simple adapter craziness. For each item, we need to create a map - * from a key to its value (the value can be any object--the view - * binder will take care of filling the View with a representation - * of that object). - */ - Map map = new TreeMap(); - map.put(KEY_TITLE, getResolveInfoTitle(info)); - map.put(KEY_RESOLVE_INFO, info); - list.add(map); - } - } - - /** Get the title for a resolve info. */ - private String getResolveInfoTitle(ResolveInfo info) { - CharSequence label = info.loadLabel(getPackageManager()); - if (label == null) label = info.activityInfo.name; - return label != null ? label.toString() : null; - } - - @Override - protected void onListItemClick(ListView l, View v, int position, long id) { - if (position >= mResolveList.size()) return; - - ResolveInfo info = mResolveList.get(position); - - switch (mDisplayMode) { - - case DISPLAY_MODE_LAUNCH: - // We can go ahead and return the clicked info's intent - Intent intent = getIntentForResolveInfo(info, Intent.ACTION_MAIN); - intent.addCategory(Intent.CATEGORY_LAUNCHER); - finish(intent, getResolveInfoTitle(info)); - break; - - case DISPLAY_MODE_SHORTCUT: - // Start the shortcut activity so the user can pick the actual intent - // (example: Gmail's shortcut activity shows a list of mailboxes) - startShortcutActivity(info); - break; - } - - } - - private static Intent getIntentForResolveInfo(ResolveInfo info, String action) { - Intent intent = new Intent(action); - ActivityInfo ai = info.activityInfo; - intent.setClassName(ai.packageName, ai.name); - return intent; - } - - /** - * Starts an activity to get a shortcut. - *

    - * For example, Gmail has an activity that lists the available labels. It - * returns a shortcut intent for going directly to this label. - */ - private void startShortcutActivity(ResolveInfo info) { - Intent intent = getIntentForResolveInfo(info, Intent.ACTION_CREATE_SHORTCUT); - startActivityForResult(intent, REQUEST_CREATE_SHORTCUT); - - // Will get a callback to onActivityResult - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - if (resultCode != RESULT_OK) { - return; - } - - switch (requestCode) { - - case REQUEST_CREATE_SHORTCUT: - if (data != null) { - finish((Intent) data.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT), - data.getStringExtra(Intent.EXTRA_SHORTCUT_NAME)); - } - break; - - default: - super.onActivityResult(requestCode, resultCode, data); - break; - } - } - - /** - * Finishes the activity and returns the given data. - */ - private void finish(Intent intent, String title) { - // Give back what was given to us (it will have the shortcut, for example) - intent.putExtras(getIntent()); - // Put our information - intent.putExtra(EXTRA_TITLE, title); - setResult(RESULT_OK, intent); - finish(); - } - - /** - * {@inheritDoc} - */ - public boolean setViewValue(View view, Object data, String textRepresentation) { - if (view.getId() == R.id.icon) { - Drawable icon = ((ResolveInfo) data).loadIcon(getPackageManager()); - if (icon != null) { - ((ImageView) view).setImageDrawable(icon); - } - return true; - } else { - return false; - } - } - -} diff --git a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java deleted file mode 100644 index 13670180fa4..00000000000 --- a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java +++ /dev/null @@ -1,370 +0,0 @@ -/* - * Copyright (C) 2008 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. - */ - -package com.android.settings.quicklaunch; - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.database.ContentObserver; -import android.database.Cursor; -import android.os.Bundle; -import android.os.Handler; -import android.preference.Preference; -import android.preference.PreferenceGroup; -import android.preference.PreferenceScreen; -import android.provider.Settings.Bookmarks; -import android.util.Log; -import android.util.SparseArray; -import android.util.SparseBooleanArray; -import android.view.KeyCharacterMap; -import android.view.KeyEvent; -import android.view.View; -import android.widget.AdapterView; - -import com.android.settings.R; -import com.android.settings.SettingsPreferenceFragment; - -import java.net.URISyntaxException; - -/** - * Settings activity for quick launch. - *

    - * Shows a list of possible shortcuts, the current application each is bound to, - * and allows choosing a new bookmark for a shortcut. - */ -public class QuickLaunchSettings extends SettingsPreferenceFragment implements - AdapterView.OnItemLongClickListener, DialogInterface.OnClickListener { - - private static final String TAG = "QuickLaunchSettings"; - - private static final String KEY_SHORTCUT_CATEGORY = "shortcut_category"; - - private static final int DIALOG_CLEAR_SHORTCUT = 0; - - private static final int REQUEST_PICK_BOOKMARK = 1; - - private static final int COLUMN_SHORTCUT = 0; - private static final int COLUMN_TITLE = 1; - private static final int COLUMN_INTENT = 2; - private static final String[] sProjection = new String[] { - Bookmarks.SHORTCUT, Bookmarks.TITLE, Bookmarks.INTENT - }; - private static final String sShortcutSelection = Bookmarks.SHORTCUT + "=?"; - - private Handler mUiHandler = new Handler(); - - private static final String DEFAULT_BOOKMARK_FOLDER = "@quicklaunch"; - /** Cursor for Bookmarks provider. */ - private Cursor mBookmarksCursor; - /** Listens for changes to Bookmarks provider. */ - private BookmarksObserver mBookmarksObserver; - /** Used to keep track of which shortcuts have bookmarks. */ - private SparseBooleanArray mBookmarkedShortcuts; - - /** Preference category to hold the shortcut preferences. */ - private PreferenceGroup mShortcutGroup; - /** Mapping of a shortcut to its preference. */ - private SparseArray mShortcutToPreference; - - /** The bookmark title of the shortcut that is being cleared. */ - private CharSequence mClearDialogBookmarkTitle; - private static final String CLEAR_DIALOG_BOOKMARK_TITLE = "CLEAR_DIALOG_BOOKMARK_TITLE"; - /** The shortcut that is being cleared. */ - private char mClearDialogShortcut; - private static final String CLEAR_DIALOG_SHORTCUT = "CLEAR_DIALOG_SHORTCUT"; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - addPreferencesFromResource(R.xml.quick_launch_settings); - - mShortcutGroup = (PreferenceGroup) findPreference(KEY_SHORTCUT_CATEGORY); - mShortcutToPreference = new SparseArray(); - mBookmarksObserver = new BookmarksObserver(mUiHandler); - initShortcutPreferences(); - mBookmarksCursor = getActivity().getContentResolver().query(Bookmarks.CONTENT_URI, - sProjection, null, null, null); - } - - @Override - public void onResume() { - super.onResume(); - mBookmarksCursor = getActivity().getContentResolver().query(Bookmarks.CONTENT_URI, - sProjection, null, null, null); - getContentResolver().registerContentObserver(Bookmarks.CONTENT_URI, true, - mBookmarksObserver); - refreshShortcuts(); - } - - @Override - public void onPause() { - super.onPause(); - getContentResolver().unregisterContentObserver(mBookmarksObserver); - } - - @Override - public void onStop() { - super.onStop(); - mBookmarksCursor.close(); - } - - @Override - public void onActivityCreated(Bundle state) { - super.onActivityCreated(state); - - getListView().setOnItemLongClickListener(this); - - if (state != null) { - // Restore the clear dialog's info - mClearDialogBookmarkTitle = state.getString(CLEAR_DIALOG_BOOKMARK_TITLE); - mClearDialogShortcut = (char) state.getInt(CLEAR_DIALOG_SHORTCUT, 0); - } - } - - @Override - public void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - - // Save the clear dialog's info - outState.putCharSequence(CLEAR_DIALOG_BOOKMARK_TITLE, mClearDialogBookmarkTitle); - outState.putInt(CLEAR_DIALOG_SHORTCUT, mClearDialogShortcut); - } - - @Override - public Dialog onCreateDialog(int id) { - switch (id) { - - case DIALOG_CLEAR_SHORTCUT: { - // Create the dialog for clearing a shortcut - return new AlertDialog.Builder(getActivity()) - .setTitle(getString(R.string.quick_launch_clear_dialog_title)) - .setMessage(getString(R.string.quick_launch_clear_dialog_message, - mClearDialogShortcut, mClearDialogBookmarkTitle)) - .setPositiveButton(R.string.quick_launch_clear_ok_button, this) - .setNegativeButton(R.string.quick_launch_clear_cancel_button, this) - .create(); - } - } - - return super.onCreateDialog(id); - } - - private void showClearDialog(ShortcutPreference pref) { - - if (!pref.hasBookmark()) return; - - mClearDialogBookmarkTitle = pref.getTitle(); - mClearDialogShortcut = pref.getShortcut(); - showDialog(DIALOG_CLEAR_SHORTCUT); - } - - public void onClick(DialogInterface dialog, int which) { - if (mClearDialogShortcut > 0 && which == AlertDialog.BUTTON_POSITIVE) { - // Clear the shortcut - clearShortcut(mClearDialogShortcut); - } - mClearDialogBookmarkTitle = null; - mClearDialogShortcut = 0; - } - - private void clearShortcut(char shortcut) { - getContentResolver().delete(Bookmarks.CONTENT_URI, sShortcutSelection, - new String[] { String.valueOf((int) shortcut) }); - } - - @Override - public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { - if (!(preference instanceof ShortcutPreference)) return false; - - // Open the screen to pick a bookmark for this shortcut - ShortcutPreference pref = (ShortcutPreference) preference; - Intent intent = new Intent(getActivity(), BookmarkPicker.class); - intent.putExtra(BookmarkPicker.EXTRA_SHORTCUT, pref.getShortcut()); - startActivityForResult(intent, REQUEST_PICK_BOOKMARK); - - return true; - } - - public boolean onItemLongClick(AdapterView parent, View view, int position, long id) { - - // Open the clear shortcut dialog - Preference pref = (Preference) getPreferenceScreen().getRootAdapter().getItem(position); - if (!(pref instanceof ShortcutPreference)) return false; - showClearDialog((ShortcutPreference) pref); - return true; - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (resultCode != Activity.RESULT_OK) { - return; - } - - if (requestCode == REQUEST_PICK_BOOKMARK) { - - // Returned from the 'pick bookmark for this shortcut' screen - if (data == null) { - Log.w(TAG, "Result from bookmark picker does not have an intent."); - return; - } - - char shortcut = data.getCharExtra(BookmarkPicker.EXTRA_SHORTCUT, (char) 0); - updateShortcut(shortcut, data); - - } else { - super.onActivityResult(requestCode, resultCode, data); - } - } - - private void updateShortcut(char shortcut, Intent intent) { - // Update the bookmark for a shortcut - // Pass an empty title so it gets resolved each time this bookmark is - // displayed (since the locale could change after we insert into the provider). - Bookmarks.add(getContentResolver(), intent, "", DEFAULT_BOOKMARK_FOLDER, shortcut, 0); - } - - private ShortcutPreference getOrCreatePreference(char shortcut) { - ShortcutPreference pref = mShortcutToPreference.get(shortcut); - if (pref != null) { - return pref; - } else { - Log.w(TAG, "Unknown shortcut '" + shortcut + "', creating preference anyway"); - return createPreference(shortcut); - } - } - - private ShortcutPreference createPreference(char shortcut) { - ShortcutPreference pref = new ShortcutPreference(getActivity(), shortcut); - mShortcutGroup.addPreference(pref); - mShortcutToPreference.put(shortcut, pref); - return pref; - } - - private void initShortcutPreferences() { - - /** Whether the shortcut has been seen already. The array index is the shortcut. */ - SparseBooleanArray shortcutSeen = new SparseBooleanArray(); - KeyCharacterMap keyMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD); - - // Go through all the key codes and create a preference for the appropriate keys - for (int keyCode = KeyEvent.getMaxKeyCode() - 1; keyCode >= 0; keyCode--) { - // Get the label for the primary char on the key that produces this key code - char shortcut = (char) Character.toLowerCase(keyMap.getDisplayLabel(keyCode)); - if (shortcut == 0 || shortcutSeen.get(shortcut, false)) continue; - // TODO: need a to tell if the current keyboard can produce this key code, for now - // only allow the letter or digits - if (!Character.isLetterOrDigit(shortcut)) continue; - shortcutSeen.put(shortcut, true); - - createPreference(shortcut); - } - } - - private synchronized void refreshShortcuts() { - Cursor c = mBookmarksCursor; - if (c == null) { - // Haven't finished querying yet - return; - } - - if (!c.requery()) { - Log.e(TAG, "Could not requery cursor when refreshing shortcuts."); - return; - } - - /** - * We use the previous bookmarked shortcuts array to filter out those - * shortcuts that had bookmarks before this method call, and don't after - * (so we can set the preferences to be without bookmarks). - */ - SparseBooleanArray noLongerBookmarkedShortcuts = mBookmarkedShortcuts; - SparseBooleanArray newBookmarkedShortcuts = new SparseBooleanArray(); - while (c.moveToNext()) { - char shortcut = Character.toLowerCase((char) c.getInt(COLUMN_SHORTCUT)); - if (shortcut == 0) continue; - - ShortcutPreference pref = getOrCreatePreference(shortcut); - CharSequence title = Bookmarks.getTitle(getActivity(), c); - - /* - * The title retrieved from Bookmarks.getTitle() will be in - * the original boot locale, not the current locale. - * Try to look up a localized title from the PackageManager. - */ - int intentColumn = c.getColumnIndex(Bookmarks.INTENT); - String intentUri = c.getString(intentColumn); - PackageManager packageManager = getPackageManager(); - try { - Intent intent = Intent.parseUri(intentUri, 0); - ResolveInfo info = packageManager.resolveActivity(intent, 0); - if (info != null) { - title = info.loadLabel(packageManager); - } - } catch (URISyntaxException e) { - // Just use the non-localized title, then. - } - - pref.setTitle(title); - pref.setSummary(getString(R.string.quick_launch_shortcut, - String.valueOf(shortcut))); - pref.setHasBookmark(true); - - newBookmarkedShortcuts.put(shortcut, true); - if (noLongerBookmarkedShortcuts != null) { - // After this loop, the shortcuts with value true in this array - // will no longer have bookmarks - noLongerBookmarkedShortcuts.put(shortcut, false); - } - } - - if (noLongerBookmarkedShortcuts != null) { - for (int i = noLongerBookmarkedShortcuts.size() - 1; i >= 0; i--) { - if (noLongerBookmarkedShortcuts.valueAt(i)) { - // True, so there is no longer a bookmark for this shortcut - char shortcut = (char) noLongerBookmarkedShortcuts.keyAt(i); - ShortcutPreference pref = mShortcutToPreference.get(shortcut); - if (pref != null) { - pref.setHasBookmark(false); - } - } - } - } - - mBookmarkedShortcuts = newBookmarkedShortcuts; - - c.deactivate(); - } - - private class BookmarksObserver extends ContentObserver { - - public BookmarksObserver(Handler handler) { - super(handler); - } - - @Override - public void onChange(boolean selfChange) { - super.onChange(selfChange); - - refreshShortcuts(); - } - } -} diff --git a/src/com/android/settings/quicklaunch/ShortcutPreference.java b/src/com/android/settings/quicklaunch/ShortcutPreference.java deleted file mode 100644 index 92efdeb0db2..00000000000 --- a/src/com/android/settings/quicklaunch/ShortcutPreference.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright (C) 2007 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. - */ - -package com.android.settings.quicklaunch; - -import com.android.settings.R; - -import android.content.Context; -import android.content.res.ColorStateList; -import android.preference.Preference; -import android.util.TypedValue; -import android.view.View; -import android.widget.TextView; - -/** - * Preference type for a shortcut in {@link QuickLaunchSettings}. - */ -public class ShortcutPreference extends Preference implements Comparable { - - private static Object sStaticVarsLock = new Object(); - - // These static fields are used across all instances of ShortcutPreference. - // There will be many ShortcutPreference instances (~36 for US). - private static String STRING_ASSIGN_APPLICATION; - private static String STRING_NO_SHORTCUT; - - private static int sDimAlpha; - private static ColorStateList sRegularTitleColor; - private static ColorStateList sDimTitleColor; - private static ColorStateList sRegularSummaryColor; - private static ColorStateList sDimSummaryColor; - - private char mShortcut; - private boolean mHasBookmark; - - public ShortcutPreference(Context context, char shortcut) { - super(context); - - synchronized (sStaticVarsLock) { - // Init statics. This should only happen for the first ShortcutPreference created, - // the rest will already have them initialized. - if (STRING_ASSIGN_APPLICATION == null) { - STRING_ASSIGN_APPLICATION = context.getString(R.string.quick_launch_assign_application); - STRING_NO_SHORTCUT = context.getString(R.string.quick_launch_no_shortcut); - - TypedValue outValue = new TypedValue(); - context.getTheme().resolveAttribute(android.R.attr.disabledAlpha, outValue, true); - sDimAlpha = (int) (outValue.getFloat() * 255); - } - } - - mShortcut = shortcut; - - setWidgetLayoutResource(R.layout.preference_widget_shortcut); - } - - public char getShortcut() { - return mShortcut; - } - - public void setShortcut(char shortcut) { - if (shortcut != mShortcut) { - mShortcut = shortcut; - notifyChanged(); - } - } - - public boolean hasBookmark() { - return mHasBookmark; - } - - public void setHasBookmark(boolean hasBookmark) { - if (hasBookmark != mHasBookmark) { - mHasBookmark = hasBookmark; - notifyChanged(); - } - } - - @Override - public CharSequence getTitle() { - return mHasBookmark ? super.getTitle() : STRING_ASSIGN_APPLICATION; - } - - @Override - public CharSequence getSummary() { - return mHasBookmark ? super.getSummary() : STRING_NO_SHORTCUT; - } - - @Override - protected void onBindView(View view) { - super.onBindView(view); - - TextView shortcutView = (TextView) view.findViewById(R.id.shortcut); - if (shortcutView != null) { - shortcutView.setText(String.valueOf(mShortcut)); - } - - TextView titleView = (TextView) view.findViewById(android.R.id.title); - - synchronized (sStaticVarsLock) { - if (sRegularTitleColor == null) { - sRegularTitleColor = titleView.getTextColors(); - sDimTitleColor = sRegularTitleColor.withAlpha(sDimAlpha); - } - } - - ColorStateList color = mHasBookmark ? sRegularTitleColor : sDimTitleColor; - if (color != null) { - titleView.setTextColor(color); - } - - TextView summaryView = (TextView) view.findViewById(android.R.id.summary); - - synchronized (sStaticVarsLock) { - if (sRegularSummaryColor == null) { - sRegularSummaryColor = summaryView.getTextColors(); - sDimSummaryColor = sRegularSummaryColor.withAlpha(sDimAlpha); - } - } - - color = mHasBookmark ? sRegularSummaryColor : sDimSummaryColor; - if (color != null) { - summaryView.setTextColor(color); - } - - } - - public int compareTo(Preference another) { - if (!(another instanceof ShortcutPreference)) return super.compareTo(another); - - // Letters before digits - char other = ((ShortcutPreference) another).mShortcut; - if (Character.isDigit(mShortcut) && Character.isLetter(other)) return 1; - else if (Character.isDigit(other) && Character.isLetter(mShortcut)) return -1; - else return mShortcut - other; - } - -}