From 8f0f19c41472ec4918987cd0292d63811a6260ae Mon Sep 17 00:00:00 2001 From: Paul Westbrook Date: Wed, 10 Sep 2014 01:55:20 -0700 Subject: [PATCH] Remove unused resources Also remove broken & disabled tests that referenced otherwise unused resources Change resource names to prevent duplicate resources. Bug: 17414014 Change-Id: Iea9f9799ec19692707e2949473c6f97a3bd29f4b --- AndroidManifest.xml | 6 +- res/values-af/strings.xml | 2 +- res/values-am/strings.xml | 2 +- res/values-ar/strings.xml | 2 +- res/values-bg/strings.xml | 2 +- res/values-bn-rBD/strings.xml | 2 +- res/values-ca/strings.xml | 2 +- res/values-cs/strings.xml | 2 +- res/values-da/strings.xml | 2 +- res/values-de/strings.xml | 2 +- res/values-el/strings.xml | 2 +- res/values-en-rGB/strings.xml | 2 +- res/values-en-rIN/strings.xml | 2 +- res/values-es-rUS/strings.xml | 2 +- res/values-es/strings.xml | 2 +- res/values-et-rEE/strings.xml | 2 +- res/values-eu-rES/strings.xml | 2 +- res/values-fa/strings.xml | 2 +- res/values-fi/strings.xml | 2 +- res/values-fr-rCA/strings.xml | 2 +- res/values-fr/strings.xml | 2 +- res/values-gl-rES/strings.xml | 2 +- res/values-hu/strings.xml | 2 +- res/values-hy-rAM/strings.xml | 2 +- res/values-in/strings.xml | 2 +- res/values-is-rIS/strings.xml | 2 +- res/values-it/strings.xml | 2 +- res/values-iw/strings.xml | 2 +- res/values-ja/strings.xml | 2 +- res/values-ka-rGE/strings.xml | 2 +- res/values-kk-rKZ/strings.xml | 2 +- res/values-kn-rIN/strings.xml | 2 +- res/values-ko/strings.xml | 2 +- res/values-lo-rLA/strings.xml | 2 +- res/values-lt/strings.xml | 2 +- res/values-lv/strings.xml | 2 +- res/values-mk-rMK/strings.xml | 2 +- res/values-ml-rIN/strings.xml | 2 +- res/values-mn-rMN/strings.xml | 2 +- res/values-mr-rIN/strings.xml | 2 +- res/values-ms-rMY/strings.xml | 2 +- res/values-my-rMM/strings.xml | 2 +- res/values-nb/strings.xml | 2 +- res/values-ne-rNP/strings.xml | 2 +- res/values-nl/strings.xml | 2 +- res/values-pl/strings.xml | 2 +- res/values-pt-rPT/strings.xml | 2 +- res/values-pt/strings.xml | 2 +- res/values-rm/strings.xml | 2 +- res/values-ro/strings.xml | 2 +- res/values-ru/strings.xml | 2 +- res/values-si-rLK/strings.xml | 2 +- res/values-sk/strings.xml | 2 +- res/values-sl/strings.xml | 2 +- res/values-sr/strings.xml | 2 +- res/values-sv/strings.xml | 2 +- res/values-sw/strings.xml | 2 +- res/values-ta-rIN/strings.xml | 2 +- res/values-te-rIN/strings.xml | 2 +- res/values-th/strings.xml | 2 +- res/values-tl/strings.xml | 2 +- res/values-tr/strings.xml | 2 +- res/values-uk/strings.xml | 2 +- res/values-ur-rPK/strings.xml | 2 +- res/values-uz-rUZ/strings.xml | 2 +- res/values-vi/strings.xml | 2 +- res/values-zh-rCN/strings.xml | 2 +- res/values-zh-rHK/strings.xml | 2 +- res/values-zh-rTW/strings.xml | 2 +- res/values-zu/strings.xml | 2 +- res/values/strings.xml | 141 +----------------- res/xml/account_settings_preferences.xml | 2 +- .../android/email/activity/UiUtilities.java | 46 ------ .../email/activity/UiUtilitiesTests.java | 118 --------------- 74 files changed, 75 insertions(+), 376 deletions(-) delete mode 100644 tests/src/com/android/email/activity/UiUtilitiesTests.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8414c9215..3ac586962 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -276,7 +276,7 @@ @@ -291,7 +291,7 @@ @@ -326,7 +326,7 @@ diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 7c7cc1680..6109ee82e 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -248,7 +248,7 @@ "Sinkroniseer kalendergebeurtenis uit hierdie rekening" "Sinkroniseer e-pos" "Sinkroniseer e-pos vir hierdie rekening" - "Vibreer" + "Vibreer" "Kies \'n luitoon" "Bedienerinstellings" "Sinkroniseeropsies" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index a2cbb1abf..a7340bb66 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -248,7 +248,7 @@ "ለእዚህ መለያ የቀን መቁጠሪያ ክስተት አስምር" "ኢሜይል አስምር" "ለእዚህ መለያ ኢሜይል አስምር" - "ንዘር" + "ንዘር" "የደወል ቅላጼ ምረጥ" "የአገልጋይ ቅንብሮች" "አስምር አማራጮች" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 0d8cdc9b3..1ea62d33f 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -248,7 +248,7 @@ "مزامنة حدث التقويم لهذا الحساب" "مزامنة البريد الإلكتروني" "مزامنة البريد الإلكتروني لهذا الحساب" - "اهتزاز" + "اهتزاز" "اختيار نغمة الرنين" "إعدادات الخادم" "خيارات المزامنة" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 0e6602fc2..ca665ad68 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -248,7 +248,7 @@ "Синхр. на календарно събитие за профила" "Синхрон на имейлите" "Синхрон на имейлите за този профил" - "Вибриране" + "Вибриране" "Избор на мелодия" "Настройки на сървъра" "Опции за синхронизиране" diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index 2d7c8ba5f..f53495691 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -248,7 +248,7 @@ "এই অ্যাকাউন্টের জন্য ক্যালেন্ডার ইভেন্ট সিঙ্ক" "ইমেল সিঙ্ক করুন" "এই অ্যাকাউন্টের জন্য ইমেল সিঙ্ক" - "কম্পন" + "কম্পন" "রিংটোন চয়ন করুন" "সার্ভার সেটিংস" "সিঙ্কের বিকল্পগুলি" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 0be5f808c..173c4262c 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -248,7 +248,7 @@ "Sincronitza els esdeveniments del calendari del compte" "Sincronitza el correu electrònic" "Sincronitza el correu del compte" - "Vibra" + "Vibra" "Tria un so" "Configuració del servidor" "Opcions de sincronització" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index b53371987..92a10b493 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -248,7 +248,7 @@ "Synchronizovat události kalendáře pro tento účet" "Synchronizovat e-maily" "Synchronizovat e-maily pro tento účet" - "Vibrace" + "Vibrace" "Vybrat vyzvánění" "Nastavení serveru" "Možnosti synchronizace" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index cc5eb3f42..7ab7b68e1 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -248,7 +248,7 @@ "Synkroniser begivenhed for konto" "Synkroniser e-mails" "Synkroniser e-mail for denne konto" - "Vibration" + "Vibration" "Vælg ringetone" "Serverindstillinger" "Indstillinger for synkronisering" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 3448e89c3..9a843656a 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -248,7 +248,7 @@ "Termin für dieses Kontos synchronisieren" "E-Mails synchronisieren" "E-Mails dieses Kontos synchronisieren" - "Vibration" + "Vibration" "Klingelton auswählen" "Servereinstellungen" "Synchronisierungsoptionen" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 64a499982..f321e4a7f 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -248,7 +248,7 @@ "Συγχρον. συμβ. ημερολ. λογαριασμού" "Συγχρονισμός ηλεκτρονικού ταχυδρομείου" "Συγχρονισμός μηνυμάτων ηλεκτρονικού ταχυδρομείου για αυτόν τον λογαριασμό" - "Δόνηση" + "Δόνηση" "Επιλέξτε ήχο κλήσης" "Ρυθμίσεις διακομιστή" "Επιλογές συγχρονισμού" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index a4c4d99bb..f400b6b78 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -248,7 +248,7 @@ "Sync calendar event for this account" "Sync Email" "Sync email for this account" - "Vibrate" + "Vibrate" "Choose ringtone" "Server settings" "Sync options" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index a4c4d99bb..f400b6b78 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -248,7 +248,7 @@ "Sync calendar event for this account" "Sync Email" "Sync email for this account" - "Vibrate" + "Vibrate" "Choose ringtone" "Server settings" "Sync options" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 9bdac8ef4..400993f53 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -248,7 +248,7 @@ "Sincronizar evento de calendario de esta cuenta" "Sincronizar correo" "Sincronizar el correo de esta cuenta" - "Vibrar" + "Vibrar" "Seleccionar tono" "Configuración del servidor" "Opciones de sincronización" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index f284555d5..568326ec8 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -248,7 +248,7 @@ "Sincronizar eventos de calendario para esta cuenta" "Sincronizar correo" "Sincronizar correo de esta cuenta" - "Vibrar" + "Vibrar" "Seleccionar tono" "Ajustes del servidor" "Ajustes de sincronización" diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 43f6e6ac4..c7b8451df 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -248,7 +248,7 @@ "Sünkrooni konto kalendri sündmused" "Sünkrooni meil" "Konto meili sünkroonimine" - "Vibreering" + "Vibreering" "Vali helin" "Serveri seaded" "Sünkroonimisvalikud" diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml index cc679791a..c49207c2c 100644 --- a/res/values-eu-rES/strings.xml +++ b/res/values-eu-rES/strings.xml @@ -248,7 +248,7 @@ "Sinkronizatu kontu honen egutegiko gertaerak" "Sinkronizatu posta" "Sinkronizatu kontu honen posta" - "Egin dar-dar" + "Egin dar-dar" "Aukeratu tonua" "Zerbitzariaren ezarpenak" "Sinkronizazio-aukerak" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 909a1b894..5fcea1fbb 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -248,7 +248,7 @@ "همگام‌‌سازی رویداد تقویم برای این حساب" "همگام‌سازی ایمیل" "همگام‌سازی ایمیل برای این حساب" - "لرزش" + "لرزش" "انتخاب آهنگ زنگ" "تنظیمات سرور" "گزینه‌های همگام‌سازی" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 53b30be51..3bfe23898 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -248,7 +248,7 @@ "Synkronoi tilin kalenteritapahtuma" "Synkronoi sähköposti" "Synkronoi tämän tilin sähköpostit" - "Värinä" + "Värinä" "Valitse soittoääni" "Palvelinasetukset" "Synkronointiasetukset" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index ab3f2baf9..10a26bd9c 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -248,7 +248,7 @@ "Synchro événement agenda pour ce compte" "Synchr. messagerie" "Synchroniser les courriels pour ce compte" - "Vibreur" + "Vibreur" "Sélectionner une sonnerie" "Paramètres du serveur" "Options de synchronisation" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 1e024df78..f65c48089 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -248,7 +248,7 @@ "Synchro événement agenda pour ce compte" "Synchr. messagerie" "Synchroniser les e-mails pour ce compte" - "Vibreur" + "Vibreur" "Sélectionner une sonnerie" "Paramètres du serveur" "Options de synchronisation" diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml index e1c13a5ef..727859722 100644 --- a/res/values-gl-rES/strings.xml +++ b/res/values-gl-rES/strings.xml @@ -248,7 +248,7 @@ "Sincroniza o evento do calendario para esta conta" "Sincronizar correo" "Sincroniza correo para esta conta" - "Vibrar" + "Vibrar" "Seleccionar ton de chamada" "Configuración do servidor" "Opcións de sincronización" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index dccb2677e..f9d116930 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -248,7 +248,7 @@ "A fiók naptárának szinkronizálása" "E-mail szinkroniz." "A fiók e-mailjeinek szinkronizálása" - "Rezgés" + "Rezgés" "Válasszon csengőhangot" "Szerverbeállítások" "Szinkronizálási beállítások" diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 617a3d9ff..a0f73ac1d 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -250,7 +250,7 @@ "Համաժամեցնել օրացուցային իրադարձությունը այս հաշվում" "Համաժամեցնել էլփոստը" "Համաժամեցնել Էլփոստը այս հաշվում" - "Թրթռալ" + "Թրթռալ" "Ընտրեք զանգերանգը" "Սերվերի կարգավորումներ" "Համաժամեցման ընտրանքներ" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 546f656e5..d2ed0c1ae 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -248,7 +248,7 @@ "Sinkronkan acara kalender akun ini" "Sinkronkan email" "Sinkronkan email untuk akun ini" - "Getar" + "Getar" "Pilih nada dering" "Setelan server" "Opsi sinkronisasi" diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml index 6c20503e2..565f6434a 100644 --- a/res/values-is-rIS/strings.xml +++ b/res/values-is-rIS/strings.xml @@ -248,7 +248,7 @@ "Samstilla dagatalsviðburði þessa reiknings" "Samstilla tölvupóst" "Samstilla tölvupóst þessa reiknings" - "Titringur" + "Titringur" "Velja hringitón" "Stillingar þjóns" "Samstillingarkostir" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 1a94f2ff4..9ede49f51 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -248,7 +248,7 @@ "Sincron. evento calendario account" "Sincronizza email" "Sincronizza le email per questo account" - "Vibrazione" + "Vibrazione" "Scegli suoneria" "Impostazioni server" "Opzioni di sincronizzazione" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 1ccacb75f..5982add71 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -248,7 +248,7 @@ "סינכרון אירוע לוח שנה עבור חשבון זה" "סנכרן דוא\"ל" "סנכרן דוא\"ל בחשבון זה" - "רטט" + "רטט" "בחר רינגטון" "הגדרות שרת" "אפשרויות סינכרון" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index a80d5575f..aeb2396d8 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -248,7 +248,7 @@ "このアカウントのカレンダーの予定を同期" "メールを同期する" "このアカウントのメールを同期" - "バイブレーション" + "バイブレーション" "着信音を選択" "サーバー設定" "同期オプション" diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 04802f015..6e2ef4492 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -248,7 +248,7 @@ "ამ ანგარიშისთვის კალენდრის ღონისძიების სინქრონიზაცია" "ელფოსტის სინქრონიზაცია" "ანგარიშის ელფოსტის სინქრონიზაცია" - "ვიბრაცია" + "ვიბრაცია" "ზარის მელოდიის არჩევა" "სერვერის პარამეტრები" "სინქრონიზაციის პარამეტრები" diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml index 2fc90dbd1..4f8d7dee5 100644 --- a/res/values-kk-rKZ/strings.xml +++ b/res/values-kk-rKZ/strings.xml @@ -248,7 +248,7 @@ "Осы есептік жазба үшін күнтізбе оқиғасын синхрондау" "Эл.поштаны синх-у" "Осы ес. жазба үшін эл. поштаны синх-у" - "Дірілдеу" + "Дірілдеу" "Рингтон таңдау" "Сервер параметрлері" "Синхрондау опциялары" diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml index 2d645c0fd..3a034b62a 100644 --- a/res/values-kn-rIN/strings.xml +++ b/res/values-kn-rIN/strings.xml @@ -248,7 +248,7 @@ "ಈ ಖಾತೆಗಾಗಿ ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್ ಅನ್ನು ಸಿಂಕ್ ಮಾಡು" "ಇಮೇಲ್ ಸಿಂಕ್ ಮಾಡಿ" "ಈ ಖಾತೆಗಾಗಿ ಇಮೇಲ್ ಅನ್ನು ಸಿಂಕ್ ಮಾಡಿ" - "ವೈಬ್ರೇಟ್‌" + "ವೈಬ್ರೇಟ್‌" "ರಿಂಗ್‍ಟೋನ್ ಆಯ್ಕೆ ಮಾಡಿ" "ಸರ್ವರ್ ಸೆಟ್ಟಿಂಗ್‍ಗಳು" "ಸಿಂಕ್‌ ಆಯ್ಕೆಗಳು" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 24ce03d71..4b05cba0d 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -248,7 +248,7 @@ "이 계정의 캘린더 일정을 동기화합니다." "이메일 동기화" "이 계정의 이메일을 동기화합니다." - "진동" + "진동" "벨소리 선택" "서버 설정" "동기화 옵션" diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index eedf98dad..80faad4c3 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -248,7 +248,7 @@ "ຊິ້ງ​ຂໍ້​ມູນ​ນັດ​ໝາຍ​ຂອງ​ປະ​ຕິ​ທິນ​ສຳ​ລັບ​ບັນ​ຊີ​ນີ້" "ຊິ້ງຂໍ້ມູນອີເມວ" "ຊິ້ງຂໍ້ມູນອີເມວຈາກບັນຊີນີ້" - "ສັ່ນເຕືອນ" + "ສັ່ນເຕືອນ" "ເລືອກສຽງຣິງໂທນ" "ການຕັ້ງຄ່າເຊີບເວີ" "ຕົວເລືອກການຊິ້ງຂໍ້ມູນ" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 73f34e49d..ddeff8f0a 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -248,7 +248,7 @@ "Sinchronizuoti šios paskyros kalendorių" "Sinchron. el. paštą" "Sinchron. šios paskyros el. paštą" - "Vibruoti" + "Vibruoti" "Pasirinkti skambėjimo toną" "Serverio nustatymai" "Sinchronizavimo parinktys" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index fc6e2219c..a830a21d8 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -248,7 +248,7 @@ "Sinhr. šī konta kalendāra notikumus" "Sinhronizēt e-pastu" "Sinhronizēt e-pastu šim kontam" - "Vibrozvans" + "Vibrozvans" "Izvēlēties zvana signālu" "Servera iestatījumi" "Sinhronizācijas opcijas" diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml index ce3cf06fc..cbfde4e7c 100644 --- a/res/values-mk-rMK/strings.xml +++ b/res/values-mk-rMK/strings.xml @@ -248,7 +248,7 @@ "Синхронизирај календарски настан за оваа сметка" "Синхронизирај е-пошта" "Синхронизирај е-пошта за оваа сметка" - "Вибрации" + "Вибрации" "Избери мелодија" "Поставки на сервер" "Опции за синхронизација" diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index 8cc7e770d..1321b71a3 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -248,7 +248,7 @@ "ഈ അക്കൗണ്ടിനായി കലണ്ടർ ഇവന്റ് സമന്വയിപ്പിക്കുക" "ഇമെയിൽ സമന്വയിപ്പിക്കുക" "ഈ അക്കൗണ്ടിനായി ഇമെയിൽ സമന്വയിപ്പിക്കുക" - "വൈബ്രേറ്റുചെയ്യുക" + "വൈബ്രേറ്റുചെയ്യുക" "റിംഗ്ടോൺ തിരഞ്ഞെടുക്കുക" "സെർവർ ക്രമീകരണങ്ങൾ" "സമന്വയ ഓപ്‌ഷനുകൾ" diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index b80dd83d3..2ca9a97ef 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -248,7 +248,7 @@ "Энэ акаунтын календарийн үйл явдлуудыг синк хийх" "Имэйлийг синк хийх" "Энэ акаунтын имэйлийг синк хийх" - "Чичиргэх" + "Чичиргэх" "Хонхны ая сонгох" "Серверийн тохиргоо" "Синк сонголтууд" diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml index c3581d971..e2999e0d3 100644 --- a/res/values-mr-rIN/strings.xml +++ b/res/values-mr-rIN/strings.xml @@ -248,7 +248,7 @@ "या खात्यासाठी कॅलेंडर इव्हेंट संकालित करा" "संकालन ईमेल" "या खात्यासाठी ईमेल संकालित करा" - "कंपन होणे" + "कंपन होणे" "रिंगटोन निवडा" "सर्व्हर सेटिंग्ज" "संकालन पर्याय" diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 04a15b28a..0e95b27d5 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -248,7 +248,7 @@ "Segerakkan acara kalendar untuk akaun ini" "Segerakkan e-mel" "Segerakkan e-mel untuk akaun ini" - "Getar" + "Getar" "Pilih nada dering" "Tetapan pelayan" "Pilihan segerak" diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml index 3fc0c5368..0b89772eb 100644 --- a/res/values-my-rMM/strings.xml +++ b/res/values-my-rMM/strings.xml @@ -249,7 +249,7 @@ "ဤ အကောင့်အတွက် ပြက္ခဒိန် ဖြစ်ရပ်ကို စင့်က်လုပ်ရန်" "အီးမေးလ် စင့်က်လုပ်" "ဒီအကောင့် အီးမေးလ်ကို စင့်က်လုပ်ရန်" - "တုန်ခါမှု" + "တုန်ခါမှု" "သံစဉ်ကို ရွေးချယ်ရန်" "ဆာဗာ ဆက်တင်များ" "စင့်က် ရွေးစရာများ" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 91197ee5a..2d1abb210 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -248,7 +248,7 @@ "Synkroniser kalenderaktivitet for denne kontoen" "Synkroniser e-post" "Synkr. e-poster for denne kontoen" - "Vibrer" + "Vibrer" "Velg ringetone" "Innstillinger for tjener" "Synkroniseringsalternativer" diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml index 9e54038d4..9e9128f77 100644 --- a/res/values-ne-rNP/strings.xml +++ b/res/values-ne-rNP/strings.xml @@ -248,7 +248,7 @@ "यस खाताको लागि क्यालेन्डर कार्यक्रम सिंक गर्नुहोस्" "सिङ्क इमेल" "यस खाताको लागि इमेल सिङ्क गर्नुहोस्" - "कम्पन गर्नुहोस्" + "कम्पन गर्नुहोस्" "रिङटोन छनौट गर्नुहोस्" "सर्भर सेटिङ्स" "सिङ्क विकल्पहरू" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index d7fde9126..d43877846 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -248,7 +248,7 @@ "Agenda-afspraak voor dit account synchroniseren" "E-mail synchroniseren" "E-mail voor dit account synchroniseren" - "Trillen" + "Trillen" "Beltoon kiezen" "Serverinstellingen" "Synchronisatieopties" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index b9e0e4d6a..c64dbd77b 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -248,7 +248,7 @@ "Synchronizuj kalendarz dla tego konta" "Synchronizuj e-maile" "Synchronizuj wiadomości e-mail dla tego konta" - "Wibracje" + "Wibracje" "Wybierz dzwonek" "Ustawienia serwera" "Opcje synchronizacji" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index b302539ca..c740191a9 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -248,7 +248,7 @@ "Sinc. evento do cal. p. esta conta" "Sincronizar email" "Sincronizar email para esta conta" - "Vibrar" + "Vibrar" "Escolher toque" "Definições do servidor" "Opções de sincronização" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 7a05e310c..1f5439f47 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -248,7 +248,7 @@ "Sinc. evento agenda p/ esta conta" "Sincronizar e-mail" "Sincronizar e-mail para esta conta" - "Vibrar" + "Vibrar" "Selecionar toque" "Configurações do servidor" "Opções de sincronização" diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index 870cdbfec..e24a6de76 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -419,7 +419,7 @@ "Sincronisar ils e-mails per quest conto" - "Vibrar" + "Vibrar" "Parameters dal server" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 3be6b13c2..5f1a4a62e 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -248,7 +248,7 @@ "Sincron. evenim. calendar pt. cont" "Sincroniz. e-mailul" "Sincron. e-mail pt. acest cont" - "Vibrare" + "Vibrare" "Alegeţi un ton de sonerie" "Setări server" "Opţiuni de sincronizare" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 8c54ebaa6..93a32c934 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -248,7 +248,7 @@ "Синхронизировать календарь этого аккаунта" "Синхронизировать почту" "Синхронизировать почту этого аккаунта" - "Вибросигнал" + "Вибросигнал" "Выбрать рингтон" "Настройки сервера" "Параметры синхронизации" diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index 91a157e2f..1acbb3859 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -248,7 +248,7 @@ "මෙම ගිණුම සඳහා දින දර්ශන සිදුවීම සමමුහුර්ත කරන්න" "ඊ-තැපෑල සමමුහුර්ත කරන්න" "මෙම ගිණුම සඳහා ඊ-තැපෑල සමමුහුර්ත කරන්න" - "කම්පනය වීම" + "කම්පනය වීම" "රිංග්ටෝනය තෝරන්න" "සේවාදායක සැකසීම්" "සමමුහුර්ත කිරීමේ විකල්ප" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index ef1ddb30e..dc31cc98d 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -248,7 +248,7 @@ "Synchr. udalosti kalendára pre účet" "Synchr. poštu" "Synchr. poštu pre tento účet" - "Vibrovať" + "Vibrovať" "Zvoliť tón zvonenia" "Nastavenia servera" "Možnosti synchronizácie" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index bea5450d4..d223f3aa1 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -248,7 +248,7 @@ "Sinhr. dogodek iz kol. za ta račun" "Sinhroniz. e-pošte" "Sinhroniziraj e-pošto za ta račun" - "Vibriranje" + "Vibriranje" "Izberite melodijo zvonjenja" "Nastavitve strežnika" "Možnosti sinhronizacije" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 8f4b44dd1..cfbe626b1 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -248,7 +248,7 @@ "Синхр. дог. календара за овај налог" "Синхронизуј е-пошту" "Синхронизуј е-пошту за овај налог" - "Вибрација" + "Вибрација" "Изабери мелодију звона" "Подешавања сервера" "Опције синхронизације" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index fea8d96df..deb9a9ed5 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -248,7 +248,7 @@ "Synka kalenderhändelse för kontot" "Synkronisera e-post" "Synkronisera e-post för det här kontot" - "Vibrera" + "Vibrera" "Välj ringsignal" "Serverinställningar" "Synkroniseringsalternativ" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 8d6ff1279..ce4459959 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -248,7 +248,7 @@ "Sawazisha tukio lililo kwenye kalenda la akaunti hii" "Sawazisha barua pepe" "Sawazisha barua pepe za akaunti hii" - "Tetema" + "Tetema" "Chagua toni ya mlio" "Mipangilio ya seva" "Chaguo za kusawazisha" diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml index a4d2c9477..ccc84c72c 100644 --- a/res/values-ta-rIN/strings.xml +++ b/res/values-ta-rIN/strings.xml @@ -248,7 +248,7 @@ "இந்தக் கணக்கிற்கான கேலெண்டர் நிகழ்வை ஒத்திசை" "மின்னஞ்சலை ஒத்திசை" "இந்த கணக்கிற்கான மின்னஞ்சலை ஒத்திசை" - "அதிர்வு" + "அதிர்வு" "ரிங்டோனைத் தேர்வுசெய்" "சேவையக அமைப்புகள்" "ஒத்திசைவு விருப்பங்கள்" diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml index c73cd0aee..cbd20c541 100644 --- a/res/values-te-rIN/strings.xml +++ b/res/values-te-rIN/strings.xml @@ -248,7 +248,7 @@ "ఈ ఖాతా కోసం క్యాలెండర్ ఈవెంట్‌ను సమకాలీకరించు" "ఇమెయిల్‌ను సమకాలీకరించు" "ఈ ఖాతా కోసం ఇమెయిల్‌ను సమకాలీకరించు" - "వైబ్రేట్" + "వైబ్రేట్" "రింగ్‌టోన్‌ను ఎంచుకోండి" "సర్వర్ సెట్టింగ్‌లు" "సమకాలీకరణ ఎంపికలు" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index bbe77b635..e2a13b7a9 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -248,7 +248,7 @@ "ซิงค์กิจกรรมในปฏิทินสำหรับบัญชีนี้" "ซิงค์อีเมล" "ซิงค์อีเมลสำหรับบัญชีนี้" - "สั่น" + "สั่น" "เลือกเสียงเรียกเข้า" "การตั้งค่าเซิร์ฟเวอร์" "ตัวเลือกการซิงค์" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 429330c7d..a878afc5c 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -248,7 +248,7 @@ "I-sync ang kalendaryo ng kaganapan para sa account" "I-sync ang email" "I-sync ang email sa account na ito" - "I-vibrate" + "I-vibrate" "Pumili ng ringtone" "Mga setting ng server" "Mga pagpipilian sa pag-sync" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 8fb110407..3e1ed81cf 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -248,7 +248,7 @@ "Bu hesabın takvim etkinliğini senkronize et" "E-postayı senk. et" "Bu hesaba ilişkin e-postaları senkronize et" - "Titreşim" + "Titreşim" "Zil sesi seçin" "Sunucu ayarları" "Senkronizasyon seçenekleri" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index c32836c4e..7f2257e89 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -248,7 +248,7 @@ "Синхроніз. календар із цим обл.зап." "Синхроніз. ел.пошту" "Синхрон. ел. пошту для обл. запису" - "Вібросигнал" + "Вібросигнал" "Вибрати сигнал дзвінка" "Налашт-ня сервера" "Параметри синхронізації" diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml index 7e6e6303f..f85d7ad3e 100644 --- a/res/values-ur-rPK/strings.xml +++ b/res/values-ur-rPK/strings.xml @@ -248,7 +248,7 @@ "اس اکاؤنٹ کیلئے کیلنڈر ایونٹ مطابقت پذیر بنائیں" "ای میل کو سنک کریں" "اس اکاؤنٹ کیلئے ای میل مطابقت پذیر بنائیں" - "وائبریٹ کریں" + "وائبریٹ کریں" "رنگ ٹون منتخب کریں" "سرور کی ترتیبات" "مطابقت پذیری کے اختیارات" diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml index 66730f19c..fff3c7e6a 100644 --- a/res/values-uz-rUZ/strings.xml +++ b/res/values-uz-rUZ/strings.xml @@ -248,7 +248,7 @@ "Ushbu hisobning taqvim tadbirlarini sinxronlash" "E-pochtani sinx-lash" "Ushbu hisob e-pochtasini sinx-lash" - "Tebranish" + "Tebranish" "Rington tanlash" "Server sozlamalari" "Sinxronlash tanlamalari" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 088880712..39a77032a 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -248,7 +248,7 @@ "Đồng bộ hóa sự kiện lịch cho tài khoản này" "Đồng bộ hóa email" "Đồng bộ hóa email cho tài khoản này" - "Rung" + "Rung" "Chọn nhạc chuông" "Cài đặt máy chủ" "Tùy chọn đồng bộ hóa" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index eaa39f7c3..c537192c4 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -248,7 +248,7 @@ "同步此帐户中的日历活动" "同步电子邮件" "同步此帐户中的电子邮件" - "振动" + "振动" "选择铃声" "服务器设置" "同步选项" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 76f6ba662..cc8593dc4 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -248,7 +248,7 @@ "保持這個帳戶的日曆活動同步" "同步處理電子郵件" "同步處理這個帳戶的電子郵件" - "震動" + "震動" "選擇鈴聲" "伺服器設定" "同步處理選項" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index a031ed950..b71225e4d 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -248,7 +248,7 @@ "同步處理這個帳戶的日曆活動" "同步處理電子郵件" "同步處理此帳戶的電子郵件" - "震動" + "震動" "選擇鈴聲" "伺服器設定" "同步處理選項" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index bafa1b14b..f2d6d00a6 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -248,7 +248,7 @@ "Vumelanisa umcimbi wekhalenda kule akhawunti" "Vumelanisa i-imeyli" "Vumelanisa i-imeyli yale akhawunti" - "Dlidliza" + "Dlidliza" "Khetha ithoni yokukhala" "Izilungiselelo zeseva" "Vumelanisa okukhethwa kukho" diff --git a/res/values/strings.xml b/res/values/strings.xml index 4d8add132..c156d51c2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -37,32 +37,12 @@ Create new + No quick responses. Account settings - - - Connection problem. - - - Move message - Move messages - - - Move isn\'t supported on POP3 accounts. - - - Can\'t move because selection contains multiple - accounts. - - Messages in Drafts, Outbox, and Sent can\'t be - moved. - Inbox @@ -96,26 +76,12 @@ Clear WebView cache - - Disable hardware graphics acceleration - Force 1-minute refresh for POP/IMAP Enable strict mode (with logging) - - Inbox - - Starred - - Drafts - - Outbox @@ -133,10 +99,6 @@ One or more attachments in your forwarded message will be downloaded prior to sending. - - Couldn\'t download the attachment. - There was an error while decoding the message. @@ -152,27 +114,6 @@ Couldn\'t sign in - - - %dB - %dB - - - - %dKB - %dKB - - - - %dMB - %dMB - - - - %dGB - %dGB - - Account setup @@ -213,10 +154,6 @@ Clear authentication Manual setup - - OAuth @@ -248,8 +185,6 @@ You indicated %1$s uses %2$s, but the account may use %3$s - - Account setup @@ -261,15 +196,11 @@ Your name (displayed on outgoing messages) - - Account setup Account type What type of account is this? - - Account setup Incoming server settings @@ -317,8 +248,6 @@ Optional - - Account setup Outgoing server settings @@ -331,8 +260,6 @@ Require signin USERNAME - - PASSWORD CLIENT CERTIFICATE @@ -348,8 +275,6 @@ MOBILE DEVICE ID - - Account settings Account options @@ -403,8 +328,6 @@ Username or password is incorrect. - - Login failed.\n(%s) - You can\'t change an account\'s username. - To add an account with a different username, touch Add Account. WARNING: Deactivating the Email app\'s authority @@ -558,20 +478,6 @@ without checking/saving [CHAR LIMIT=none]--> Discard unsaved changes? - - Couldn\'t sign in - - - The username or password for %s is incorrect. - Do you want to update them now? - - - Your login to %s failed; the server said: %s - Do you want to update your username and/or password? - @@ -653,7 +559,7 @@ Sync email for this account - Vibrate + Vibrate Choose ringtone @@ -671,15 +577,6 @@ Days of mail to sync - - Sender image - - - Only some \"Plus\" accounts include POP access - allowing this program to connect. If you\'re not able to sign in with - your correct email address and password, you may not have a paid - \"Plus\" account. Launch the web browser to gain access to - these email accounts. Before setting up this email account, visit the T-Online website and create a password for POP3 email access. @@ -697,32 +594,6 @@ Enables server-specified security policies - - Settings - - - - General settings - - - Confirm before deleting - - - Confirm before sending - - - - 999+ - - - Search email - Disallow use of the device\'s camera @@ -753,21 +624,13 @@ Let\'s set up a meeting to discuss this. - - Background sync for this account is disabled while\ - roaming. - Sending response… - - No messages. - IMAP POP3 - Folder picker Select server trash folder for %s diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml index 0eba071ca..3cdd47486 100755 --- a/res/xml/account_settings_preferences.xml +++ b/res/xml/account_settings_preferences.xml @@ -104,7 +104,7 @@ android:key="notification-vibrate" android:dependency="notifications-enabled" android:defaultValue="false" - android:title="@string/account_settings_vibrate_when_label" /> + android:title="@string/label_notification_vibrate_title" /> diff --git a/src/com/android/email/activity/UiUtilities.java b/src/com/android/email/activity/UiUtilities.java index 51d2e5c3d..c00310717 100644 --- a/src/com/android/email/activity/UiUtilities.java +++ b/src/com/android/email/activity/UiUtilities.java @@ -27,45 +27,6 @@ public class UiUtilities { private UiUtilities() { } - /** - * Formats the given size as a String in bytes, kB, MB or GB. Ex: 12,315,000 = 11 MB - */ - public static String formatSize(Context context, long size) { - final Resources res = context.getResources(); - final long KB = 1024; - final long MB = (KB * 1024); - final long GB = (MB * 1024); - - int resId; - int value; - - if (size < KB) { - resId = R.plurals.message_view_attachment_bytes; - value = (int) size; - } else if (size < MB) { - resId = R.plurals.message_view_attachment_kilobytes; - value = (int) (size / KB); - } else if (size < GB) { - resId = R.plurals.message_view_attachment_megabytes; - value = (int) (size / MB); - } else { - resId = R.plurals.message_view_attachment_gigabytes; - value = (int) (size / GB); - } - return res.getQuantityString(resId, value, value); - } - - public static String getMessageCountForUi(Context context, int count, - boolean replaceZeroWithBlank) { - if (replaceZeroWithBlank && (count == 0)) { - return ""; - } else if (count > 999) { - return context.getString(R.string.more_than_999); - } else { - return Integer.toString(count); - } - } - /** * Same as {@link View#findViewById}, but crashes if there's no view. */ @@ -90,13 +51,6 @@ public class UiUtilities { } } - /** - * Same as {@link View#setVisibility(int)}, but doesn't crash even if {@code view} is null. - */ - public static void setVisibilitySafe(Activity parent, int viewId, int visibility) { - setVisibilitySafe(parent.findViewById(viewId), visibility); - } - /** * Same as {@link View#setVisibility(int)}, but doesn't crash even if {@code view} is null. */ diff --git a/tests/src/com/android/email/activity/UiUtilitiesTests.java b/tests/src/com/android/email/activity/UiUtilitiesTests.java deleted file mode 100644 index 3492a9e83..000000000 --- a/tests/src/com/android/email/activity/UiUtilitiesTests.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * 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. - */ - -package com.android.email.activity; - -import com.android.email.R; - -import android.app.Activity; -import android.content.Context; -import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; -import android.view.View; - -import java.util.Locale; - -@SmallTest -public class UiUtilitiesTests extends AndroidTestCase { - public void brokentestFormatSize() { - if (!"en".equalsIgnoreCase(Locale.getDefault().getLanguage())) { - return; // Only works on the EN locale. - } - assertEquals("0B", UiUtilities.formatSize(getContext(), 0)); - assertEquals("1B", UiUtilities.formatSize(getContext(), 1)); - assertEquals("1023B", UiUtilities.formatSize(getContext(), 1023)); - assertEquals("1KB", UiUtilities.formatSize(getContext(), 1024)); - assertEquals("1023KB", UiUtilities.formatSize(getContext(), 1024 * 1024 - 1)); - assertEquals("1MB", UiUtilities.formatSize(getContext(), 1024 * 1024)); - assertEquals("1023MB", UiUtilities.formatSize(getContext(), 1024 * 1024 * 1024 - 1)); - assertEquals("1GB", UiUtilities.formatSize(getContext(), 1024 * 1024 * 1024)); - assertEquals("5GB", UiUtilities.formatSize(getContext(), 5L * 1024 * 1024 * 1024)); - } - - public void brokentestGetMessageCountForUi() { - final Context c = getContext(); - - // Negavive valeus not really expected, but at least shouldn't crash. - assertEquals("-1", UiUtilities.getMessageCountForUi(c, -1, true)); - assertEquals("-1", UiUtilities.getMessageCountForUi(c, -1, false)); - - assertEquals("", UiUtilities.getMessageCountForUi(c, 0, true)); - assertEquals("0", UiUtilities.getMessageCountForUi(c, 0, false)); - - assertEquals("1", UiUtilities.getMessageCountForUi(c, 1, true)); - assertEquals("1", UiUtilities.getMessageCountForUi(c, 1, false)); - - assertEquals("999", UiUtilities.getMessageCountForUi(c, 999, true)); - assertEquals("999", UiUtilities.getMessageCountForUi(c, 999, false)); - - final String moreThan999 = c.getString(R.string.more_than_999); - - assertEquals(moreThan999, UiUtilities.getMessageCountForUi(c, 1000, true)); - assertEquals(moreThan999, UiUtilities.getMessageCountForUi(c, 1000, false)); - - assertEquals(moreThan999, UiUtilities.getMessageCountForUi(c, 1001, true)); - assertEquals(moreThan999, UiUtilities.getMessageCountForUi(c, 1001, false)); - } - - public void brokentestSetVisibilitySafe() { - { - DummyView v = new DummyView(getContext()); - UiUtilities.setVisibilitySafe(v, View.VISIBLE); - assertEquals(View.VISIBLE, v.mVisibility); - - // Shouldn't crash - UiUtilities.setVisibilitySafe(null, View.VISIBLE); - } - - { - DummyActivity a = new DummyActivity(); - DummyView v = new DummyView(getContext()); - a.mDummyViewId = 3; - a.mDummyView = v; - - UiUtilities.setVisibilitySafe(a, 3, View.VISIBLE); - assertEquals(View.VISIBLE, v.mVisibility); - - // shouldn't crash - UiUtilities.setVisibilitySafe(a, 5, View.VISIBLE); - } - // No test for setVisibilitySafe(View, int, int) -- see testGetView(). - } - - private static class DummyActivity extends Activity { - public int mDummyViewId; - public View mDummyView; - - @Override - public View findViewById(int id) { - return (id == mDummyViewId) ? mDummyView : null; - } - } - - private static class DummyView extends View { - public int mVisibility = View.GONE; - - public DummyView(Context context) { - super(context); - } - - @Override - public void setVisibility(int visibility) { - mVisibility = visibility; - } - } -}